Synchronize with develop

.github/workflows/dependencies-macos.sh

@@ -2,9 +2,7 @@
 
 set -eu -o pipefail
 
-export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=FALSE
-
-brew install open-mpi automake
+brew install open-mpi automake m4 libtool
 
 # libfabric
 wget https://github.com/ofiwg/libfabric/archive/refs/tags/v1.15.2.tar.gz

.github/workflows/gitlab-develop.yml

@@ -0,0 +1,28 @@
+name: GitLab
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  sync-with-gitlab:
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup git
+        run: |
+          git config --global user.name "PDC BOT"
+          git config --global user.email "pdc@example.com"
+
+      - name: Update branch
+        run: |
+          git fetch origin develop
+          git remote add gitlab https://${{ secrets.GITLAB_TOKEN_NAME }}:${{ secrets.GITLAB_TOKEN }}@${{ secrets.GITLAB_URL }}
+          git checkout develop
+          git push -f gitlab -u develop

.github/workflows/gitlab-stable.yml

@@ -0,0 +1,28 @@
+name: GitLab
+
+on:
+  push:
+    branches:
+      - stable
+
+jobs:
+  sync-with-gitlab:
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup git
+        run: |
+          git config --global user.name "PDC BOT"
+          git config --global user.email "pdc@example.com"
+
+      - name: Update branch
+        run: |
+          git fetch stable
+          git remote add gitlab https://${{ secrets.GITLAB_TOKEN_NAME }}:${{ secrets.GITLAB_TOKEN }}@${{ secrets.GITLAB_URL }}
+          git checkout stable
+          git push -f gitlab -u stable

.github/workflows/macos.yml

@@ -33,4 +33,4 @@ jobs:
           sudo sh -c 'echo "`ipconfig getifaddr en0` PDC" >> /etc/hosts'
           sudo scutil --set HostName PDC
           export HG_TRANSPORT="sockets"
-          ctest -L serial
+          ctest -L serial --output-on-failure

.github/workflows/ubuntu-cache.yml

@@ -28,4 +28,4 @@ jobs:
 
       - name: Test PDC
         working-directory: build
-        run: ctest -L serial
+        run: ctest -L serial --output-on-failure

.github/workflows/ubuntu-no-cache.yaml

@@ -28,4 +28,4 @@ jobs:
 
       - name: Test PDC
         working-directory: build
-        run: ctest -L serial
+        run: ctest -L serial --output-on-failure

docs/source/api.rst

@@ -205,7 +205,8 @@ PDC object APIs
 		* pdc: PDC class ID, returned from PDCInit
 	* Output:
 		* Local object ID
-	* Open a PDC ID created previously by name.
+	* Open a PDC ID created previously by name, if an object is just created or already opened,
+          return the same obj_id. Each open requires a close.
 	* For developers: see pdc_obj.c. Need to communicate with servers for metadata of the object.
 
 * perr_t PDCobj_close(pdcid_t obj_id)

src/api/pdc_client_connect.c

@@ -43,6 +43,7 @@
 #include "pdc_transforms_common.h"
 #include "pdc_client_connect.h"
 #include "pdc_logger.h"
+#include "pdc_malloc.h"
 
 #include "mercury.h"
 #include "mercury_macros.h"
@@ -1354,7 +1355,7 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po
 {
     perr_t ret_value = SUCCEED;
     char   na_info_string[NA_STRING_INFO_LEN];
-    char   hostname[HOSTNAME_LEN];
+    char * hostname;
     int    local_server_id;
     /* Set the default mercury transport
      * but enable overriding that to any of:
@@ -1378,14 +1379,19 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po
     if ((hg_transport = getenv("HG_TRANSPORT")) == NULL) {
         hg_transport = default_hg_transport;
     }
-    memset(hostname, 0, sizeof(hostname));
-    gethostname(hostname, sizeof(hostname));
+    if ((hostname = getenv("HG_HOST")) == NULL) {
+        hostname = PDC_malloc(HOSTNAME_LEN);
+        memset(hostname, 0, HOSTNAME_LEN);
+        gethostname(hostname, HOSTNAME_LEN - 1);
+    }
     sprintf(na_info_string, "%s://%s:%d", hg_transport, hostname, port);
     if (pdc_client_mpi_rank_g == 0) {
-        LOG_INFO("==PDC_CLIENT: using %.7s\n", na_info_string);
+        LOG_INFO("==PDC_CLIENT: using %s\n", na_info_string);
         fflush(stdout);
     }
 
+    free(hostname);
+
 // gni starts here
 #ifdef PDC_HAS_CRAY_DRC
     /* Acquire credential */
@@ -3047,30 +3053,10 @@ pack_region_metadata(int ndim, uint64_t *offset, uint64_t *size, region_info_tra
 
     FUNC_ENTER(NULL);
     transfer->ndim = ndim;
-    if (ndim >= 1) {
-        transfer->start_0 = offset[0];
-        transfer->count_0 = size[0];
-    }
-    else {
-        transfer->start_0 = 0;
-        transfer->count_0 = 0;
-    }
-    if (ndim >= 2) {
-        transfer->count_1 = size[1];
-        transfer->start_1 = offset[1];
-    }
-    else {
-        transfer->start_1 = 0;
-        transfer->count_1 = 0;
-    }
-    if (ndim >= 3) {
-        transfer->count_2 = size[2];
-        transfer->start_2 = offset[2];
-    }
-    else {
-        transfer->start_2 = 0;
-        transfer->count_2 = 0;
-    }
+
+    PDC_copy_region_desc(offset, transfer->start, ndim, ndim);
+    PDC_copy_region_desc(size, transfer->count, ndim, ndim);
+
     fflush(stdout);
     FUNC_LEAVE(ret_value);
 }
@@ -3521,16 +3507,9 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id,
     in.access_type = access_type;
     in.remote_unit = unit;
     in.obj_id      = obj_id;
-    in.obj_ndim    = obj_ndim;
-    if (in.obj_ndim >= 1) {
-        in.obj_dim0 = obj_dims[0];
-    }
-    if (in.obj_ndim >= 2) {
-        in.obj_dim1 = obj_dims[1];
-    }
-    if (in.obj_ndim >= 3) {
-        in.obj_dim2 = obj_dims[2];
-    }
+
+    in.obj_ndim = obj_ndim;
+    PDC_copy_region_desc(obj_dims, in.obj_dims, in.obj_ndim, in.obj_ndim);
 
     // Compute metadata server id
     meta_server_id = PDC_get_server_by_obj_id(obj_id, pdc_server_num_g);
@@ -6586,8 +6565,8 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_
         prev_fname = fname;
 
         // TODO: currently assumes 1d data and 1 storage region per object
-        storage_start = all_storage_meta[i]->region_transfer.start_0;
-        storage_count = all_storage_meta[i]->region_transfer.count_0;
+        storage_start = all_storage_meta[i]->region_transfer.start[0];
+        storage_count = all_storage_meta[i]->region_transfer.count[0];
         req_start     = storage_start;
         req_count     = storage_count;
         file_offset   = all_storage_meta[i]->offset;

src/api/pdc_obj/include/pdc_mpi.h

@@ -39,7 +39,7 @@
  *                              returned by PDCprop_create(PDC_OBJ_CREATE)
  * \param rank_id [IN]          MPI process rank
  *
- * \return Object ID on success/Negative on failure
+ * \return Object ID on success/Zero on failure
  */
 pdcid_t PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_create_prop, int rank_id,
                           MPI_Comm comm);

src/api/pdc_obj/pdc_mpi.c

@@ -32,10 +32,10 @@
 pdcid_t
 PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm)
 {
-    pdcid_t               ret_value = SUCCEED;
-    struct _pdc_obj_info *p         = NULL;
-    struct _pdc_id_info * id_info   = NULL;
+    struct _pdc_obj_info *p       = NULL;
+    struct _pdc_id_info * id_info = NULL;
     int                   rank;
+    pdcid_t               ret_value;
 
     FUNC_ENTER(NULL);
 
@@ -46,14 +46,21 @@ PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, in
     else
         ret_value = PDC_obj_create(cont_id, obj_name, obj_prop_id, PDC_OBJ_LOCAL);
 
+    if (ret_value == 0)
+        PGOTO_ERROR(ret_value, "PDC_obj_create failed");
+
     id_info = PDC_find_id(ret_value);
-    p       = (struct _pdc_obj_info *)(id_info->obj_ptr);
+    if (id_info == NULL)
+        PGOTO_ERROR(0, "PDC_find_id failed for object id: %d", ret_value);
+
+    p = (struct _pdc_obj_info *)(id_info->obj_ptr);
 
     MPI_Bcast(&(p->obj_info_pub->meta_id), 1, MPI_LONG_LONG, rank_id, comm);
     MPI_Bcast(&(p->obj_info_pub->metadata_server_id), 1, MPI_UINT32_T, rank_id, comm);
     MPI_Bcast(&(((pdc_metadata_t *)p->metadata)->data_server_id), 1, MPI_UINT32_T, rank_id, comm);
     MPI_Bcast(&(((pdc_metadata_t *)p->metadata)->region_partition), 1, MPI_UINT8_T, rank_id, comm);
 
+done:
     FUNC_LEAVE(ret_value);
 }
 

src/api/pdc_obj/pdc_obj.c

@@ -535,9 +535,29 @@ PDCobj_open_common(const char *obj_name, pdcid_t pdc, int is_col)
     pdcid_t               obj_prop;
     size_t                i;
     uint32_t              metadata_server_id;
+    obj_handle *          oh;
+    struct pdc_obj_info * info;
+    int                   is_opened = 0;
 
     FUNC_ENTER(NULL);
 
+    // Search if the object has already been opened
+    oh = PDCobj_iter_start(pdc);
+    while (!PDCobj_iter_null(oh)) {
+        info = PDCobj_iter_get_info(oh);
+        if (strcmp(obj_name, info->name) == 0) {
+            is_opened = 1;
+            break;
+        }
+        oh = PDCobj_iter_next(oh, pdc);
+    }
+
+    if (is_opened) {
+        ret_value = info->local_id;
+        PDC_inc_ref(info->local_id);
+        goto done;
+    }
+
     p = (struct _pdc_obj_info *)PDC_malloc(sizeof(struct _pdc_obj_info));
     if (!p)
         PGOTO_ERROR(0, "PDC object memory allocation failed");