Merge 'eugeneia/numa-selftest-nonnuma' into wingo-next

Fixes #1269.
snabbco · Jun 4, 2018 · 3120d7c · 3120d7c
2 parents bb935c7 + 2ece0c1
commit 3120d7c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/lib/numa.lua b/src/lib/numa.lua
@@ -109,6 +109,7 @@ function unbind_numa_node ()
 end
 
 function bind_to_numa_node (node)
+   if not has_numa() then return end
    if node == bound_numa_node then return end
    if not node then return unbind_numa_node() end
    assert(not bound_numa_node, "already bound")
@@ -135,11 +136,11 @@ function selftest ()
       assert(bound_cpu == cpu)
       assert(bound_numa_node == node)
       assert(S.getcpu().cpu == cpu)
-      assert(S.getcpu().node == node)
+      assert(not has_numa() or S.getcpu().node == node)
       bind_to_cpu(nil)
       assert(bound_cpu == nil)
       assert(bound_numa_node == node)
-      assert(S.getcpu().node == node)
+      assert(not has_numa() or S.getcpu().node == node)
       bind_to_numa_node(nil)
       assert(bound_cpu == nil)
       assert(bound_numa_node == nil)