Merge pull request #5722 from btriller/CFE-30

CFE-30: Add policy variable sys.cpusockets

Author: larsewi

libenv/sysinfo.c

@@ -54,6 +54,7 @@
 #include <evalfunction.h>
 #include <json-utils.h>
 #include <unix.h>               /* GetCurrentUserName() */
+#include <glob_lib.h>
 
 #ifdef HAVE_ZONE_H
 # include <zone.h>
@@ -3059,6 +3060,52 @@ static void GetCPUInfo(EvalContext *ctx)
     count = (int)sysconf(_SC_NPROCESSORS_ONLN);
 #endif
 
+#ifdef __linux__
+    int package_id = 0, max_package_id = 0;
+    char buffer[CF_SMALLBUF] = "";
+    StringSet *package_id_files = GlobFileList("/sys/devices/system/cpu/cpu*/topology/physical_package_id");
+    StringSetIterator it = StringSetIteratorInit(package_id_files);
+    const char *file = NULL;
+
+    while ((file = StringSetIteratorNext(&it)))
+    {
+        int f = open(file, O_RDONLY);
+        if (f == -1)
+        {
+            continue;
+        }
+        ssize_t n_read = FullRead(f, buffer, sizeof(buffer));
+        if (n_read < 1)
+        {
+            continue;
+        }
+        if (sscanf(buffer, "%d", &package_id) == 1)
+        {
+            if (package_id > max_package_id)
+            {
+                max_package_id = package_id;
+            }
+        }
+    }
+    max_package_id++;
+    StringSetDestroy(package_id_files);
+
+    if (max_package_id == 1)
+    {
+        NDEBUG_UNUSED int ret = snprintf(buffer, CF_SMALLBUF, "%d_cpusocket", max_package_id);
+        assert(ret >= 0 && ret < CF_SMALLBUF);
+    }
+    else
+    {
+        NDEBUG_UNUSED int ret = snprintf(buffer, CF_SMALLBUF, "%d_cpusockets", max_package_id);
+        assert(ret >= 0 && ret < CF_SMALLBUF);
+    }
+    EvalContextClassPutHard(ctx, buffer, "source=agent,derived-from=sys.cpusockets");
+    NDEBUG_UNUSED int ret = snprintf(buffer, CF_SMALLBUF, "%d", max_package_id);
+    assert(ret >= 0 && ret < CF_SMALLBUF);
+    EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "cpusockets", buffer, CF_DATA_TYPE_STRING, "inventory,source=agent,attribute_name=CPU sockets");
+#endif
+
 #if defined(HAVE_SYS_SYSCTL_H) && defined(HW_NCPU)
     // BSD-derived platforms
     int mib[2] = { CTL_HW, HW_NCPU };

tests/acceptance/01_vars/01_basic/cpusockets.cf

@@ -0,0 +1,42 @@
+#######################################################
+#
+# Test that sys.cpusockets variable exists on Linux
+#
+#######################################################
+
+body common control
+{
+  inputs => { "../../default.cf.sub" };
+  bundlesequence => { default("$(this.promise_filename)") };
+  version => "1.0";
+}
+
+#######################################################
+
+bundle agent test
+{
+  meta:
+    "description" -> { "CFE-30" }
+      string => "Test that sys.cpusockets variable exists on Linux";
+
+    "test_soft_fail"
+      string => "!linux",
+      meta => { "CFE-30" };
+}
+
+#######################################################
+
+bundle agent check
+{
+  classes:
+    "ok"
+      expression => isvariable("sys.cpusockets");
+
+  methods:
+    "any"
+      usebundle => dcs_passif("ok", "$(this.promise_filename)"),
+      inherit => "true";
+
+  reports:
+    "I have $(sys.cpusockets) CPU socket(s)";
+}

tests/acceptance/02_classes/01_basic/n_cpusockets.cf

@@ -0,0 +1,43 @@
+#######################################################
+#
+# Test that n_cpusocket(s) class exists on Linux
+#
+#######################################################
+
+body common control
+{
+  inputs => { "../../default.cf.sub" };
+  bundlesequence => { default("$(this.promise_filename)") };
+  version => "1.0";
+}
+
+#######################################################
+
+bundle agent test
+{
+  meta:
+    "description" -> { "CFE-30" }
+      string => "Test that n_cpusocket(s) class exists on Linux";
+
+    "test_soft_fail"
+      string => "!linux",
+      meta => { "CFE-30" };
+
+  vars:
+    "num_matching"
+      int => countclassesmatching("[0-9]+_cpusockets?");
+}
+
+#######################################################
+
+bundle agent check
+{
+  classes:
+    "ok"
+      expression => eval("$(test.num_matching) == 1", "class", "infix");
+
+  methods:
+    "any"
+      usebundle => dcs_passif("ok", "$(this.promise_filename)"),
+      inherit => "true";
+}