diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-05-10 19:39:02 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-05-10 19:39:02 +0400 |
| commit | c29e693388663aaa42f041965258fa6b6bafc938 (patch) | |
| tree | ab06a3773afd17d0f5c68cfa860817406fa5b670 /winsup/cygwin/syscalls.cc | |
| parent | 6cfbf1a573bb6fe2d0d986eeaaa0992bd9e0c176 (diff) | |
* fhandler_proc.cc (format_proc_uptime): Don't call GetSystemInfo.
Fetch CPU count from wincap.
(format_proc_stat): Ditto.
* globals.cc (system_info): Move to wincap.
* heap.cc (heap_init): Fetch page size from wincap.
* syscalls.cc (getpagesize): Fetch allocation granularity from wincap.
(getsystempagesize): Fetch page size from wincap.
* wincap.cc (wincap_2003): Default is_server to false.
(wincapc::init): Call GetSystemInfo here. Always set is_server value.
* wincap.h (class wincapc): Add system_info as private member.
(wincapc::cpu_count): New public method.
(wincapc::page_size): Ditto.
(wincapc::allocation_granularity): Ditto.
Diffstat (limited to 'winsup/cygwin/syscalls.cc')
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 70eb8ea1f..14561cdba 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -2287,17 +2287,13 @@ getdtablesize () extern "C" int getpagesize () { - if (!system_info.dwAllocationGranularity) - GetSystemInfo (&system_info); - return (size_t) system_info.dwAllocationGranularity; + return (size_t) wincap.allocation_granularity (); } size_t getsystempagesize () { - if (!system_info.dwPageSize) - GetSystemInfo (&system_info); - return (size_t) system_info.dwPageSize; + return (size_t) wincap.page_size (); } /* FIXME: not all values are correct... */ |