[PATCH] Fix /proc/meminfo and /proc/swaps for >4GB

[PATCH] Fix /proc/meminfo and /proc/swaps for >4GB

[Yaakov (Cygwin/X)]

[-- Attachment #1: Type: text/plain, Size: 862 bytes --]

As promised, this patch ports the /proc/meminfo code to use sysinfo(2),
and fixes the case where RAM or swap space totals more than 4GB.  It
also fixes the /proc/swaps code for paging files larger than 4GB.

For example:

$ cat /proc/meminfo
            total:         used:         free:
Mem:     4293058560    1828151296    2464907264
Swap:   12884901888      14680064   12870221824
MemTotal:        4192440 kB
MemFree:         2407136 kB
MemShared:             0 kB
HighTotal:             0 kB
HighFree:              0 kB
LowTotal:        4192440 kB
LowFree:         2407136 kB
SwapTotal:      12582912 kB
SwapFree:       12568576 kB

$ cat /proc/swaps
Filename				Type		Size	Used	Priority
/cygdrive/c/pagefile.sys                file            8388608 8192
0
/cygdrive/d/pagefile.sys                file            4194304 6144
0

Patch attached.


Yaakov


[-- Attachment #2: proc-largemem.patch --]
[-- Type: text/x-patch, Size: 4680 bytes --]

2011-05-06  Yaakov Selkowitz  <yselkowitz@...>

	* fhandler_proc.cc (format_proc_meminfo): Rewrite to use sysinfo().
	Support RAM and swap space larger than 4GB.
	(format_proc_swaps): Support paging files larger than 4GB.

Index: fhandler_proc.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/fhandler_proc.cc,v
retrieving revision 1.102
diff -u -r1.102 fhandler_proc.cc
--- fhandler_proc.cc	19 Apr 2011 08:39:38 -0000	1.102
+++ fhandler_proc.cc	6 May 2011 04:24:33 -0000
@@ -24,6 +24,7 @@
 #include "tls_pbuf.h"
 #include <sys/utsname.h>
 #include <sys/param.h>
+#include <sys/sysinfo.h>
 #include "ntdll.h"
 #include <winioctl.h>
 #include <wchar.h>
@@ -402,63 +403,28 @@
 static _off64_t
 format_proc_meminfo (void *, char *&destbuf)
 {
-  unsigned long mem_total = 0UL, mem_free = 0UL, swap_total = 0UL,
-		swap_free = 0UL;
-  MEMORYSTATUS memory_status;
-  GlobalMemoryStatus (&memory_status);
-  mem_total = memory_status.dwTotalPhys;
-  mem_free = memory_status.dwAvailPhys;
-  PSYSTEM_PAGEFILE_INFORMATION spi = NULL;
-  ULONG size = 512;
-  NTSTATUS ret = STATUS_SUCCESS;
+  unsigned long long mem_total, mem_free, swap_total, swap_free;
+  struct sysinfo info;
+
+  sysinfo (&info);
+  mem_total = (unsigned long long) info.totalram * info.mem_unit;
+  mem_free = (unsigned long long) info.freeram * info.mem_unit;
+  swap_total = (unsigned long long) info.totalswap * info.mem_unit;
+  swap_free = (unsigned long long) info.freeswap * info.mem_unit;
 
-  spi = (PSYSTEM_PAGEFILE_INFORMATION) malloc (size);
-  if (spi)
-    {
-      ret = NtQuerySystemInformation (SystemPagefileInformation, (PVOID) spi,
-				      size, &size);
-      if (ret == STATUS_INFO_LENGTH_MISMATCH)
-	{
-	  free (spi);
-	  spi = (PSYSTEM_PAGEFILE_INFORMATION) malloc (size);
-	  if (spi)
-	    ret = NtQuerySystemInformation (SystemPagefileInformation,
-					    (PVOID) spi, size, &size);
-	}
-    }
-  if (!spi || ret || (!ret && GetLastError () == ERROR_PROC_NOT_FOUND))
-    {
-      swap_total = memory_status.dwTotalPageFile - mem_total;
-      swap_free = memory_status.dwAvailPageFile - mem_total;
-    }
-  else
-    {
-      PSYSTEM_PAGEFILE_INFORMATION spp = spi;
-      do
-	{
-	  swap_total += spp->CurrentSize * getsystempagesize ();
-	  swap_free += (spp->CurrentSize - spp->TotalUsed)
-		       * getsystempagesize ();
-	}
-      while (spp->NextEntryOffset
-	     && (spp = (PSYSTEM_PAGEFILE_INFORMATION)
-			   ((char *) spp + spp->NextEntryOffset)));
-    }
-  if (spi)
-    free (spi);
   destbuf = (char *) crealloc_abort (destbuf, 512);
-  return __small_sprintf (destbuf, "         total:      used:      free:\n"
-				   "Mem:  %10lu %10lu %10lu\n"
-				   "Swap: %10lu %10lu %10lu\n"
-				   "MemTotal:     %10lu kB\n"
-				   "MemFree:      %10lu kB\n"
+  return sprintf (destbuf, "            total:         used:         free:\n"
+				   "Mem:  %13llu %13llu %13llu\n"
+				   "Swap: %13llu %13llu %13llu\n"
+				   "MemTotal:     %10llu kB\n"
+				   "MemFree:      %10llu kB\n"
 				   "MemShared:             0 kB\n"
 				   "HighTotal:             0 kB\n"
 				   "HighFree:              0 kB\n"
-				   "LowTotal:     %10lu kB\n"
-				   "LowFree:      %10lu kB\n"
-				   "SwapTotal:    %10lu kB\n"
-				   "SwapFree:     %10lu kB\n",
+				   "LowTotal:     %10llu kB\n"
+				   "LowFree:      %10llu kB\n"
+				   "SwapTotal:    %10llu kB\n"
+				   "SwapFree:     %10llu kB\n",
 				   mem_total, mem_total - mem_free, mem_free,
 				   swap_total, swap_total - swap_free, swap_free,
 				   mem_total >> 10, mem_free >> 10,
@@ -1298,7 +1264,7 @@
 static _off64_t
 format_proc_swaps (void *, char *&destbuf)
 {
-  unsigned long total = 0UL, used = 0UL;
+  unsigned long long total = 0ULL, used = 0ULL;
   char *filename = NULL;
   ssize_t filename_len;
   PSYSTEM_PAGEFILE_INFORMATION spi = NULL;
@@ -1332,14 +1298,14 @@
       PSYSTEM_PAGEFILE_INFORMATION spp = spi;
       do
 	{
-	  total = spp->CurrentSize * getsystempagesize ();
-	  used = spp->TotalUsed * getsystempagesize ();
+	  total = (unsigned long long) spp->CurrentSize * getsystempagesize ();
+	  used = (unsigned long long) spp->TotalUsed * getsystempagesize ();
 
 	  filename_len = cygwin_conv_path (CCP_WIN_W_TO_POSIX, spp->FileName.Buffer, filename, 0);
 	  filename = (char *) malloc (filename_len);
 	  cygwin_conv_path (CCP_WIN_W_TO_POSIX, spp->FileName.Buffer, filename, filename_len);
 
-	  bufptr += sprintf (bufptr, "%-40s%-16s%-8ld%-8ld%-8d\n",
+	  bufptr += sprintf (bufptr, "%-40s%-16s%-8llu%-8llu%-8d\n",
 	                     filename, "file", total >> 10, used >> 10, 0);
 	}
       while (spp->NextEntryOffset

Re: [PATCH] Fix /proc/meminfo and /proc/swaps for >4GB

[Corinna Vinschen]

Hi Yaakov,

On May  6 14:03, Yaakov (Cygwin/X) wrote:
> As promised, this patch ports the /proc/meminfo code to use sysinfo(2),
> and fixes the case where RAM or swap space totals more than 4GB.  It
> also fixes the /proc/swaps code for paging files larger than 4GB.
> 
> For example:
> 
> $ cat /proc/meminfo
>             total:         used:         free:
> Mem:     4293058560    1828151296    2464907264
> Swap:   12884901888      14680064   12870221824
> MemTotal:        4192440 kB
> MemFree:         2407136 kB
> MemShared:             0 kB
> HighTotal:             0 kB
> HighFree:              0 kB
> LowTotal:        4192440 kB
> LowFree:         2407136 kB
> SwapTotal:      12582912 kB
> SwapFree:       12568576 kB

I'm not sure I understand this new format.  Why do you keep the Mem: and
Swap: lines?  Linux doesn't have them and top appears to work without
them.  And then, why do you print MemShared, HighTotal, and HighFree,
even though they are always 0, but not all the other ~40 lines Linux'
meminfo has, too?


Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Project Co-Leader          cygwin AT cygwin DOT com
Red Hat

Re: [PATCH] Fix /proc/meminfo and /proc/swaps for >4GB

[Yaakov (Cygwin/X)]

On Mon, 2011-05-09 at 09:55 +0200, Corinna Vinschen wrote:
> I'm not sure I understand this new format.  Why do you keep the Mem: and
> Swap: lines?  Linux doesn't have them and top appears to work without
> them.  And then, why do you print MemShared, HighTotal, and HighFree,
> even though they are always 0, but not all the other ~40 lines Linux'
> meminfo has, too?

Actually, my patch makes no attempt to change the actual format
of /proc/meminfo; it changes only what is necessary to handle RAM or
swap larger than 4GB by using ULLs instead of ULs.

As for modernizing/fixing the format, true, the Mem: and Swap: lines do
not exist in modern Linux, nor does the MemShared: line.  I would like
to actually define at least HighTotal and HighFree; I'll try to look
into that further soon.  As for the rest of Linux's /proc/meminfo, I'll
have to see how many other lines can be reasonably determined (if they
would exist at all) on Windows.

So with the ULL changes, if I remove the Mem, Swap, and MemShared lines,
will that do for now?


Yaakov

Re: [PATCH] Fix /proc/meminfo and /proc/swaps for >4GB

[Corinna Vinschen]

On May 11 22:58, Yaakov (Cygwin/X) wrote:
> On Mon, 2011-05-09 at 09:55 +0200, Corinna Vinschen wrote:
> > I'm not sure I understand this new format.  Why do you keep the Mem: and
> > Swap: lines?  Linux doesn't have them and top appears to work without
> > them.  And then, why do you print MemShared, HighTotal, and HighFree,
> > even though they are always 0, but not all the other ~40 lines Linux'
> > meminfo has, too?
> 
> Actually, my patch makes no attempt to change the actual format
> of /proc/meminfo; it changes only what is necessary to handle RAM or
> swap larger than 4GB by using ULLs instead of ULs.

That's fine and thanks for that.  I'm only puzzled what's actually
printed.

> As for modernizing/fixing the format, true, the Mem: and Swap: lines do
> not exist in modern Linux, nor does the MemShared: line.  I would like
> to actually define at least HighTotal and HighFree; I'll try to look
> into that further soon.  As for the rest of Linux's /proc/meminfo, I'll
> have to see how many other lines can be reasonably determined (if they
> would exist at all) on Windows.

That would be cool, but that wasn't what I meant.  I was just puzzled
that you added values which are always 0, but left out others which are
always 0, too.  I was missing a system, kind of.

> So with the ULL changes, if I remove the Mem, Swap, and MemShared lines,
> will that do for now?

Sure.


Thanks,
Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Project Co-Leader          cygwin AT cygwin DOT com
Red Hat