From d3150bf0a5180f6f36ecbb42d416994cc6fac88d Mon Sep 17 00:00:00 2001
From: fireice-uk <fireice-uk@users.noreply.github.com>
Date: Mon, 10 Jul 2017 21:25:11 +0100
Subject: [PATCH] Make the code portable to hwloc 2.x

---
 autoAdjustHwloc.hpp | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/autoAdjustHwloc.hpp b/autoAdjustHwloc.hpp
index c76cd5f..5e010a2 100644
--- a/autoAdjustHwloc.hpp
+++ b/autoAdjustHwloc.hpp
@@ -35,7 +35,7 @@ public:
 			tlcs.reserve(16);
 			results.reserve(16);
 
-			findChildrenByType(hwloc_get_root_obj(topology), HWLOC_OBJ_CACHE,
+			findChildrenCaches(hwloc_get_root_obj(topology),
 				[&tlcs](hwloc_obj_t found) { tlcs.emplace_back(found); } );
 
 			if(tlcs.size() == 0)
@@ -87,6 +87,27 @@ private:
 		}
 	}
 
+	inline bool isCacheObject(hwloc_obj_t obj)
+	{
+#if HWLOC_API_VERSION >= 0x20000
+		return hwloc_obj_type_is_cache(obj->type);
+#else
+		return obj->type == HWLOC_OBJ_CACHE;
+#endif // HWLOC_API_VERSION
+	}
+
+	template<typename func>
+	inline void findChildrenCaches(hwloc_obj_t obj, func lambda)
+	{
+		for(size_t i=0; i < obj->arity; i++)
+		{
+			if(isCacheObject(obj->children[i]))
+				lambda(obj->children[i]);
+			else
+				findChildrenCaches(obj->children[i], lambda);
+		}
+	}
+
 	inline bool isCacheExclusive(hwloc_obj_t obj)
 	{
 		const char* value = hwloc_obj_get_info_by_name(obj, "Inclusive");
@@ -110,7 +131,7 @@ private:
 		if(obj->attr->cache.size == 0)
 		{
 			//We will always have one child if PUs > 0
-			if(obj->children[0]->type != HWLOC_OBJ_CACHE)
+			if(!isCacheObject(obj->children[0]))
 				throw(std::runtime_error("The CPU doesn't seem to have a cache."));
 
 			//Try our luck with lower level caches
@@ -126,7 +147,7 @@ private:
 			{
 				hwloc_obj_t l2obj = obj->children[i];
 				//If L2 is exclusive and greater or equal to 2MB add room for one more hash
-				if(l2obj->type == HWLOC_OBJ_CACHE && l2obj->attr != nullptr && l2obj->attr->cache.size >= hashSize)
+				if(isCacheObject(l2obj) && l2obj->attr != nullptr && l2obj->attr->cache.size >= hashSize)
 					cacheSize += hashSize;
 			}
 		}