JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* autoload.cc (GetProcessMemoryInfo): Remove.

Browse Source 
* resource.cc (fill_rusage): Call NtQueryInformationProcess rather than
	GetProcessMemoryInfo to drop a psapi dependency.
This commit is contained in:
Corinna Vinschen
2011-05-11 09:07:20 +00:00
parent 933d2af50d
commit 34a6eeabff
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/resource.cc
View File

@@ -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;
}
}