From: Andrii Serbeniuk -X (aserbeni - SOFTSERVE INC at Cisco) <aserbeni@cisco.com>
Date: Wed, 10 Apr 2024 10:28:49 +0000 (+0000)
Subject: Pull request #4273: main: update usage of a deprecated hwloc macro
X-Git-Tag: 3.2.1.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f8e9cf28856359a1ef3081baa9240f90276f8d4;p=thirdparty%2Fsnort3.git

Pull request #4273: main: update usage of a deprecated hwloc macro

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!
---

diff --git a/src/main/thread_config.cc b/src/main/thread_config.cc
index bede4b760..07c7249ca 100644
--- a/src/main/thread_config.cc
+++ b/src/main/thread_config.cc
@@ -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;