Update group ID handling with cleanups.

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

src/CMakeLists.txt

@@ -43,7 +43,6 @@ add_library(
       qvi-rmi.cc
       qvi-context.cc
       qvi-task.cc
-      qvi-group.cc
       qvi-map.cc
       qvi-scope.cc
       qvi-bind.cc

src/qvi-group.h

@@ -79,17 +79,25 @@ struct qvi_group_s {
         int root,
         qvi_bbuff_t **rxbuff
     ) = 0;
+    /** Returns a unique group ID after each call. */
+    static int
+    next_id(
+        qvi_group_id_t *gid
+    ) {
+        // Global group ID. Note that we pad its initial value so that other
+        // infrastructure (e.g., QVI_MPI_GROUP_INTRINSIC_END) will never
+        // equal or exceed this value.
+        static std::atomic<qvi_group_id_t> group_id(64);
+        if (group_id == UINT64_MAX) {
+            qvi_log_error("Group ID space exhausted");
+            return QV_ERR_OOR;
+        }
+        *gid = group_id++;
+        return QV_SUCCESS;
+    }
 };
 typedef struct qvi_group_s qvi_group_t;
 
-/**
- *
- */
-int
-qvi_group_next_id(
-    qvi_group_id_t *gid
-);
-
 #endif
 
 /*

src/qvi-mpi.cc

@@ -92,7 +92,7 @@ next_group_tab_id(
     qvi_mpi_t *,
     qvi_mpi_group_id_t *gid
 ) {
-    return qvi_group_next_id(gid);
+    return qvi_group_t::next_id(gid);
 }
 
 /**

src/qvi-process.cc

@@ -67,7 +67,7 @@ next_group_tab_id(
     qvi_process_t *,
     qvi_process_group_id_t *gid
 ) {
-    return qvi_group_next_id(gid);
+    return qvi_group_t::next_id(gid);
 }
 
 int

src/qvi-rmi.cc

@@ -734,10 +734,11 @@ int
 qvi_rmi_server_new(
     qvi_rmi_server_t **server
 ) {
-    int rc = QV_SUCCESS;
     cstr_t ers = nullptr;
 
-    qvi_rmi_server_t *iserver = new qvi_rmi_server_t();
+    qvi_rmi_server_t *iserver = nullptr;
+    int rc = qvi_new_rc(&iserver);
+    if (rc != QV_SUCCESS) goto out;
 
     iserver->zctx = zmq_ctx_new();
     if (!iserver->zctx) {
@@ -894,11 +895,11 @@ int
 qvi_rmi_client_new(
     qvi_rmi_client_t **client
 ) {
-    int rc = QV_SUCCESS;
     cstr_t ers = nullptr;
 
-    qvi_rmi_client_t *icli = new qvi_rmi_client_t();
-
+    qvi_rmi_client_t *icli = nullptr;
+    int rc = qvi_new_rc(&icli);
+    if (rc != QV_SUCCESS) goto out;
     // Remember clients own the hwloc data, unlike the server.
     rc = qvi_hwloc_new(&icli->config.hwloc);
     if (rc != QV_SUCCESS) {

src/qvi-thread.cc

@@ -90,7 +90,7 @@ next_group_tab_id(
     qvi_thread_group_id_t *gid
 ) {
     QVI_UNUSED(th);
-    return qvi_group_next_id(gid);
+    return qvi_group_t::next_id(gid);
 }
 
 /**