File 0001-System-depend-code-deduplication.patch of Package opentoonz

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-System-depend-code-deduplication.patch of Package opentoonz (Revision 42b771c745cd06f0b14232cea3b9a0c0)

Currently displaying revision 42b771c745cd06f0b14232cea3b9a0c0 , Show latest

From 26d905d84b7a9f3385a8116fa8065916e9ca945c Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk.im@gmail.com>
Date: Fri, 22 May 2020 16:54:16 +0300
Subject: [PATCH] System depend code deduplication

---
 .../toonzfarm/tfarmserver/tfarmserver.cpp     | 39 +++----------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
index 6b2cacc3..4142d717 100644
--- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
+++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
@@ -46,14 +46,6 @@ using namespace TVER;
 #define NO_ERROR 0
 #endif
 
-#ifdef MACOSX
-#include <sys/sysctl.h>  //To retrieve MAC HW infos
-#endif
-
-#ifdef LINUX
-#include <sys/sysctl.h>
-#endif
-
 // forward declaration
 class FarmServer;
 
@@ -660,35 +652,16 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo) {
   hwInfo.m_cpuCount     = TSystem::getProcessorCount();
   hwInfo.m_type         = Windows;
 #else
-#ifdef __sgi
-  hwInfo.m_cpuCount = sysconf(_SC_NPROC_CONF);
-  hwInfo.m_type     = Irix;
-#else
-
-#ifdef MACOSX
-  int mib[2];
-  TINT64 physMemSize;
-  size_t len;
-
-  mib[0] = CTL_HW;
-  mib[1] = HW_MEMSIZE;
-  len    = sizeof(physMemSize);
-  sysctl(mib, 2, &physMemSize, &len, NULL, 0);
-#endif
-
-#ifdef LINUX
-  TINT64 physMemSize =
-      (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE);
-#endif
-
-  hwInfo.m_cpuCount = TSystem::getProcessorCount();
-
   // We can just retrieve the overall physical memory - the rest is defaulted to
   // 500 MB
-  hwInfo.m_totPhysMem   = physMemSize;
-  hwInfo.m_availPhysMem = 500000000;
+  hwInfo.m_totPhysMem   = TSystem::getMemorySize(true);
+  hwInfo.m_availPhysMem = TSystem::getFreeMemorySize(true);
   hwInfo.m_totVirtMem   = 500000000;
   hwInfo.m_availVirtMem = 500000000;
+  hwInfo.m_cpuCount     = TSystem::getProcessorCount();
+#ifdef __sgi
+  hwInfo.m_type         = Irix;
+#else
   hwInfo.m_type         = Linux;
 #endif
 #endif
-- 
2.28.0

Places

File 0001-System-depend-code-deduplication.patch of Package opentoonz (Revision 42b771c745cd06f0b14232cea3b9a0c0)

Places