make Tornado to work with MacOS

Author: inikep

_lzbench/lzbench.cpp

@@ -550,7 +550,7 @@ int main( int argc, char** argv)
         fprintf(stderr,"\nExample usage:\n");
         fprintf(stderr,"  " PROGNAME " -ebrotli filename - selects all levels of brotli\n");
         fprintf(stderr,"  " PROGNAME " -ebrotli,2,5/zstd filename - selects levels 2 & 5 of brotli and zstd\n");                    
-		exit(1);
+		exit(0);
 	}
 
     bool first_time = true;

tornado/Common.cpp

@@ -462,301 +462,6 @@ CFILENAME GetTempDir (void)
 }
 
 
-#ifdef FREEARC_WIN
-#include <sys/utime.h>
-
-#if !defined(_WIN64) && defined(__GNUC__)
-
-typedef struct _MY_MEMORYSTATUSEX {
-  DWORD dwLength;
-  DWORD dwMemoryLoad;
-  DWORDLONG ullTotalPhys;
-  DWORDLONG ullAvailPhys;
-  DWORDLONG ullTotalPageFile;
-  DWORDLONG ullAvailPageFile;
-  DWORDLONG ullTotalVirtual;
-  DWORDLONG ullAvailVirtual;
-  DWORDLONG ullAvailExtendedVirtual;
-} MY_MEMORYSTATUSEX, *MY_LPMEMORYSTATUSEX;
-
-#else
-
-#define MY_MEMORYSTATUSEX MEMORYSTATUSEX
-#define MY_LPMEMORYSTATUSEX LPMEMORYSTATUSEX
-
-#endif
-
-typedef BOOL (WINAPI *GlobalMemoryStatusExP)(MY_LPMEMORYSTATUSEX lpBuffer);
-
-uint64 GetPhysicalMemory (void)
-{
-  MY_MEMORYSTATUSEX statx;
-  statx.dwLength = sizeof(statx);
-  GlobalMemoryStatusExP globalMemoryStatusEx = (GlobalMemoryStatusExP) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GlobalMemoryStatusEx");
-  if (globalMemoryStatusEx != 0 && globalMemoryStatusEx(&statx))
-    return statx.ullTotalPhys;
-
-  MEMORYSTATUS stat;
-  stat.dwLength = sizeof(stat);
-  GlobalMemoryStatus(&stat);
-  return stat.dwTotalPhys;
-}
-
-uint64 GetAvailablePhysicalMemory (void)
-{
-  MY_MEMORYSTATUSEX statx;
-  statx.dwLength = sizeof(statx);
-  GlobalMemoryStatusExP globalMemoryStatusEx = (GlobalMemoryStatusExP) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GlobalMemoryStatusEx");
-  if (globalMemoryStatusEx != 0 && globalMemoryStatusEx(&statx))
-    return statx.ullAvailPhys;
-
-  MEMORYSTATUS stat;
-  stat.dwLength = sizeof(stat);
-  GlobalMemoryStatus(&stat);
-  return stat.dwAvailPhys;
-}
-
-int GetProcessorsCount (void)
-{
-  SYSTEM_INFO si;
-    GetSystemInfo (&si);
-  return si.dwNumberOfProcessors;
-}
-
-void SetFileDateTime (CFILENAME Filename, time_t t)
-{
-  if (t<0)  t=INT_MAX;  // Èíà÷å ïîëó÷àåì âûëåò :(
-  struct tm* t2 = gmtime(&t);
-
-  SYSTEMTIME t3;
-  t3.wYear         = t2->tm_year+1900;
-  t3.wMonth        = t2->tm_mon+1;
-  t3.wDay          = t2->tm_mday;
-  t3.wHour         = t2->tm_hour;
-  t3.wMinute       = t2->tm_min;
-  t3.wSecond       = t2->tm_sec;
-  t3.wMilliseconds = 0;
-
-  FILETIME ft;
-  SystemTimeToFileTime(&t3, &ft);
-
-  HANDLE hndl = CreateFileW(Filename, FILE_WRITE_ATTRIBUTES,
-                            FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
-                            OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
-  SetFileTime(hndl,NULL,NULL,&ft);  //creation, last access, modification times
-  CloseHandle(hndl);
-  //SetFileAttributes (Filename, attrib);
-}
-
-// Execute program `filename` in the directory `curdir` optionally waiting until it finished
-void RunProgram (CFILENAME filename, CFILENAME curdir, int wait_finish)
-{
-  STARTUPINFO si;
-  PROCESS_INFORMATION pi;
-  ZeroMemory (&si, sizeof(si));
-  si.cb = sizeof(si);
-  ZeroMemory (&pi, sizeof(pi));
-  BOOL process_created = CreateProcessW (filename, NULL, NULL, NULL, FALSE, 0, NULL, curdir, &si, &pi);
-
-  if (process_created)
-  {
-    if (wait_finish)
-      WaitForSingleObject (pi.hProcess, INFINITE);
-    CloseHandle (pi.hProcess);
-    CloseHandle (pi.hThread);
-  }
-}
-
-// Execute `command` in the directory `curdir` optionally waiting until it finished
-int RunCommand (CFILENAME command, CFILENAME curdir, int wait_finish, SIMPLE_CALLBACK *callback, void *auxdata)
-{
-  STARTUPINFO si;
-  ZeroMemory (&si, sizeof(si));
-  si.cb = sizeof(si);
-  si.dwFlags = (callback? STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES : 0);  // `callback` used here as a flag distinguishing calls from C_External.cpp
-  si.wShowWindow = SW_HIDE;  // For GUI executables - hide console window of called external decompressor; for console executables this flag is ignored anyway
-  si.hStdInput   = (HANDLE) _get_osfhandle(0);
-  si.hStdOutput  = (HANDLE) _get_osfhandle(1);
-  si.hStdError   = (HANDLE) _get_osfhandle(2);
-  PROCESS_INFORMATION pi;
-  ZeroMemory (&pi, sizeof(pi));
-  DWORD ExitCode = 0;  // êîä âîçâðàòà âûçûâàåìîé ïðîãðàììû
-
-  BOOL process_created = CreateProcessW (NULL, command, NULL, NULL, TRUE, 0, NULL, curdir, &si, &pi);
-  if (callback)
-    callback(auxdata);    // Action that should be executed BEFORE waiting for process finish
-  if (process_created)
-  {
-    if (wait_finish)
-      WaitForSingleObject (pi.hProcess, INFINITE),
-      GetExitCodeProcess  (pi.hProcess, &ExitCode);
-    CloseHandle (pi.hProcess);
-    CloseHandle (pi.hThread);
-  }
-  return ExitCode;
-}
-
-// Execute file `filename` in the directory `curdir` optionally waiting until it finished
-void RunFile (CFILENAME filename, CFILENAME curdir, int wait_finish)
-{
-  SHELLEXECUTEINFO sei;
-  ZeroMemory(&sei, sizeof(SHELLEXECUTEINFO));
-  sei.cbSize = sizeof(SHELLEXECUTEINFO);
-  sei.fMask = (wait_finish? SEE_MASK_NOCLOSEPROCESS : 0);
-  sei.hwnd = GetActiveWindow();
-  sei.lpFile = filename;
-  sei.lpDirectory = curdir;
-  sei.nShow = SW_SHOW;
-
-  CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
-  DWORD rc = ShellExecuteEx(&sei);
-  if (rc && wait_finish)
-    WaitForSingleObject(sei.hProcess, INFINITE),
-    CloseHandle (sei.hProcess);
-}
-
-// Âåðñèÿ Windows
-#define CheckWinVersion(ver)  (GetWinVersion() >= ver)
-
-#define WIN_VERSION_VISTA 0x600
-int GetWinVersion()
-{
-   static int result = -1;
-   if (result < 0)
-   {
-     OSVERSIONINFOEX osvi;
-     ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-     if( !GetVersionEx ((OSVERSIONINFO *) &osvi) )
-        result = 0;
-     else result = (VER_PLATFORM_WIN32_NT==osvi.dwPlatformId? osvi.dwMajorVersion*0x100+osvi.dwMinorVersion : 0);
-   }
-   return result;
-}
-
-
-#ifndef THREAD_MODE_BACKGROUND_BEGIN
-#define THREAD_MODE_BACKGROUND_BEGIN    0x00010000
-#define THREAD_MODE_BACKGROUND_END      0x00020000
-#endif
-
-// Óñòàíîâèòü ïðèîðèòåò òðåäà êàêîé ïîëàãàåòñÿ äëÿ òðåäîâ ñæàòèÿ (ðàñïàêîâêè, øèôðîâàíèÿ...).
-// Èñïîëüçóåòñÿ äëÿ òðåäîâ, êîòîðûå âûïîëíÿþò òîëüêî ñæàòèå
-void SetCompressionThreadPriority (void)
-{
-   SetThreadPriority (GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL);
-}
-
-// Âðåìåííî óñòàíîâèòü ïðèîðèòåò òðåäà êàêîé ïîëàãàåòñÿ äëÿ òðåäîâ ñæàòèÿ (ðàñïàêîâêè, øèôðîâàíèÿ...)
-// è âîçâðàòèòü ñòàðîå çíà÷åíèå óðîâíÿ ïðèîðèòåòà. Èñïîëüçóåòñÿ äëÿ òðåäîâ, âðåìåííî âûïîëíÿþùèõ çàäà÷è ñæàòèÿ
-int BeginCompressionThreadPriority (void)
-{
-   DWORD dwThreadPriority = GetThreadPriority(GetCurrentThread());
-   SetCompressionThreadPriority();
-   return dwThreadPriority;
-}
-
-// Âîññòàíîâèòü ïðèîðèòåò òðåäà òàêèì, êàê ìû åãî çàïîìíèëè
-void EndCompressionThreadPriority (int old_priority)
-{
-   SetThreadPriority (GetCurrentThread(), old_priority);
-}
-
-
-#else // For Unix:  ========================================================================================================================
-
-#include <unistd.h>
-#include <sys/resource.h>
-#include <sys/sysctl.h>
-
-uint64 GetPhysicalMemory (void)
-{
-  return uint64(sysconf(_SC_PHYS_PAGES)) * sysconf(_SC_PAGE_SIZE);
-}
-
-uint64 GetAvailablePhysicalMemory (void)
-{
-#if defined(_SC_AVPHYS_PAGES)
-  return uint64(sysconf(_SC_AVPHYS_PAGES)) * sysconf(_SC_PAGE_SIZE);
-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__minix)
-  unsigned long page_count = 0;
-  size_t page_count_size = sizeof(page_count);
-  sysctlbyname("hw.availpages", &page_count, &page_count, NULL, 0);
-  return page_count * sysconf(_SC_PAGE_SIZE);
-#else
-#  error "There's no support for memory stats on your system."
-#endif
-}
-
-int GetProcessorsCount (void)
-{
-  return sysconf(_SC_NPROCESSORS_ONLN);
-}
-
-void SetFileDateTime(CFILENAME Filename, time_t t)
-{
-  if (t<0)  t=INT_MAX;  // Èíà÷å ïîëó÷àåì âûëåò :(
-  struct stat st;
-    stat (Filename, &st);
-  struct utimbuf times;
-    times.actime  = st.st_atime;
-    times.modtime = t;
-  utime (Filename, &times);
-}
-
-// Execute `command` in the directory `curdir` optionally waiting until it finished
-int RunCommand (CFILENAME command, CFILENAME curdir, int wait_finish, SIMPLE_CALLBACK *callback, void *auxdata)
-{
-  char *olddir = (char*) malloc_msg (),
-       *cmd    = (char*) malloc_msg (strlen(command)+10);
-  getcwd(olddir, MY_FILENAME_MAX);
-
-  chdir(curdir);
-  const char *prefix = (memcmp(command,"/"  ,1) == 0)?    "" :
-                       (memcmp(command,"\"/",2) == 0)?    "" :
-                       (memcmp(command,"\"" ,1) == 0)?    (command++, "\"./") :
-                                                          "./";
-  sprintf(cmd, "%s%s%s", prefix, command, wait_finish? "" : " &");
-  int ExitCode = system(cmd);
-
-  if (callback)
-    callback(auxdata);    // Action that should be executed BEFORE waiting for process finish
-
-  chdir(olddir);
-  free(cmd);
-  free(olddir);
-  return ExitCode;
-}
-
-// Execute file `filename` in the directory `curdir` optionally waiting until it finished
-void RunFile (CFILENAME filename, CFILENAME curdir, int wait_finish)
-{
-  RunCommand (filename, curdir, wait_finish, NULL, NULL);
-}
-
-// Óñòàíîâèòü ïðèîðèòåò òðåäà êàêîé ïîëàãàåòñÿ äëÿ òðåäîâ ñæàòèÿ (ðàñïàêîâêè, øèôðîâàíèÿ...).
-// Èñïîëüçóåòñÿ äëÿ òðåäîâ, êîòîðûå âûïîëíÿþò òîëüêî ñæàòèå
-void SetCompressionThreadPriority (void)
-{
-  int old = getpriority(PRIO_PROCESS, 0);
-  setpriority(PRIO_PROCESS, 0, old+1);
-}
-
-// Âðåìåííî óñòàíîâèòü ïðèîðèòåò òðåäà êàêîé ïîëàãàåòñÿ äëÿ òðåäîâ ñæàòèÿ (ðàñïàêîâêè, øèôðîâàíèÿ...)
-int BeginCompressionThreadPriority (void)
-{
-  int old = getpriority(PRIO_PROCESS, 0);
-  //setpriority(PRIO_PROCESS, 0, old+1);        çàêîììåíòèðîâàíî èç-çà ïðîáëåì ñ âîññòàíîâëåíèåì ñòàðîãî ïðèîðèòåòà :(
-  return old;
-}
-
-// Âîññòàíîâèòü ïðèîðèòåò òðåäà òàêèì, êàê ìû åãî çàïîìíèëè
-void EndCompressionThreadPriority (int old_priority)
-{
-  //setpriority(PRIO_PROCESS, 0, old_priority);
-}
-
-#endif // Windows/Unix
 
 
 // Ñîçäàòü êàòàëîãè íà ïóòè ê name