Fix macro typo

Author: TheAssembler1

src/server/pdc_client_server_common.c

@@ -1067,7 +1067,8 @@ PDC_Server_data_read_from_region_per_file(uint64_t obj_id                     AT
                                           struct pdc_region_info *region_info ATTRIBUTE(unused),
                                           void *buf ATTRIBUTE(unused), size_t unit ATTRIBUTE(unused))
 {
-    return SUCCEED;
+    FUNC_ENTER(NULL);
+    FUNC_LEAVE(SUCCEED);
 }
 perr_t
 PDC_Server_data_read_from(uint64_t obj_id                     ATTRIBUTE(unused),
@@ -1397,7 +1398,6 @@ PDC_Server_dart_perform_one_server(dart_perform_one_server_in_t *in   ATTRIBUTE(
     FUNC_ENTER(NULL);
     FUNC_LEAVE(SUCCEED);
 }
-
 #else
 hg_return_t
 PDC_Client_work_done_cb(const struct hg_cb_info *callback_info ATTRIBUTE(unused))
@@ -1468,8 +1468,8 @@ HG_TEST_RPC_CB(gen_obj_id, handle)
 #ifdef ENABLE_MPI
     int server_rank;
     MPI_Comm_rank(MPI_COMM_WORLD, &server_rank);
-
 #endif
+
     HG_Respond(handle, NULL, NULL, &out);
 
     HG_Free_input(handle, &in);

src/server/pdc_server_region/pdc_server_region_request_handler.h

@@ -78,8 +78,7 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)
     local_bulk_args2->data_buf = (char *)PDC_malloc(total_mem_size);
     ptr                        = local_bulk_args2->data_buf;
 
-#ifndef PDC_SERVER_CACHE
-#ifdef PDC_USE_REGION_PER_FILE
+#if !defined(PDC_SERVER_CACHE) && !defined(PDC_USE_REGION_PER_FILE)
     data_server_region_t **temp_ptrs =
         (data_server_region_t **)PDC_malloc(sizeof(data_server_region_t *) * request_data.n_objs);
     for (i = 0; i < request_data.n_objs; ++i) {
@@ -92,7 +91,6 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)
         temp_ptrs[i] = PDC_Server_get_obj_region(request_data.obj_id[i]);
         PDC_Server_register_obj_region_by_pointer(temp_ptrs + i, request_data.obj_id[i], 1, 0);
     }
-#endif
 #endif
     for (i = 0; i < request_data.n_objs; ++i) {
         remote_reg_info->ndim   = request_data.remote_ndim[i];
@@ -115,14 +113,12 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)
 #endif
         ptr += mem_size;
     }
-#ifndef PDC_SERVER_CACHE
-#ifndef PDC_USE_REGION_PER_FILE
+#if !defined(PDC_SERVER_CACHE) && !defined(PDC_USE_REGION_PER_FILE)
     for (i = 0; i < request_data.n_objs; ++i) {
         PDC_Server_unregister_obj_region_by_pointer(temp_ptrs[i], 1);
     }
     temp_ptrs = (data_server_region_t **)PDC_free(temp_ptrs);
 #endif
-#endif
 
 #ifdef PDC_TIMING
     // PDCreg_transfer_request_wait_all_read_bulk includes the timing for transfering metadata and read I/O
@@ -204,7 +200,6 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info)
         temp_ptrs[i] = PDC_Server_get_obj_region(request_data.obj_id[i]);
         PDC_Server_register_obj_region_by_pointer(temp_ptrs + i, request_data.obj_id[i], 1, 0);
     }
-#endif
 #endif
     for (i = 0; i < request_data.n_objs; ++i) {
         remote_reg_info->ndim   = request_data.remote_ndim[i];
@@ -227,8 +222,7 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info)
         pthread_mutex_unlock(&transfer_request_status_mutex);
     }
 
-#ifndef PDC_SERVER_CACHE
-#ifndef PDC_USE_REGION_PER_FILE
+#if !defined(PDC_SERVER_CACHE) && !defined(PDC_USE_REGION_PER_FILE)
     for (i = 0; i < request_data.n_objs; ++i) {
         PDC_Server_unregister_obj_region_by_pointer(temp_ptrs[i], 1);
     }

src/tests/CMakeLists.txt

@@ -42,6 +42,7 @@ endif()
 include_directories(${TEST_EXT_INCLUDE_DIRS})
 
 set(PROGRAMS
+  sandbox
   misc/pdc_init
   prop/dup_prop
   obj/read_obj

src/tests/misc/read_write_perf.c

@@ -113,7 +113,6 @@ main(int argc, char **argv)
 #endif
     char hostname[256];
     gethostname(hostname, 256);
-    strcpy(hostname, "eno1");
     if (rank == 0) {
         LOG_INFO("number of dimensions in this test is %d\n", ndim);
         LOG_INFO("data size = %llu\n", (long long unsigned)data_size);

src/tests/region/region_transfer_2D_partial.c

@@ -181,8 +181,6 @@ main(int argc, char **argv)
 
     memset(data_read, 0, BUF_LEN);
 
-    LOG_INFO("Sleeping for 1 s\n");
-
     transfer_request = PDCregion_transfer_create(data_read, PDC_READ, obj1, reg, reg_global);
 
     PDCregion_transfer_start(transfer_request);

src/tests/run_test.sh

@@ -3,11 +3,8 @@
 # We assume too, that if the library build has enabled MPI, that LD_LIBRARY_PATH is
 # defined and points to the MPI libraries used by the linker (e.g. -L<path -lmpi)
 
-set -x
-
 # Cori CI needs srun even for serial tests
 run_cmd=""
-#run_cmd="gdb -batch --args"
 if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
     run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi

src/tests/sandbox.c

@@ -159,19 +159,17 @@ main(int argc, char **argv)
     err              = PDCregion_transfer_start(transfer_request);
     CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_start",
                         "Failed to call PDCregion_transfer_start");
-    err = PDCregion_transfer_wait(transfer_request);
+                        err = PDCregion_transfer_wait(transfer_request);
     CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_wait",
                         "Failed to call PDCregion_transfer_wait");
-    err = PDCregion_transfer_close(transfer_request);
+                        err = PDCregion_transfer_close(transfer_request);
     CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_close",
                         "Failed to call PDCregion_transfer_close");
 
     // reopen object
     PDCobj_close(obj);
     obj = PDCobj_open(obj_name, cont);
 
-    sleep(5);
-
     printf("Reading region 1\n");
     transfer_request = PDCregion_transfer_create(buf, PDC_READ, obj, region_local, region_remote);
     err              = PDCregion_transfer_start(transfer_request);