* autoload.cc: Autoload GetProcessMemoryInfo.
* resource.cc (fill_rusage): Calculate ru_maxrss and ru_majflt entries. (Bug report on this from Guido Serassio in the squid project). This requires including psapi.h.
This commit is contained in:
@@ -20,6 +20,7 @@ details. */
|
||||
#include "sync.h"
|
||||
#include "sigproc.h"
|
||||
#include "pinfo.h"
|
||||
#include "psapi.h"
|
||||
|
||||
/* add timeval values */
|
||||
static void
|
||||
@@ -73,6 +74,14 @@ fill_rusage (struct rusage *r, HANDLE h)
|
||||
add_timeval (&r->ru_stime, &tv);
|
||||
totimeval (&tv, &user_time, 0, 0);
|
||||
add_timeval (&r->ru_utime, &tv);
|
||||
|
||||
PROCESS_MEMORY_COUNTERS pmc;
|
||||
|
||||
if (GetProcessMemoryInfo( h, &pmc, sizeof (pmc)))
|
||||
{
|
||||
r->ru_maxrss += (long) (pmc.WorkingSetSize /1024);
|
||||
r->ru_majflt += pmc.PageFaultCount;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C"
|
||||
|
Reference in New Issue
Block a user