Remove unused set_cpu_affinity, cleanup

Signed-off-by: falkTX <[email protected]>
mod-audio · Feb 3, 2024 · 99d9aa2 · 99d9aa2
1 parent 8905ca6
commit 99d9aa2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/modtools/utils.py b/modtools/utils.py
@@ -616,9 +616,6 @@ class JackData(Structure):
 utils.file_uri_parse.argtypes = (c_char_p,)
 utils.file_uri_parse.restype  = c_char_p
 
-utils.set_cpu_affinity.argtypes = (c_int,)
-utils.set_cpu_affinity.restype  = None
-
 utils.init_jack.argtypes = None
 utils.init_jack.restype  = c_bool
 
@@ -918,12 +915,6 @@ def get_bundle_dirname(bundleuri):
 
     return bundle
 
-# ------------------------------------------------------------------------------------------------------------
-# helper utilities
-
-def set_cpu_affinity(cpu):
-    utils.set_cpu_affinity(cpu)
-
 # ------------------------------------------------------------------------------------------------------------
 # jack stuff
 

diff --git a/utils/utils.h b/utils/utils.h
@@ -427,9 +427,6 @@ MOD_API const char* const* list_plugins_in_bundle(const char* bundle);
 // Convert a file URI to a local path string.
 MOD_API const char* file_uri_parse(const char* fileuri);
 
-// helper utilities
-MOD_API void set_cpu_affinity(int cpu);
-
 // jack stuff
 MOD_API bool init_jack(void);
 MOD_API void close_jack(void);

diff --git a/utils/utils_lilv.cpp b/utils/utils_lilv.cpp
@@ -242,7 +242,7 @@ inline bool contains(const std::unordered_map<std::string, T>& map, const std::s
     return map.find(value) != map.end();
 }
 
-inline bool ends_with(const std::string& value, const std::string ending)
+inline bool ends_with(const std::string& value, const std::string& ending)
 {
     if (ending.size() > value.size())
         return false;
@@ -267,7 +267,7 @@ inline std::string sha1(const char* const cstring)
 
     uint8_t* const hashenc = sha1_result(&s);
     for (int i=0; i<HASH_LENGTH; i++) {
-        sprintf(hashdec+(i*2), "%02x", hashenc[i]);
+        snprintf(hashdec+(i*2), 3, "%02x", hashenc[i]);
     }
     hashdec[HASH_LENGTH*2] = '\0';
 
@@ -5957,15 +5957,4 @@ const char* file_uri_parse(const char* const fileuri)
     return _file_uri_parse_ret != nullptr ? _file_uri_parse_ret : nc;
 }
 
-void set_cpu_affinity(const int cpu)
-{
-#ifdef __linux__
-     printf("NOTE: Running pinned to core #%d\n", cpu+1);
-     cpu_set_t cpuset;
-     CPU_ZERO(&cpuset);
-     CPU_SET(cpu, &cpuset);
-     sched_setaffinity(0, sizeof(cpuset), &cpuset);
-#endif
-}
-
 // --------------------------------------------------------------------------------------------------------