Improve RMI code. (#303)

* Improve coding style consistency.
* Improve resource usage: 1 fewer thread is spawned by ZMQ.

Signed-off-by: Samuel K. Gutierrez <[email protected]>

Author: samuelkgutierrez

src/quo-vadisd.cc

@@ -25,9 +25,9 @@
 #include "qvi-rmi.h"
 
 struct context_s {
-    qvi_rmi_config_s rmic;
+    qvi_rmi_config rmic;
     qvi_hwloc_t *hwloc = nullptr;
-    qvi_rmi_server_t *rmi = nullptr;
+    qvi_rmi_server *rmi = nullptr;
     bool daemonized = false;
     /** Constructor. */
     context_s(void)
@@ -37,15 +37,15 @@ struct context_s {
             throw qvi_runtime_error();
         }
 
-        rc = qvi_rmi_server_new(&rmi);
+        rc = qvi_new(&rmi);
         if (rc != QV_SUCCESS) {
             throw qvi_runtime_error();
         }
     }
     /** Destructor */
     ~context_s(void)
     {
-        qvi_rmi_server_delete(&rmi);
+        qvi_delete(&rmi);
         qvi_hwloc_delete(&hwloc);
     }
 };
@@ -114,9 +114,9 @@ rmi_config(
         return;
     }
 
-    rc = qvi_rmi_server_config(ctx.rmi, &ctx.rmic);
+    rc = ctx.rmi->configure(ctx.rmic);
     if (rc != QV_SUCCESS) {
-        qvi_panic_log_error("qvi_rmi_server_config() failed");
+        qvi_panic_log_error("rmi->configure() failed");
         return;
     }
 
@@ -132,12 +132,12 @@ rmi_start(
 
     cstr_t ers = nullptr;
 
-    int rc = qvi_rmi_server_start(ctx.rmi);
-    if (rc != QV_SUCCESS) {
+    const int rc = ctx.rmi->start();
+    if (qvi_unlikely(rc != QV_SUCCESS)) {
         ers = "qvi_rmi_server_start() failed";
     }
     // TODO(skg) Add flags option
-    if (ers) {
+    if (qvi_unlikely(ers)) {
         qvi_panic_log_error("{} (rc={}, {})", ers, rc, qv_strerr(rc));
     }
 }

src/qvi-common.h

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2024 Triad National Security, LLC
+ * Copyright (c) 2020-2025 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -72,8 +72,7 @@ struct qvi_bbuff;
 struct qvi_hwloc_s;
 typedef struct qvi_hwloc_s qvi_hwloc_t;
 
-struct qvi_rmi_client_s;
-typedef struct qvi_rmi_client_s qvi_rmi_client_t;
+struct qvi_rmi_client;
 
 struct qvi_task;
 

src/qvi-hwsplit.cc

@@ -177,7 +177,7 @@ qvi_hwsplit::split_cpuset(
     // The cpuset that we are going to split.
     const qvi_hwloc_bitmap base_cpuset = cpuset();
     // Pointer to my hwloc instance.
-    qvi_hwloc_t *const hwloc = qvi_rmi_client_hwloc(m_rmi);
+    qvi_hwloc_t *const hwloc = m_rmi->hwloc();
     // Holds the host's split cpusets.
     result.resize(m_split_size);
     // Notice that we do not go through the RMI for this because this is just an
@@ -258,7 +258,7 @@ qvi_hwsplit::osdev_cpusets(
     // Get the number of devices we have available in the provided scope.
     int nobj = 0;
     int rc = m_hwpool->nobjects(
-        qvi_rmi_client_hwloc(m_rmi), m_split_at_type, &nobj
+        m_rmi->hwloc(), m_split_at_type, &nobj
     );
     if (rc != QV_SUCCESS) return rc;
     // Holds the device affinities used for the split.
@@ -470,7 +470,7 @@ qvi_hwsplit::split_user_defined(void)
     qvi_map_t map{};
     rc = qvi_map_colors(map, m_colors, cpusets);
     if (rc != QV_SUCCESS) return rc;
-    qvi_hwloc_t *const hwloc = qvi_rmi_client_hwloc(m_rmi);
+    qvi_hwloc_t *const hwloc = m_rmi->hwloc();
     // Update the hardware pools and colors to reflect the new mapping.
     rc = apply_cpuset_mapping(
         hwloc, map, cpusets, m_hwpools, m_colors
@@ -500,7 +500,7 @@ qvi_hwsplit::split_affinity_preserving_pass1(void)
     if (qvi_map_nfids_mapped(map) != m_group_size) {
         qvi_abort();
     }
-    qvi_hwloc_t *const hwloc = qvi_rmi_client_hwloc(m_rmi);
+    qvi_hwloc_t *const hwloc = m_rmi->hwloc();
     // Update the hardware pools and colors to reflect the new mapping.
     return apply_cpuset_mapping(
         hwloc, map, cpusets, m_hwpools, m_colors

src/qvi-hwsplit.h

@@ -35,7 +35,7 @@ struct qvi_hwsplit {
     friend qvi_hwsplit_coll;
 private:
     /** A pointer to my RMI. */
-    qvi_rmi_client_t *m_rmi = nullptr;
+    qvi_rmi_client *m_rmi = nullptr;
     /** The base hardware pool we are splitting. */
     qvi_hwpool *m_hwpool = nullptr;
     /** The number of members that are part of the split. */