@nxtedition/lib 26.0.36 → 26.1.0

package/app.js

@@ -37,8 +37,8 @@ import { isTimeBetween } from './time.js'
 import makeUnderPressure from './under-pressure.js'
 import undici from '@nxtedition/undici'
 import { isPrimary } from 'node:cluster'
-import path from 'node:path'
-import { nice, sched_getaffinity, sched_setaffinity } from '@nxtedition/sched'
+import { nice } from '@nxtedition/sched'
+import { setAffinity } from './numa.js'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -317,69 +317,21 @@ export function makeApp(appConfig, onTerminate) {
 
   let affinity = null
 
-  const numa = appConfig.numa ?? config.numa
-  if (process.platform === 'linux' && (isMainThread || numa != null) && numa !== false) {
-    const allNodes = []
-    for (const entry of fs.readdirSync('/sys/devices/system/node')) {
-      if (!entry.startsWith('node')) {
-        continue
-      }
-
-      const cpulist = fs
-        .readFileSync(path.join('/sys/devices/system/node', entry, 'cpulist'), 'utf8')
-        .trim()
-      const cpus = []
-      for (const part of cpulist.split(',')) {
-        if (part.includes('-')) {
-          const [start, end] = part.split('-').map(Number)
-          for (let i = start; i <= end; i++) {
-            cpus.push(i)
-          }
-        } else {
-          cpus.push(Number(part))
-        }
-      }
-      allNodes.push(cpus)
-    }
-
-    let indices = []
-    if (Number.isInteger(numa)) {
-      indices = [numa % allNodes.length]
-    } else if (
-      numa == null ||
-      numa === true ||
-      numa === 'auto' ||
-      numa === 'hash' ||
-      numa === 'default'
-    ) {
-      indices = [hashString(JSON.stringify({ serviceName, serviceModule })) % allNodes.length]
-    } else {
-      throw Object.assign(new Error('invalid numa configuration: ' + numa), {
-        data: { numa, allNodes },
-      })
-    }
-
-    const prev = sched_getaffinity(0)
-
-    affinity = indices.flatMap((i) => allNodes[i] ?? [])
-    affinity = fp.uniq(affinity)
-    affinity = fp.intersection(affinity, prev)
-
-    if (
-      !Array.isArray(affinity) ||
-      affinity.length === 0 ||
-      affinity.some((x) => !Number.isInteger(x) || x < 0)
-    ) {
-      throw Object.assign(new Error('invalid numa configuration:' + numa), {
-        data: { numa, allNodes, indices, next: affinity, prev },
-      })
+  if (
+    process.platform === 'linux' &&
+    (isMainThread || appConfig.numa != null) &&
+    appConfig.numa !== false
+  ) {
+    let numa = appConfig.numa
+    if (numa == null || numa === true) {
+      numa = hashString(JSON.stringify({ serviceName, serviceModule }))
     }
 
     try {
-      sched_setaffinity(0, affinity)
-      logger.debug({ data: { numa, affinity, indices } }, 'sched_setaffinity succeeded')
+      affinity = setAffinity(numa)
+      logger.debug({ data: { numa: appConfig.numa, affinity } }, 'set numa affinity succeeded')
     } catch (err) {
-      logger.error({ err }, 'sched_setaffinity failed')
+      logger.error({ err, data: { numa: appConfig.numa } }, 'set numa affinity failed')
     }
   }
 

package/numa.js

@@ -0,0 +1,42 @@
+import fs from 'node:fs'
+import path from 'node:path'
+
+import { sched_setaffinity } from '@nxtedition/sched'
+
+export function setAffinity(numa) {
+  const allNodes = []
+  for (const entry of fs.readdirSync('/sys/devices/system/node')) {
+    if (!entry.startsWith('node')) {
+      continue
+    }
+
+    const cpulist = fs
+      .readFileSync(path.join('/sys/devices/system/node', entry, 'cpulist'), 'utf8')
+      .trim()
+    const cpus = []
+    for (const part of cpulist.split(',')) {
+      if (part.includes('-')) {
+        const [start, end] = part.split('-').map(Number)
+        for (let i = start; i <= end; i++) {
+          cpus.push(i)
+        }
+      } else {
+        cpus.push(Number(part))
+      }
+    }
+    allNodes.push(cpus)
+  }
+
+  if (allNodes.length === 0) {
+    throw new Error('No NUMA nodes found')
+  }
+
+  if (!Number.isInteger(numa) || numa < 0) {
+    throw new Error('NUMA node must be a non-negative integer')
+  }
+
+  const indices = [numa % allNodes.length]
+  const affinity = indices.flatMap((i) => allNodes[i] ?? [])
+  sched_setaffinity(0, affinity)
+  return affinity
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.0.36",
+  "version": "26.1.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -27,6 +27,7 @@
     "logger.js",
     "logger.d.ts",
     "mime.js",
+    "numa.js",
     "proxy.js",
     "timers.js",
     "trace.js",