aboutsummaryrefslogtreecommitdiff
path: root/CPP/Windows/System.cpp
diff options
context:
space:
mode:
authorIgor Pavlov <87184205+ip7z@users.noreply.github.com>2024-05-14 00:00:00 +0000
committerIgor Pavlov <87184205+ip7z@users.noreply.github.com>2024-05-15 23:55:04 +0500
commitfc662341e6f85da78ada0e443f6116b978f79f22 (patch)
tree1be1cc402a7a9cbc18d4eeea6b141354c2d559e3 /CPP/Windows/System.cpp
parent5b39dc76f1bc82f941d5c800ab9f34407a06b53a (diff)
download7zip-24.05.tar.gz
7zip-24.05.tar.bz2
7zip-24.05.zip
24.0524.05
Diffstat (limited to 'CPP/Windows/System.cpp')
-rw-r--r--CPP/Windows/System.cpp78
1 files changed, 57 insertions, 21 deletions
diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
index dbe287a..03c8988 100644
--- a/CPP/Windows/System.cpp
+++ b/CPP/Windows/System.cpp
@@ -5,7 +5,8 @@
5#ifndef _WIN32 5#ifndef _WIN32
6#include <unistd.h> 6#include <unistd.h>
7#include <limits.h> 7#include <limits.h>
8#ifdef __APPLE__ 8#if defined(__APPLE__) || defined(__DragonFly__) || \
9 defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
9#include <sys/sysctl.h> 10#include <sys/sysctl.h>
10#else 11#else
11#include <sys/sysinfo.h> 12#include <sys/sysinfo.h>
@@ -28,7 +29,10 @@ UInt32 CountAffinity(DWORD_PTR mask)
28{ 29{
29 UInt32 num = 0; 30 UInt32 num = 0;
30 for (unsigned i = 0; i < sizeof(mask) * 8; i++) 31 for (unsigned i = 0; i < sizeof(mask) * 8; i++)
31 num += (UInt32)((mask >> i) & 1); 32 {
33 num += (UInt32)(mask & 1);
34 mask >>= 1;
35 }
32 return num; 36 return num;
33} 37}
34 38
@@ -114,7 +118,7 @@ UInt32 GetNumberOfProcessors()
114#if !defined(_WIN64) && \ 118#if !defined(_WIN64) && \
115 (defined(__MINGW32_VERSION) || defined(Z7_OLD_WIN_SDK)) 119 (defined(__MINGW32_VERSION) || defined(Z7_OLD_WIN_SDK))
116 120
117typedef struct _MY_MEMORYSTATUSEX { 121typedef struct {
118 DWORD dwLength; 122 DWORD dwLength;
119 DWORD dwMemoryLoad; 123 DWORD dwMemoryLoad;
120 DWORDLONG ullTotalPhys; 124 DWORDLONG ullTotalPhys;
@@ -187,26 +191,58 @@ bool GetRamSize(UInt64 &size)
187{ 191{
188 size = (UInt64)(sizeof(size_t)) << 29; 192 size = (UInt64)(sizeof(size_t)) << 29;
189 193
190 #ifdef __APPLE__ 194#if defined(__APPLE__) || defined(__DragonFly__) || \
195 defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
196
197 uint64_t val = 0;
198 int mib[2];
199 mib[0] = CTL_HW;
191 200
192 #ifdef HW_MEMSIZE 201 #ifdef HW_MEMSIZE
193 uint64_t val = 0; // support 2Gb+ RAM 202 mib[1] = HW_MEMSIZE;
194 int mib[2] = { CTL_HW, HW_MEMSIZE }; 203 // printf("\n sysctl HW_MEMSIZE");
195 #elif defined(HW_PHYSMEM64) 204 #elif defined(HW_PHYSMEM64)
196 uint64_t val = 0; // support 2Gb+ RAM 205 mib[1] = HW_PHYSMEM64;
197 int mib[2] = { CTL_HW, HW_PHYSMEM64 }; 206 // printf("\n sysctl HW_PHYSMEM64");
198 #else 207 #else
199 unsigned int val = 0; // For old system 208 mib[1] = HW_PHYSMEM;
200 int mib[2] = { CTL_HW, HW_PHYSMEM }; 209 // printf("\n sysctl HW_PHYSMEM");
201 #endif // HW_MEMSIZE 210 #endif
202 size_t size_sys = sizeof(val);
203 211
204 sysctl(mib, 2, &val, &size_sys, NULL, 0); 212 size_t size_sys = sizeof(val);
205 if (val) 213 int res = sysctl(mib, 2, &val, &size_sys, NULL, 0);
206 size = val; 214 // printf("\n sysctl res=%d val=%llx size_sys = %d, %d\n", res, (long long int)val, (int)size_sys, errno);
215 // we use strict check (size_sys == sizeof(val)) for returned value
216 // because big-endian encoding is possible:
217 if (res == 0 && size_sys == sizeof(val) && val)
218 size = val;
219 else
220 {
221 uint32_t val32 = 0;
222 size_sys = sizeof(val32);
223 res = sysctl(mib, 2, &val32, &size_sys, NULL, 0);
224 // printf("\n sysctl res=%d val=%llx size_sys = %d, %d\n", res, (long long int)val32, (int)size_sys, errno);
225 if (res == 0 && size_sys == sizeof(val32) && val32)
226 size = val32;
227 }
207 228
208 #elif defined(_AIX) 229 #elif defined(_AIX)
209 // fixme 230 #if defined(_SC_AIX_REALMEM) // AIX
231 size = (UInt64)sysconf(_SC_AIX_REALMEM) * 1024;
232 #endif
233 #elif 0 || defined(__sun)
234 #if defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
235 // FreeBSD, Linux, OpenBSD, and Solaris.
236 {
237 const long phys_pages = sysconf(_SC_PHYS_PAGES);
238 const long page_size = sysconf(_SC_PAGESIZE);
239 // #pragma message("GetRamSize : sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE)")
240 // printf("\n_SC_PHYS_PAGES (hex) = %lx", (unsigned long)phys_pages);
241 // printf("\n_SC_PAGESIZE = %lu\n", (unsigned long)page_size);
242 if (phys_pages != -1 && page_size != -1)
243 size = (UInt64)(Int64)phys_pages * (UInt64)(Int64)page_size;
244 }
245 #endif
210 #elif defined(__gnu_hurd__) 246 #elif defined(__gnu_hurd__)
211 // fixme 247 // fixme
212 #elif defined(__FreeBSD_kernel__) && defined(__GLIBC__) 248 #elif defined(__FreeBSD_kernel__) && defined(__GLIBC__)
@@ -218,10 +254,6 @@ bool GetRamSize(UInt64 &size)
218 if (::sysinfo(&info) != 0) 254 if (::sysinfo(&info) != 0)
219 return false; 255 return false;
220 size = (UInt64)info.mem_unit * info.totalram; 256 size = (UInt64)info.mem_unit * info.totalram;
221 const UInt64 kLimit = (UInt64)1 << (sizeof(size_t) * 8 - 1);
222 if (size > kLimit)
223 size = kLimit;
224
225 /* 257 /*
226 printf("\n mem_unit = %lld", (UInt64)info.mem_unit); 258 printf("\n mem_unit = %lld", (UInt64)info.mem_unit);
227 printf("\n totalram = %lld", (UInt64)info.totalram); 259 printf("\n totalram = %lld", (UInt64)info.totalram);
@@ -230,6 +262,10 @@ bool GetRamSize(UInt64 &size)
230 262
231 #endif 263 #endif
232 264
265 const UInt64 kLimit = (UInt64)1 << (sizeof(size_t) * 8 - 1);
266 if (size > kLimit)
267 size = kLimit;
268
233 return true; 269 return true;
234} 270}
235 271
@@ -269,7 +305,7 @@ unsigned Get_File_OPEN_MAX_Reduced_for_3_tasks()
269 numFiles_OPEN_MAX = 1; 305 numFiles_OPEN_MAX = 1;
270 numFiles_OPEN_MAX /= 3; // we suppose that we have up to 3 tasks in total for multiple file processing 306 numFiles_OPEN_MAX /= 3; // we suppose that we have up to 3 tasks in total for multiple file processing
271 numFiles_OPEN_MAX = MyMax(numFiles_OPEN_MAX, (unsigned long)3); 307 numFiles_OPEN_MAX = MyMax(numFiles_OPEN_MAX, (unsigned long)3);
272 unsigned n = (UInt32)(UInt32)-1; 308 unsigned n = (unsigned)(int)-1;
273 if (n > numFiles_OPEN_MAX) 309 if (n > numFiles_OPEN_MAX)
274 n = (unsigned)numFiles_OPEN_MAX; 310 n = (unsigned)numFiles_OPEN_MAX;
275 return n; 311 return n;