* autoload.cc (GetProcessMemoryInfo): Remove.

	* resource.cc (fill_rusage): Call NtQueryInformationProcess rather than
	GetProcessMemoryInfo to drop a psapi dependency.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 419d3f3c2e5f45a780b771305437b03b52e45ad9..017987f7d63831a936feaaf636dd100b4f1eb61c 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-11  Corinna Vinschen  <corinna@vinschen.de>
+
+       * autoload.cc (GetProcessMemoryInfo): Remove.
+       * resource.cc (fill_rusage): Call NtQueryInformationProcess rather than
+       GetProcessMemoryInfo to drop a psapi dependency.
+
 2011-05-11  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_socket.cc (get_inet_addr): Rearrange for better readability.

diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index 269918e8258c41fd905358f82dfc6ec10319ae8b..bd9fc836ae2b0e23aae0599a07aff5760f6806cf 100644 (file)
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -417,7 +417,6 @@ LoadDLLfunc (CoTaskMemFree, 4, ole32)
 LoadDLLfunc (EnumProcessModules, 16, psapi)
 LoadDLLfunc (GetModuleFileNameExW, 16, psapi)
 LoadDLLfunc (GetModuleInformation, 16, psapi)
-LoadDLLfunc (GetProcessMemoryInfo, 12, psapi)
 LoadDLLfunc (QueryWorkingSet, 12, psapi)
 
 LoadDLLfunc (LsaDeregisterLogonProcess, 4, secur32)

diff --git a/winsup/cygwin/resource.cc b/winsup/cygwin/resource.cc
index fed61e8eed6da02508d6ccb6f759d437089fbb5a..43feec02b10d7ee9a82ef863b165cb14271cb704 100644 (file)
--- a/winsup/cygwin/resource.cc
+++ b/winsup/cygwin/resource.cc
@@ -1,6 +1,6 @@
 /* resource.cc: getrusage () and friends.
 
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2009, 2010 Red Hat, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2009, 2010, 2011 Red Hat, Inc.
 
    Written by Steve Chamberlain (sac@cygnus.com), Doug Evans (dje@cygnus.com),
    Geoffrey Noer (noer@cygnus.com) of Cygnus Support.
@@ -22,6 +22,7 @@ details. */
 #include "pinfo.h"
 #include "dtable.h"
 #include "cygheap.h"
+#include "ntdll.h"
 
 /* add timeval values */
 static void
@@ -76,13 +77,13 @@ fill_rusage (struct rusage *r, HANDLE h)
   totimeval (&tv, &user_time, 0, 0);
   add_timeval (&r->ru_utime, &tv);
 
-  PROCESS_MEMORY_COUNTERS pmc;
-
-  memset (&pmc, 0, sizeof (pmc));
-  if (GetProcessMemoryInfo (h, &pmc, sizeof (pmc)))
+  VM_COUNTERS vmc;
+  NTSTATUS status = NtQueryInformationProcess (h, ProcessVmCounters, &vmc,
+                                              sizeof vmc, NULL);
+  if (NT_SUCCESS (status))
     {
-      r->ru_maxrss += (long) (pmc.WorkingSetSize /1024);
-      r->ru_majflt += pmc.PageFaultCount;
+      r->ru_maxrss += (long) (vmc.WorkingSetSize / 1024);
+      r->ru_majflt += vmc.PageFaultCount;
     }
 }