From 8d1f0bb91a350b2cc072a7b2a583005030268532 Mon Sep 17 00:00:00 2001
From: "Samuel K. Gutierrez" <samuel@lanl.gov>
Date: Sat, 13 Jul 2024 14:49:30 -0600
Subject: [PATCH] Add qvi_bbuff_dup() and use it.

Signed-off-by: Samuel K. Gutierrez <samuel@lanl.gov>
---
 src/quo-vadis-omp.cc     |  4 +++-
 src/quo-vadis-pthread.cc |  4 +++-
 src/qvi-bbuff.cc         | 16 ++++++++++++++++
 src/qvi-bbuff.h          |  6 ++++++
 src/qvi-omp.cc           | 22 +++-------------------
 src/qvi-process.cc       | 16 ++--------------
 6 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/quo-vadis-omp.cc b/src/quo-vadis-omp.cc
index d6f46c4..5aea550 100644
--- a/src/quo-vadis-omp.cc
+++ b/src/quo-vadis-omp.cc
@@ -43,7 +43,9 @@ qv_omp_scope_get(
     qv_scope_intrinsic_t iscope,
     qv_scope_t **scope
 ) {
-    if (!scope) return QV_ERR_INVLD_ARG;
+    if (!scope) {
+        return QV_ERR_INVLD_ARG;
+    }
     try {
         return qvi_omp_scope_get(iscope, scope);
     }
diff --git a/src/quo-vadis-pthread.cc b/src/quo-vadis-pthread.cc
index 4d8ce3d..3543c92 100644
--- a/src/quo-vadis-pthread.cc
+++ b/src/quo-vadis-pthread.cc
@@ -117,7 +117,9 @@ qv_pthread_scopes_free(
     int nscopes,
     qv_scope_t **scopes
 ) {
-    if (nscopes < 0 || !scopes) return QV_ERR_INVLD_ARG;
+    if (nscopes < 0 || !scopes) {
+        return QV_ERR_INVLD_ARG;
+    }
     try {
         qvi_scope_kfree(&scopes, nscopes);
         return QV_SUCCESS;
diff --git a/src/qvi-bbuff.cc b/src/qvi-bbuff.cc
index 3d337e7..9161590 100644
--- a/src/qvi-bbuff.cc
+++ b/src/qvi-bbuff.cc
@@ -33,6 +33,14 @@ struct qvi_bbuff_s {
         data = calloc(capacity, sizeof(byte_t));
         if (!data) throw qvi_runtime_error();
     }
+    /** Copy constructor. */
+    qvi_bbuff_s(
+        const qvi_bbuff_s &src
+    ) : qvi_bbuff_s()
+    {
+        const int rc = qvi_bbuff_append(this, src.data, src.size);
+        if (rc != QV_SUCCESS) throw qvi_runtime_error();
+    }
     /** Destructor. */
     ~qvi_bbuff_s(void)
     {
@@ -47,6 +55,14 @@ qvi_bbuff_new(
     return qvi_new(buff);
 }
 
+int
+qvi_bbuff_dup(
+    const qvi_bbuff_t *const src,
+    qvi_bbuff_t **buff
+) {
+    return qvi_dup(*src, buff);
+}
+
 void
 qvi_bbuff_free(
     qvi_bbuff_t **buff
diff --git a/src/qvi-bbuff.h b/src/qvi-bbuff.h
index 2489d4e..484031d 100644
--- a/src/qvi-bbuff.h
+++ b/src/qvi-bbuff.h
@@ -33,6 +33,12 @@ qvi_bbuff_new(
     qvi_bbuff_t **buff
 );
 
+int
+qvi_bbuff_dup(
+    const qvi_bbuff_t *const src,
+    qvi_bbuff_t **buff
+);
+
 /**
  *
  */
diff --git a/src/qvi-omp.cc b/src/qvi-omp.cc
index 6d6610e..8569005 100644
--- a/src/qvi-omp.cc
+++ b/src/qvi-omp.cc
@@ -222,17 +222,9 @@ qvi_omp_group_gather_bbuffs(
     #pragma omp single copyprivate(bbuffs)
     bbuffs = new qvi_bbuff_t *[group_size]();
 
-    int rc = qvi_bbuff_new(&bbuffs[group_id]);
-    if (rc != QV_SUCCESS) goto out;
-
-    rc = qvi_bbuff_append(
-        bbuffs[group_id], qvi_bbuff_data(txbuff), qvi_bbuff_size(txbuff)
-    );
-    if (rc != QV_SUCCESS) goto out;
-
+    const int rc = qvi_bbuff_dup(txbuff, &bbuffs[group_id]);
     // Need to ensure that all threads have contributed to bbuffs.
     #pragma omp barrier
-out:
     if (rc != QV_SUCCESS) {
         #pragma omp single
         {
@@ -263,20 +255,12 @@ qvi_omp_group_scatter_bbuffs(
     #pragma omp master
     *tmp = txbuffs;
     #pragma omp barrier
-    const int group_id = group->rank;
-    qvi_bbuff_t *inbuff = (*tmp)[group_id];
-    const size_t data_size = qvi_bbuff_size(inbuff);
-    void *data = qvi_bbuff_data(inbuff);
-
+    qvi_bbuff_t *inbuff = (*tmp)[group->rank];
     qvi_bbuff_t *mybbuff = nullptr;
-    int rc = qvi_bbuff_new(&mybbuff);
-    if (rc == QV_SUCCESS) {
-        rc = qvi_bbuff_append(mybbuff, data, data_size);
-    }
+    const int rc = qvi_bbuff_dup(inbuff, &mybbuff);
     #pragma omp barrier
     #pragma omp single
     delete tmp;
-
     if (rc != QV_SUCCESS) {
         qvi_bbuff_free(&mybbuff);
     }
diff --git a/src/qvi-process.cc b/src/qvi-process.cc
index 2baf7e6..916da7b 100644
--- a/src/qvi-process.cc
+++ b/src/qvi-process.cc
@@ -72,25 +72,13 @@ qvi_process_group_gather_bbuffs(
     if (root != 0 || group_size != 1) {
         qvi_abort();
     }
-
-    int rc = QV_SUCCESS;
-    std::vector<size_t> rxcounts = {qvi_bbuff_size(txbuff)};
     // Zero initialize array of pointers to nullptr.
     qvi_bbuff_t **bbuffs = new qvi_bbuff_t *[group_size]();
 
-    byte_t *bytepos = (byte_t *)qvi_bbuff_data(txbuff);
-    for (int i = 0; i < group_size; ++i) {
-        rc = qvi_bbuff_new(&bbuffs[i]);
-        if (rc != QV_SUCCESS) break;
-        rc = qvi_bbuff_append(bbuffs[i], bytepos, rxcounts[i]);
-        if (rc != QV_SUCCESS) break;
-        bytepos += rxcounts[i];
-    }
+    const int rc = qvi_bbuff_dup(txbuff, &bbuffs[0]);
     if (rc != QV_SUCCESS) {
         if (bbuffs) {
-            for (int i = 0; i < group_size; ++i) {
-                qvi_bbuff_free(&bbuffs[i]);
-            }
+            qvi_bbuff_free(&bbuffs[0]);
             delete[] bbuffs;
         }
         bbuffs = nullptr;