]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #4273: main: update usage of a deprecated hwloc macro
authorAndrii Serbeniuk -X (aserbeni - SOFTSERVE INC at Cisco) <aserbeni@cisco.com>
Wed, 10 Apr 2024 10:28:49 +0000 (10:28 +0000)
committerOleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Wed, 10 Apr 2024 10:28:49 +0000 (10:28 +0000)
Merge in SNORT/snort3 from ~ASERBENI/snort3:hwloc_macro_update to master

Squashed commit of the following:

commit 82c0b7a89d3c9fbfcc7d870fe9572df21ae6bb9e
Author: Andrii Serbeniuk <aserbeni@cisco.com>
Date:   Tue Apr 9 11:09:37 2024 -0400

    main: update usage of a deprecated hwloc macro

    Thanks to teicors for reporting the issue!

src/main/thread_config.cc

index bede4b760ee96fe44b6fe1f2f20b02b0f3301037..07c7249ca56d6e372a19cd5354d67ae1bfde0720 100644 (file)
@@ -235,7 +235,7 @@ void ThreadConfig::apply_thread_policy(SThreadType type, unsigned id)
 
 int ThreadConfig::get_numa_node(hwloc_topology_t topology, hwloc_cpuset_t cpuset)
 {
-    int depth = hwloc->get_type_depth(topology, HWLOC_OBJ_NODE);
+    int depth = hwloc->get_type_depth(topology, HWLOC_OBJ_NUMANODE);
     if (depth == HWLOC_TYPE_DEPTH_UNKNOWN)
         return -1;