can pass all tests other than partial reads and writes and appends so around 74%

Author: TheAssembler1

compile_commands.json

@@ -3,7 +3,7 @@
 rm -rf ./build/*
 
 pushd build
-cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DCMAKE_INSTALL_PREFIX=$PDC_DIR       -DPDC_ENABLE_MPI=ON -DMERCURY_DIR=$MERCURY_DIR -DCMAKE_C_COMPILER=mpicc -DMPI_RUN_CMD=mpiexec ..
+cmake ../ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DPDC_SERVER_CACHE=OFF -DBUILD_TESTING=ON -DPDC_ENABLE_MPI=ON -DCMAKE_C_COMPILER=mpicc -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 make -j$(nproc)
 cp compile_commands.json ..
 popd

complete_rebuild.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export DATA=./build/bin/pdc_data
+export BIN=./build/bin

export_vars.sh

@@ -3,6 +3,7 @@
 ./rebuild.sh  # Rebuild project
 
 pushd ./build/bin || exit 1  # Exit if cd fails
+export PDC_DEBUG=1
 "./sandbox"
 popd
 

run_client.sh

@@ -11,5 +11,6 @@ echo "deleting existing data"
 rm -rf /home/nlewi26/src/work_space/source/pdc/build/bin/pdc_data
 
 pushd ./build/bin
+export PDC_DEBUG=1
 $1 ./pdc_server.exe
 popd

run_server.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+./rebuild.sh
+
+echo "killing previous pdc_server.exe"
+pkill -f pdc_server.exe || true
+
+echo "deleting existing data"
+rm -rf /home/nlewi26/src/work_space/source/pdc/build/bin/pdc_data
+
+pushd ./build
+ctest -L serial
+popd

run_test.sh

@@ -337,6 +337,7 @@ typedef struct data_server_region_t {
     void *obj_data_ptr;
     // FIXME: (Noah) we should dynamically allocate this number....
     char *                       storage_location[1024]; // save the file location to enable reopening
+    int original_region_size;
     struct data_server_region_t *prev;
     struct data_server_region_t *next;
 } data_server_region_t;

src/server/include/pdc_client_server_common.h

@@ -332,11 +332,27 @@ PDC_Server_clear_obj_region()
         {
             DL_FOREACH_SAFE(elt->region_storage_head, elt2, tmp2)
             {
-                // DL_DELETE(elt->region_storage_head, elt2);
-                free(elt2);
+                if(elt2 == NULL) {
+                    LOG_ERROR("elt2 was NULL\n");
+                } else {
+                    LOG_INFO("elt2 was NOT NULL\n");
+                    free(elt2);
+                }
+            }
+            if(elt->storage_location == NULL) {
+                LOG_ERROR("elt->storage_location was NULL\n");
+            } else {
+                LOG_INFO("elt->storage_location  was NOT NULL\n");
+                // FIXME: (Noah)
+                //free(elt->storage_location);
+                LOG_INFO("elt->storage_location  was NOT NULL1\n");
+            }
+            if(elt == NULL) {
+                LOG_ERROR("elt was NULL\n");
+            } else {
+                LOG_INFO("elt was NOT NULL\n");
+                free(elt);
             }
-            free(elt->storage_location);
-            free(elt);
         }
     }
     FUNC_LEAVE(ret_value);
@@ -364,6 +380,7 @@ PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg_ptr
         new_obj_reg->close_flag               = close_flag;
         // FIXME: (Noah)
         new_obj_reg->storage_location[region_index] = (char *)malloc(sizeof(char) * ADDR_MAX);
+        new_obj_reg->original_region_size = -1;
         new_obj_reg->fd =
             server_open_storage(new_obj_reg->storage_location[region_index], obj_id, region_index);
 

src/server/pdc_server_region/pdc_server_data.c

@@ -258,6 +258,10 @@ PDC_transfer_request_id_register()
         }                                                                                                    \
     }
 
+static void PDC_Server_io_not_by_region_region_per_file(char* user_specified_path, int is_write) {
+
+}
+
 perr_t
 PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *obj_dims,
                                struct pdc_region_info *region_info, void *buf, size_t unit, int is_write)
@@ -273,7 +277,7 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
 
     FUNC_ENTER(NULL);
 
-    if (io_by_region_g || obj_ndim == 0) {
+    //if (io_by_region_g || obj_ndim == 0) {
         if (is_write) {
             // FIXME: (Noah) switching to region per file manually
             // PDC_Server_data_write_out(obj_id, region_info, buf, unit);
@@ -284,7 +288,8 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
             PDC_Server_data_read_from_region_per_file(obj_id, region_info, buf, unit);
         }
         goto done;
-    }
+    //}
+    
     if (obj_ndim != (int)region_info->ndim) {
         LOG_ERROR("Server I/O error: Obj dim does not match obj dim\n");
         goto done;
@@ -304,7 +309,9 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
              PDC_get_rank(), PDC_get_rank());
     PDC_mkdir(storage_location);
 
-    fd = open(storage_location, O_RDWR | O_CREAT, 0666);
+    PDC_Server_io_not_by_region_region_per_file(storage_location, is_write);
+
+    /*fd = open(storage_location, O_RDWR | O_CREAT, 0666);
     if (region_info->ndim == 1) {
         lseek(fd, region_info->offset[0] * unit, SEEK_SET);
         io_size = region_info->size[0] * unit;
@@ -365,7 +372,7 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
             }
         }
     }
-    close(fd);
+    close(fd);*/
 
 done:
     /* PDC_get_time_str(cur_time); */

src/server/pdc_server_region/pdc_server_region_transfer.c

@@ -3,8 +3,11 @@
 # 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