Skip to content

Commit fc06ff9

Browse files
Fix warting: missing return
1 parent fe0c74f commit fc06ff9

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/python-zstd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ static PyMethodDef ZstdMethods[] = {
718718
{"ZSTD_version_compiled", py_zstd_library_version_compiled, METH_NOARGS, NULL},
719719
{"ZSTD_version_loaded", py_zstd_library_version_loaded, METH_NOARGS, NULL},
720720
{"ZSTD_version_number", py_zstd_library_version_int, METH_NOARGS, ZSTD_INT_VERSION_DOCSTRING},
721-
{"ZSTD_threads_count", py_zstd_threads_count, METH_NOARGS, ZSTD_THREADS_COUNT_DOCSTRING},
721+
{"ZSTD_threads_count", py_zstd_cpu_count_sysconf, METH_NOARGS, ZSTD_THREADS_COUNT_DOCSTRING},
722722
{"ZSTD_cpu_count_sysconf", py_zstd_cpu_count_sysconf, METH_NOARGS, ZSTD_THREADS_COUNT_DOCSTRING},
723723
{"ZSTD_cpu_count_cpuinfo", py_zstd_cpu_count_cpuinfo, METH_NOARGS, ZSTD_THREADS_COUNT_DOCSTRING},
724724
{"ZSTD_max_threads_count", py_zstd_max_threads_count, METH_NOARGS, ZSTD_MAX_THREADS_COUNT_DOCSTRING},

src/util.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ int UTIL_countAvailableCores_posix_sysconf(void)
163163
return numLogicalCores;
164164
}
165165
printdn("Sysconf readed. numLogicalCores: %d\n", numLogicalCores);
166+
lastTimeCached = time(NULL);
167+
return numLogicalCores;
166168
}
167169
/* Only parse /proc/cpuinfo
168170
* siblings / cpu cores should give hyperthreading ratio

tests/test_speed.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def test_cpu_cores_cache_none_speed(self):
258258

259259
endMemoryUsage=get_real_memory_usage()
260260
log.info("end Check memory usage = %6.2f kb" % (1.0*endMemoryUsage/1024,))
261-
log.info("Check cache use speed(0) average = %6.2f Ops/sec" % (1.0*ops/wait,))
261+
log.info("Check cache use cache(0) and DEFAULT average = %6.2f Ops/sec" % (1.0*ops/wait,))
262262
log.info("diff Check memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,))
263263

264264
def test_cpu_cores_cache_none_sysconf_speed(self):
@@ -277,7 +277,7 @@ def test_cpu_cores_cache_none_sysconf_speed(self):
277277

278278
endMemoryUsage=get_real_memory_usage()
279279
log.info("end Check memory usage = %6.2f kb" % (1.0*endMemoryUsage/1024,))
280-
log.info("Check cache use speed(0) average = %6.2f Ops/sec" % (1.0*ops/wait,))
280+
log.info("Check cache use cache(0) and call SYSCONF average = %6.2f Ops/sec" % (1.0*ops/wait,))
281281
log.info("diff Check memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,))
282282

283283

@@ -297,7 +297,7 @@ def test_cpu_cores_cache_none_cpuinfo_speed(self):
297297

298298
endMemoryUsage=get_real_memory_usage()
299299
log.info("end Check memory usage = %6.2f kb" % (1.0*endMemoryUsage/1024,))
300-
log.info("Check cache use speed(0) average = %6.2f Ops/sec" % (1.0*ops/wait,))
300+
log.info("Check cache use cache(0) and parse CPUINFO average = %6.2f Ops/sec" % (1.0*ops/wait,))
301301
log.info("diff Check memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,))
302302

303303
def test_cpu_cores_cache_60_speed(self):

0 commit comments

Comments
 (0)