basic reads and writes work...

Author: TheAssembler1

compile_commands.json

@@ -335,7 +335,8 @@ typedef struct data_server_region_t {
     // For non-mapped object analysis
     // Used primarily as a local_temp
     void *                       obj_data_ptr;
-    char *                       storage_location; // save the file location to enable reopening
+    // FIXME: (Noah) we should dynamically allocate this number....
+    char*                       storage_location[1024]; // save the file location to enable reopening
     struct data_server_region_t *prev;
     struct data_server_region_t *next;
 } data_server_region_t;

src/server/include/pdc_client_server_common.h

@@ -1214,6 +1214,11 @@ PDC_Server_release_lock_request(uint64_t obj_id                ATTRIBUTE(unused)
 {
     return SUCCEED;
 }
+perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id, 
+    struct pdc_region_info *region_info, void *buf, size_t unit) 
+{
+    return SUCCEED;
+}
 perr_t
 PDC_Server_data_write_out(uint64_t obj_id                     ATTRIBUTE(unused),
                           struct pdc_region_info *region_info ATTRIBUTE(unused), void *buf ATTRIBUTE(unused),
@@ -1222,6 +1227,13 @@ PDC_Server_data_write_out(uint64_t obj_id                     ATTRIBUTE(unused),
     return SUCCEED;
 }
 perr_t
+PDC_Server_data_read_from_region_per_file(uint64_t obj_id                     ATTRIBUTE(unused),
+                          struct pdc_region_info *region_info ATTRIBUTE(unused), void *buf ATTRIBUTE(unused),
+                          size_t unit ATTRIBUTE(unused))
+{
+    return SUCCEED;
+}
+perr_t
 PDC_Server_data_read_from(uint64_t obj_id                     ATTRIBUTE(unused),
                           struct pdc_region_info *region_info ATTRIBUTE(unused), void *buf ATTRIBUTE(unused),
                           size_t unit ATTRIBUTE(unused))
@@ -1336,7 +1348,7 @@ PDC_Server_unregister_obj_region(pdcid_t obj_id ATTRIBUTE(unused))
 }
 perr_t
 PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg ATTRIBUTE(unused),
-                                          pdcid_t obj_id ATTRIBUTE(unused), int close_flag ATTRIBUTE(unused))
+                                          pdcid_t obj_id ATTRIBUTE(unused), int close_flag ATTRIBUTE(unused), uint64_t offset ATTRIBUTE(unused))
 {
     return 0;
 }

src/server/pdc_client_server_common.c

@@ -1700,7 +1700,8 @@ PDC_Server_restart(char *filename)
         data_server_region_t *new_obj_reg =
             (data_server_region_t *)calloc(1, sizeof(struct data_server_region_t));
         new_obj_reg->fd               = -1;
-        new_obj_reg->storage_location = (char *)malloc(sizeof(char) * ADDR_MAX);
+        // FIXME: (Noah)
+        new_obj_reg->storage_location[0] = (char *)malloc(sizeof(char) * ADDR_MAX);
         if (fread(&new_obj_reg->obj_id, sizeof(uint64_t), 1, file) != 1) {
             LOG_ERROR("Read failed for obj_id\n");
         }
@@ -2321,9 +2322,9 @@ server_run(int argc, char *argv[])
         LOG_INFO("==PDC_SERVER[%d]: total startup time = %.6f\n", pdc_server_rank_g, server_init_time);
 #endif
 #ifdef ENABLE_MPI
-        LOG_INFO("==PDC_SERVER[%d]: Server ready!\n\n\n", pdc_server_rank_g);
+        LOG_INFO("==PDC_SERVER[%d]: Server ready!\n\n", pdc_server_rank_g);
 #else
-        LOG_INFO("==PDC_SERVER[%d]: Server ready (no MPI)!\n\n\n", pdc_server_rank_g);
+        LOG_INFO("==PDC_SERVER[%d]: Server ready (no MPI)!\n\n", pdc_server_rank_g);
 #endif
     }
     fflush(stdout);

src/server/pdc_server.c

@@ -2685,7 +2685,8 @@ PDC_Server_get_storage_meta_by_names(query_read_names_args_t *args)
         }
         total_region += all_nregion[i];
 
-        if (all_storage_meta[i]->storage_location[1] != 'g') {
+        // FIXME: (Noah)
+        if (all_storage_meta[i]->storage_location[0] != 'g') {
             LOG_ERROR("==PDC_SERVER[%d]: Error with storage meta for [%s], obj_id %" PRIu64
                       ", loc [%s], offset "
                       "%" PRIu64 "\n",

src/server/pdc_server_metadata.c

@@ -416,7 +416,7 @@ data_server_region_t *PDC_Server_get_obj_region(pdcid_t obj_id);
  * \return SUCCEED/FAIL
  */
 perr_t PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg, pdcid_t obj_id,
-                                                 int close_flag);
+                                                 int close_flag, uint64_t region_index);
 perr_t PDC_Server_register_obj_region(pdcid_t obj_id);
 /**
  * Server unregister region struct by object ID, if not existing.
@@ -469,6 +469,19 @@ hg_return_t PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info);
  */
 hg_return_t PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *callback_info);
 
+/**
+ * Write data out to desired storage single region per file
+ *
+ * \param obj_id [IN]           Object ID
+ * \param region_info [IN]      Region information
+ * \param buf [IN]              Data staring address
+ * \param unit [IN]             Size of data type
+ *
+ * \return Non-negative on success/Negative on failure
+ */
+perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id, 
+    struct pdc_region_info *region_info, void *buf, size_t unit);
+
 /**
  * Write data out to desired storage
  *
@@ -482,6 +495,20 @@ hg_return_t PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_
 perr_t PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, void *buf,
                                  size_t unit);
 
+/**
+ * Read data from desired storage single region per file
+ *
+ * \param obj_id [IN]           Object ID
+ * \param region_info [IN]      Region information
+ * \param buf [IN]              Data starting address
+ * \param unit [IN]             Size of data type
+ *
+ * \return Non-negative on success/Negative on failure
+ */
+perr_t
+PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info, 
+    void *buf, size_t unit);
+
 /**
  * Read data from desired storage
  *