merge

Author: TheAssembler1

src/server/include/pdc_client_server_common.h

@@ -337,7 +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;
+    int                          original_region_size;
     struct data_server_region_t *prev;
     struct data_server_region_t *next;
 } data_server_region_t;

src/server/pdc_server_region/pdc_server_data.c

@@ -332,24 +332,27 @@ PDC_Server_clear_obj_region()
         {
             DL_FOREACH_SAFE(elt->region_storage_head, elt2, tmp2)
             {
-                if(elt2 == NULL) {
+                if (elt2 == NULL) {
                     LOG_ERROR("elt2 was NULL\n");
-                } else {
+                }
+                else {
                     LOG_INFO("elt2 was NOT NULL\n");
                     free(elt2);
                 }
             }
-            if(elt->storage_location == NULL) {
+            if (elt->storage_location == NULL) {
                 LOG_ERROR("elt->storage_location was NULL\n");
-            } else {
+            }
+            else {
                 LOG_INFO("elt->storage_location  was NOT NULL\n");
                 // FIXME: (Noah)
-                //free(elt->storage_location);
+                // free(elt->storage_location);
                 LOG_INFO("elt->storage_location  was NOT NULL1\n");
             }
-            if(elt == NULL) {
+            if (elt == NULL) {
                 LOG_ERROR("elt was NULL\n");
-            } else {
+            }
+            else {
                 LOG_INFO("elt was NOT NULL\n");
                 free(elt);
             }
@@ -380,7 +383,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->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_region_transfer.c

@@ -258,8 +258,9 @@ PDC_transfer_request_id_register()
         }                                                                                                    \
     }
 
-static void PDC_Server_io_not_by_region_region_per_file(char* user_specified_path, int is_write) {
-
+static void
+PDC_Server_io_not_by_region_region_per_file(char *user_specified_path, int is_write)
+{
 }
 
 perr_t
@@ -289,7 +290,7 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
         }
         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;