Merge pull request #267 from sergey-dryabzhinsky/issue-266-stop-cache-of-cpu-cores

Issue 266 stop cache of cpu cores

Author: sergey-dryabzhinsky

src/python-zstd.c

@@ -474,6 +474,14 @@ static PyObject *py_zstd_set_cpu_cores_cache_ttl(PyObject* self, PyObject *args)
 	return Py_BuildValue("i", 0);
 }
 
+static PyObject *py_zstd_stop_cpu_cores_cache(PyObject* self, PyObject *args)
+{
+    UNUSED(self);
+
+	UTIL_stopCpuCoresCache();
+	return Py_BuildValue("i", 0);
+}
+
 /**
  * Returns ZSTD determined max threads count, int
  */
@@ -554,6 +562,7 @@ static PyMethodDef ZstdMethods[] = {
     {"ZSTD_is_debug_error_enabled",  py_zstd_is_debug_error_enabled, METH_NOARGS, NULL},
 
 	{"ZSTD_setCpuCoresCacheTTL",  py_zstd_set_cpu_cores_cache_ttl,METH_VARARGS, NULL},
+    {"ZSTD_stopCpuCoresCache",  py_zstd_stop_cpu_cores_cache,METH_NOARGS, NULL},
 
     {NULL, NULL, 0, NULL}
 };

src/util.c

@@ -39,7 +39,7 @@ typedef BOOL(WINAPI* LPFN_GLPI)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
 
 int UTIL_countAvailableCores(void)
 {
-    static int numLogicalCores = 0;
+    static int numLogicalCores = 1;
     static time_t lastTimeCached = 0;
     time_t currTime = time(NULL);
     int cachettl = 60;
@@ -122,7 +122,7 @@ int UTIL_countAvailableCores(void)
  * see: man 3 sysctl */
 int UTIL_countAvailableCores(void)
 {
-    static int32_t numLogicalCores = 0; /* apple specifies int32_t */
+    static int32_t numLogicalCores = 1; /* apple specifies int32_t */
     static time_t lastTimeCached = 0;
     time_t currTime = time(NULL);
     int cachettl = 60;
@@ -153,7 +153,7 @@ int UTIL_countAvailableCores(void)
  * otherwise fall back on sysconf */
 int UTIL_countAvailableCores(void)
 {
-    static int numLogicalCores = 0;
+    static int numLogicalCores = 1;
     static time_t lastTimeCached = 0;
     time_t currTime = time(NULL);
  //   int cachettl = 60;
@@ -257,7 +257,7 @@ int UTIL_countAvailableCores(void)
  * see: man 4 smp, man 3 sysctl */
 int UTIL_countAvailableCores(void)
 {
-    static int numLogicalCores = 0; /* freebsd sysctl is native int sized */
+    static int numLogicalCores = 1; /* freebsd sysctl is native int sized */
     static time_t lastTimeCached = 0;
     time_t currTime = time(NULL);
  //   int cachettl = 60;
@@ -292,7 +292,7 @@ int UTIL_countAvailableCores(void)
  * see: man 3 sysconf */
 int UTIL_countAvailableCores(void)
 {
-    static int numLogicalCores = 0;
+    static int numLogicalCores = 1;
     static time_t lastTimeCached = 0;
     time_t currTime = time(NULL);
 //    int cachettl = 60;
@@ -324,6 +324,11 @@ int UTIL_setCpuCoresCacheTTL(int cacheTTL){
 	return 0;
 }
 
+int UTIL_stopCpuCoresCache(void){
+	util_cpuCoresCacheTTL = 0;
+	return 0;
+}
+
 #if defined (__cplusplus)
 }
 #endif

src/util.h

@@ -69,6 +69,8 @@ extern "C" {
 static int util_cpuCoresCacheTTL = 60;
 int UTIL_countAvailableCores(void);
 int UTIL_setCpuCoresCacheTTL(int cacheTTL);
+int UTIL_stopCpuCoresCache(void);
+
 
 #if defined (__cplusplus)
 }

tests/test_speed.py

@@ -99,6 +99,39 @@ def test_check_speed(self):
         log.info("Check speed average = %6.2f Mb/sec" % (1.0*sum/1024/1024/wait,))
         log.info("diff Check memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,))
 
+    def test_cpu_cores_cache_default_speed(self):
+        wait = 70
+        log.info("\nWait %d seconds..." % wait)
+        ops = 0
+        tbegin = time()
+        beginMemoryUsage=get_real_memory_usage()
+        log.info("begin Check memory usage= %6.2f kb" % (1.0*beginMemoryUsage/1024,))
+        while time()-tbegin<wait:
+            cores = zstd.ZSTD_threads_count()
+            ops+=1
+
+        endMemoryUsage=get_real_memory_usage()
+        log.info("end Check memory usage = %6.2f kb" % (1.0*endMemoryUsage/1024,))
+        log.info("Check cache use speed(default) average = %6.2f Ops/sec" % (1.0*ops/wait,))
+        log.info("diff Check memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,))
+
+    def test_cpu_cores_cache_none_speed(self):
+        wait = 70
+        log.info("\nWait %d seconds..." % wait)
+        ops = 0
+        tbegin = time()
+        beginMemoryUsage=get_real_memory_usage()
+        zstd.ZSTD_stopCpuCoresCache()
+        log.info("begin Check memory usage= %6.2f kb" % (1.0*beginMemoryUsage/1024,))
+        while time()-tbegin<wait:
+            cores = zstd.ZSTD_threads_count()
+            ops+=1
+
+        endMemoryUsage=get_real_memory_usage()
+        log.info("end Check memory usage = %6.2f kb" % (1.0*endMemoryUsage/1024,))
+        log.info("Check cache use speed(0) average = %6.2f Ops/sec" % (1.0*ops/wait,))
+        log.info("diff Check memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,))
+    
     def test_cpu_cores_cache_60_speed(self):
         wait = 70
         log.info("\nWait %d seconds..." % wait)
@@ -114,7 +147,7 @@ def test_cpu_cores_cache_60_speed(self):
         log.info("end Check memory usage = %6.2f kb" % (1.0*endMemoryUsage/1024,))
         log.info("Check cache use speed(60) average = %6.2f Ops/sec" % (1.0*ops/wait,))
         log.info("diff Check memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,))
-
+        
     def test_cpu_cores_cache_01_speed(self):
         wait = 70
         log.info("\nWait %d seconds..." % wait)