drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* autoload.cc (GetSystemTimes): Remove. 

* fhandler_proc.cc (format_proc_uptime): Use global system_info rather
	than retrieving a local copy of the SYSTEM_INFO.  Drop call to
	GetSystemTimes and retrieve SystemPerformanceInformation on all systems
	again with buffer size big enough for 64 bit systems.
	(format_proc_stat): Use global system_info rather than retrieving a
	local copy of the SYSTEM_INFO.  Retrieve SystemPerformanceInformation
	with buffer size big enough for 64 bit systems.
This commit is contained in:
Corinna Vinschen 2009-06-09 09:45:29 +00:00
parent e83d7b1835
commit 962082b91a
3 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,14 @@
2009-06-09 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (GetSystemTimes): Remove.
* fhandler_proc.cc (format_proc_uptime): Use global system_info rather
than retrieving a local copy of the SYSTEM_INFO. Drop call to
GetSystemTimes and retrieve SystemPerformanceInformation on all systems
again with buffer size big enough for 64 bit systems.
(format_proc_stat): Use global system_info rather than retrieving a
local copy of the SYSTEM_INFO. Retrieve SystemPerformanceInformation
with buffer size big enough for 64 bit systems.
2009-06-08 Corinna Vinschen <corinna@vinschen.de> 2009-06-08 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (GetSystemTimes): Define. * autoload.cc (GetSystemTimes): Define.

1
winsup/cygwin/autoload.cc
View File

@ -412,7 +412,6 @@ LoadDLLfuncEx (FindFirstVolumeA, 8, kernel32, 1)
LoadDLLfuncEx (FindNextVolumeA, 12, kernel32, 1) LoadDLLfuncEx (FindNextVolumeA, 12, kernel32, 1)
LoadDLLfuncEx (FindVolumeClose, 4, kernel32, 1) LoadDLLfuncEx (FindVolumeClose, 4, kernel32, 1)
LoadDLLfuncEx (GetConsoleWindow, 0, kernel32, 1) LoadDLLfuncEx (GetConsoleWindow, 0, kernel32, 1)
LoadDLLfuncEx (GetSystemTimes, 12, kernel32, 1)
LoadDLLfuncEx (GetSystemWindowsDirectoryW, 8, kernel32, 1) LoadDLLfuncEx (GetSystemWindowsDirectoryW, 8, kernel32, 1)
LoadDLLfuncEx (GetVolumeNameForVolumeMountPointA, 12, kernel32, 1) LoadDLLfuncEx (GetVolumeNameForVolumeMountPointA, 12, kernel32, 1)
LoadDLLfuncEx (GetSystemDEPPolicy, 0, kernel32, 1) LoadDLLfuncEx (GetSystemDEPPolicy, 0, kernel32, 1)

67
winsup/cygwin/fhandler_proc.cc
View File

@ -421,12 +421,17 @@ format_proc_uptime (void *, char *&destbuf)
{ {
unsigned long long uptime = 0ULL, idle_time = 0ULL; unsigned long long uptime = 0ULL, idle_time = 0ULL;
NTSTATUS ret; NTSTATUS ret;
SYSTEM_INFO si;
SYSTEM_TIME_OF_DAY_INFORMATION stodi; SYSTEM_TIME_OF_DAY_INFORMATION stodi;
SYSTEM_PERFORMANCE_INFORMATION spi; /* Sizeof SYSTEM_PERFORMANCE_INFORMATION on 64 bit systems. It
FILETIME idletime; appears to contain some trailing additional information from
what I can tell after examining the content.
FIXME: It would be nice if this could be verified somehow. */
const size_t sizeof_spi = sizeof (SYSTEM_PERFORMANCE_INFORMATION) + 16;
PSYSTEM_PERFORMANCE_INFORMATION spi = (PSYSTEM_PERFORMANCE_INFORMATION)
alloca (sizeof_spi);
GetSystemInfo (&si); if (!system_info.dwNumberOfProcessors)
GetSystemInfo (&system_info);
ret = NtQuerySystemInformation (SystemTimeOfDayInformation, &stodi, ret = NtQuerySystemInformation (SystemTimeOfDayInformation, &stodi,
sizeof stodi, NULL); sizeof stodi, NULL);
@ -436,17 +441,10 @@ format_proc_uptime (void *, char *&destbuf)
debug_printf ("NtQuerySystemInformation(SystemTimeOfDayInformation), " debug_printf ("NtQuerySystemInformation(SystemTimeOfDayInformation), "
"status %p", ret); "status %p", ret);
/* Can't use NtQuerySystemInformation on 64 bit systems, so we just use if (NT_SUCCESS (NtQuerySystemInformation (SystemPerformanceInformation,
the offical Win32 function and fall back to NtQuerySystemInformation spi, sizeof_spi, NULL)))
on older systems. */ idle_time = (spi->IdleTime.QuadPart / system_info.dwNumberOfProcessors)
if (GetSystemTimes (&idletime, NULL, NULL)) / 100000ULL;
idle_time = ((unsigned long long) idletime.dwHighDateTime << 32)
| idletime.dwLowDateTime;
else if (NT_SUCCESS (NtQuerySystemInformation (SystemPerformanceInformation,
&spi, sizeof spi, NULL)))
idle_time = spi.IdleTime.QuadPart;
idle_time /= si.dwNumberOfProcessors;
idle_time /= 100000ULL;
destbuf = (char *) crealloc_abort (destbuf, 80); destbuf = (char *) crealloc_abort (destbuf, 80);
return __small_sprintf (destbuf, "%U.%02u %U.%02u\n", return __small_sprintf (destbuf, "%U.%02u %U.%02u\n",
@ -461,26 +459,32 @@ format_proc_stat (void *, char *&destbuf)
context_switches = 0UL, swap_in = 0UL, swap_out = 0UL; context_switches = 0UL, swap_in = 0UL, swap_out = 0UL;
time_t boot_time = 0; time_t boot_time = 0;
NTSTATUS ret; NTSTATUS ret;
SYSTEM_PERFORMANCE_INFORMATION spi; /* Sizeof SYSTEM_PERFORMANCE_INFORMATION on 64 bit systems. It
appears to contain some trailing additional information from
what I can tell after examining the content.
FIXME: It would be nice if this could be verified somehow. */
const size_t sizeof_spi = sizeof (SYSTEM_PERFORMANCE_INFORMATION) + 16;
PSYSTEM_PERFORMANCE_INFORMATION spi = (PSYSTEM_PERFORMANCE_INFORMATION)
alloca (sizeof_spi);
SYSTEM_TIME_OF_DAY_INFORMATION stodi; SYSTEM_TIME_OF_DAY_INFORMATION stodi;
SYSTEM_INFO si;
tmp_pathbuf tp; tmp_pathbuf tp;
char *buf = tp.c_get (); char *buf = tp.c_get ();
char *eobuf = buf; char *eobuf = buf;
GetSystemInfo (&si); if (!system_info.dwNumberOfProcessors)
GetSystemInfo (&system_info);
SYSTEM_PROCESSOR_TIMES spt[si.dwNumberOfProcessors]; SYSTEM_PROCESSOR_TIMES spt[system_info.dwNumberOfProcessors];
ret = NtQuerySystemInformation (SystemProcessorTimes, (PVOID) spt, ret = NtQuerySystemInformation (SystemProcessorTimes, (PVOID) spt,
sizeof spt[0] * si.dwNumberOfProcessors, NULL); sizeof spt[0] * system_info.dwNumberOfProcessors, NULL);
if (!NT_SUCCESS (ret)) if (!NT_SUCCESS (ret))
debug_printf ("NtQuerySystemInformation(SystemProcessorTimes), " debug_printf ("NtQuerySystemInformation(SystemProcessorTimes), "
"status %p", ret); "status %p", ret);
else else
{ {
unsigned long long user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL; unsigned long long user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL;
for (unsigned long i = 0; i < si.dwNumberOfProcessors; i++) for (unsigned long i = 0; i < system_info.dwNumberOfProcessors; i++)
{ {
kernel_time += (spt[i].KernelTime.QuadPart - spt[i].IdleTime.QuadPart) kernel_time += (spt[i].KernelTime.QuadPart - spt[i].IdleTime.QuadPart)
* HZ / 10000000ULL; * HZ / 10000000ULL;
@ -491,7 +495,7 @@ format_proc_stat (void *, char *&destbuf)
eobuf += __small_sprintf (eobuf, "cpu %U %U %U %U\n", eobuf += __small_sprintf (eobuf, "cpu %U %U %U %U\n",
user_time, 0ULL, kernel_time, idle_time); user_time, 0ULL, kernel_time, idle_time);
user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL; user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL;
for (unsigned long i = 0; i < si.dwNumberOfProcessors; i++) for (unsigned long i = 0; i < system_info.dwNumberOfProcessors; i++)
{ {
interrupt_count += spt[i].InterruptCount; interrupt_count += spt[i].InterruptCount;
kernel_time = (spt[i].KernelTime.QuadPart - spt[i].IdleTime.QuadPart) * HZ / 10000000ULL; kernel_time = (spt[i].KernelTime.QuadPart - spt[i].IdleTime.QuadPart) * HZ / 10000000ULL;
@ -501,18 +505,13 @@ format_proc_stat (void *, char *&destbuf)
user_time, 0ULL, kernel_time, idle_time); user_time, 0ULL, kernel_time, idle_time);
} }
/* This fails on WOW64 with STATUS_INFO_LENGTH_MISMATCH because the
SYSTEM_PERFORMANCE_INFORMATION struct is bigger. This datastructure
was always undocumented, but on 64 bit systems we don't know its
layout and content at all. So we just let it fail and set the
entire structure to 0. */
ret = NtQuerySystemInformation (SystemPerformanceInformation, ret = NtQuerySystemInformation (SystemPerformanceInformation,
(PVOID) &spi, sizeof spi, NULL); (PVOID) spi, sizeof_spi, NULL);
if (!NT_SUCCESS (ret)) if (!NT_SUCCESS (ret))
{ {
debug_printf ("NtQuerySystemInformation(SystemPerformanceInformation)" debug_printf ("NtQuerySystemInformation(SystemPerformanceInformation)"
", status %p", ret); ", status %p", ret);
memset (&spi, 0, sizeof spi); memset (spi, 0, sizeof_spi);
} }
ret = NtQuerySystemInformation (SystemTimeOfDayInformation, ret = NtQuerySystemInformation (SystemTimeOfDayInformation,
(PVOID) &stodi, (PVOID) &stodi,
@ -524,8 +523,8 @@ format_proc_stat (void *, char *&destbuf)
if (!NT_SUCCESS (ret)) if (!NT_SUCCESS (ret))
return 0; return 0;
pages_in = spi.PagesRead; pages_in = spi->PagesRead;
pages_out = spi.PagefilePagesWritten + spi.MappedFilePagesWritten; pages_out = spi->PagefilePagesWritten + spi->MappedFilePagesWritten;
/* /*
* Note: there is no distinction made in this structure between pages * Note: there is no distinction made in this structure between pages
* read from the page file and pages read from mapped files, but there * read from the page file and pages read from mapped files, but there
@ -533,9 +532,9 @@ format_proc_stat (void *, char *&destbuf)
* why. The value of swap_in, then, will obviously be wrong but its our * why. The value of swap_in, then, will obviously be wrong but its our
* best guess. * best guess.
*/ */
swap_in = spi.PagesRead; swap_in = spi->PagesRead;
swap_out = spi.PagefilePagesWritten; swap_out = spi->PagefilePagesWritten;
context_switches = spi.ContextSwitches; context_switches = spi->ContextSwitches;
boot_time = to_time_t ((FILETIME *) &stodi.BootTime.QuadPart); boot_time = to_time_t ((FILETIME *) &stodi.BootTime.QuadPart);
eobuf += __small_sprintf (eobuf, "page %u %u\n" eobuf += __small_sprintf (eobuf, "page %u %u\n"