24.0524.05

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 @@
 #ifndef _WIN32
 #include <unistd.h>
 #include <limits.h>
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__DragonFly__) || \
+    defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/sysctl.h>
 #else
 #include <sys/sysinfo.h>
@@ -28,7 +29,10 @@ UInt32 CountAffinity(DWORD_PTR mask)
 {
   UInt32 num = 0;
   for (unsigned i = 0; i < sizeof(mask) * 8; i++)
-    num += (UInt32)((mask >> i) & 1);
+  {
+    num += (UInt32)(mask & 1);
+    mask >>= 1;
+  }
   return num;
 }
 
@@ -114,7 +118,7 @@ UInt32 GetNumberOfProcessors()
 #if !defined(_WIN64) && \
   (defined(__MINGW32_VERSION) || defined(Z7_OLD_WIN_SDK))
 
-typedef struct _MY_MEMORYSTATUSEX {
+typedef struct {
   DWORD dwLength;
   DWORD dwMemoryLoad;
   DWORDLONG ullTotalPhys;
@@ -187,26 +191,58 @@ bool GetRamSize(UInt64 &size)
 {
   size = (UInt64)(sizeof(size_t)) << 29;
 
-  #ifdef __APPLE__
+#if defined(__APPLE__) || defined(__DragonFly__) || \
+    defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+
+    uint64_t val = 0;
+    int mib[2];
+    mib[0] = CTL_HW;
 
     #ifdef HW_MEMSIZE
-      uint64_t val = 0; // support 2Gb+ RAM
-      int mib[2] = { CTL_HW, HW_MEMSIZE };
+      mib[1] = HW_MEMSIZE;
+      // printf("\n sysctl HW_MEMSIZE");
     #elif defined(HW_PHYSMEM64)
-      uint64_t val = 0; // support 2Gb+ RAM
-      int mib[2] = { CTL_HW, HW_PHYSMEM64 };
+      mib[1] = HW_PHYSMEM64;
+      // printf("\n sysctl HW_PHYSMEM64");
     #else
-      unsigned int val = 0; // For old system
-      int mib[2] = { CTL_HW, HW_PHYSMEM };
-    #endif // HW_MEMSIZE
-      size_t size_sys = sizeof(val);
+      mib[1] = HW_PHYSMEM;
+      // printf("\n sysctl HW_PHYSMEM");
+    #endif
 
-      sysctl(mib, 2, &val, &size_sys, NULL, 0);
-      if (val)
-        size = val;
+    size_t size_sys = sizeof(val);
+    int res = sysctl(mib, 2, &val, &size_sys, NULL, 0);
+    // printf("\n sysctl res=%d val=%llx size_sys = %d, %d\n", res, (long long int)val, (int)size_sys, errno);
+    // we use strict check (size_sys == sizeof(val)) for returned value
+    // because big-endian encoding is possible:
+    if (res == 0 && size_sys == sizeof(val) && val)
+      size = val;
+    else
+    {
+      uint32_t val32 = 0;
+      size_sys = sizeof(val32);
+      res = sysctl(mib, 2, &val32, &size_sys, NULL, 0);
+      // printf("\n sysctl res=%d val=%llx size_sys = %d, %d\n", res, (long long int)val32, (int)size_sys, errno);
+      if (res == 0 && size_sys == sizeof(val32) && val32)
+        size = val32;
+    }
 
   #elif defined(_AIX)
-  // fixme
+    #if defined(_SC_AIX_REALMEM) // AIX
+      size = (UInt64)sysconf(_SC_AIX_REALMEM) * 1024;
+    #endif
+  #elif 0 || defined(__sun)
+    #if defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
+    // FreeBSD, Linux, OpenBSD, and Solaris.
+    {
+      const long phys_pages = sysconf(_SC_PHYS_PAGES);
+      const long page_size = sysconf(_SC_PAGESIZE);
+      // #pragma message("GetRamSize : sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE)")
+      // printf("\n_SC_PHYS_PAGES (hex) = %lx", (unsigned long)phys_pages);
+      // printf("\n_SC_PAGESIZE = %lu\n", (unsigned long)page_size);
+      if (phys_pages != -1 && page_size != -1)
+        size = (UInt64)(Int64)phys_pages * (UInt64)(Int64)page_size;
+    }
+    #endif
   #elif defined(__gnu_hurd__)
   // fixme
   #elif defined(__FreeBSD_kernel__) && defined(__GLIBC__)
@@ -218,10 +254,6 @@ bool GetRamSize(UInt64 &size)
   if (::sysinfo(&info) != 0)
     return false;
   size = (UInt64)info.mem_unit * info.totalram;
-  const UInt64 kLimit = (UInt64)1 << (sizeof(size_t) * 8 - 1);
-  if (size > kLimit)
-    size = kLimit;
-
   /*
   printf("\n mem_unit  = %lld", (UInt64)info.mem_unit);
   printf("\n totalram  = %lld", (UInt64)info.totalram);
@@ -230,6 +262,10 @@ bool GetRamSize(UInt64 &size)
 
   #endif
 
+  const UInt64 kLimit = (UInt64)1 << (sizeof(size_t) * 8 - 1);
+  if (size > kLimit)
+    size = kLimit;
+
   return true;
 }
 
@@ -269,7 +305,7 @@ unsigned Get_File_OPEN_MAX_Reduced_for_3_tasks()
     numFiles_OPEN_MAX = 1;
   numFiles_OPEN_MAX /= 3; // we suppose that we have up to 3 tasks in total for multiple file processing
   numFiles_OPEN_MAX = MyMax(numFiles_OPEN_MAX, (unsigned long)3);
-  unsigned n = (UInt32)(UInt32)-1;
+  unsigned n = (unsigned)(int)-1;
   if (n > numFiles_OPEN_MAX)
     n = (unsigned)numFiles_OPEN_MAX;
   return n;