+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.
LoadDLLfunc (EnumProcessModules, 16, psapi)
LoadDLLfunc (GetModuleFileNameExW, 16, psapi)
LoadDLLfunc (GetModuleInformation, 16, psapi)
-LoadDLLfunc (GetProcessMemoryInfo, 12, psapi)
LoadDLLfunc (QueryWorkingSet, 12, psapi)
LoadDLLfunc (LsaDeregisterLogonProcess, 4, secur32)
/* 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.
#include "pinfo.h"
#include "dtable.h"
#include "cygheap.h"
+#include "ntdll.h"
/* add timeval values */
static void
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;
}
}