From 698a6d2bbc45b7334a8f9b0c95b2fa7a953ba0be Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Fri, 4 Jul 2025 07:32:53 -0700 Subject: [PATCH 1/8] all but 4 close errors are fixed --- src/api/include/pdc_client_connect.h | 47 ++-- src/api/pdc.c | 4 +- src/api/pdc_client_connect.c | 249 +++++++++--------- src/api/pdc_obj/pdc_cont.c | 20 +- src/api/pdc_obj/pdc_obj.c | 48 ++-- src/api/pdc_obj/pdc_prop.c | 28 +- src/api/pdc_region/pdc_region_transfer.c | 156 +++++++---- src/server/pdc_client_server_common.c | 210 +++++++-------- src/server/pdc_server.c | 62 ++--- .../pdc_server_region/pdc_server_data.c | 248 ++++++++--------- src/tests/misc/client_server.c | 2 +- 11 files changed, 571 insertions(+), 503 deletions(-) diff --git a/src/api/include/pdc_client_connect.h b/src/api/include/pdc_client_connect.h index 64b7460e9..e351fb661 100644 --- a/src/api/include/pdc_client_connect.h +++ b/src/api/include/pdc_client_connect.h @@ -60,23 +60,23 @@ struct _pdc_client_lookup_args { uint32_t client_id; int ret; int is_init; - char * ret_string; - char * client_addr; + char *ret_string; + char *client_addr; uint32_t user_id; - const char * app_name; + const char *app_name; int time_step; uint32_t hash_value; - const char * tags; + const char *tags; hg_request_t *request; }; struct _pdc_client_transform_args { size_t size; - void * data; - void * transform_result; + void *data; + void *transform_result; struct _pdc_region_transform_ftn_info *this_transform; - struct pdc_region_info * region_info; + struct pdc_region_info *region_info; int type_extent; int transform_state; int ret; @@ -148,8 +148,8 @@ struct _pdc_query_result_list { int query_id; uint64_t nhits; uint64_t *coords; - void * data; - void ** data_arr; + void *data; + void **data_arr; uint64_t *data_arr_size; uint64_t recv_data_nhits; @@ -187,8 +187,8 @@ struct client_genetic_lookup_args { struct _dart_perform_one_thread_param { int server_id; dart_perform_one_server_in_t *dart_in; - uint64_t ** dart_out; - size_t * dart_out_size; + uint64_t **dart_out; + size_t *dart_out_size; }; #define PDC_CLIENT_DATA_SERVER() ((pdc_client_mpi_rank_g / pdc_nclient_per_server_g) % pdc_server_num_g) @@ -208,7 +208,7 @@ uint32_t PDC_get_client_data_server(); perr_t PDC_Client_read_server_addr_from_file(); /** - * Client request of an obj id by sending object name + * Client request of an obj id by sending object name. * * \param obj_name [IN] Name of the object * \param cont_id[IN] Container ID (obtained from metadata server) @@ -220,32 +220,37 @@ perr_t PDC_Client_read_server_addr_from_file(); perr_t PDC_Client_send_name_recv_id(const char *obj_name, uint64_t cont_id, pdcid_t obj_create_prop, pdcid_t *meta_id, uint32_t *data_server_id, uint32_t *metadata_server_id); -perr_t PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, int obj_ndim, - uint64_t *obj_dims, int remote_ndim, uint64_t *remote_offset, +/** + * The bulk_handle pointer is set to the bulk handle created. + * The caller is responsible for calling HG_Bulk_free + */ +perr_t PDC_Client_transfer_request(hg_bulk_t *bulk_handle, void *buf, pdcid_t obj_id, uint32_t data_server_id, + int obj_ndim, uint64_t *obj_dims, int remote_ndim, uint64_t *remote_offset, uint64_t *remote_size, size_t unit, pdc_access_t access_type, pdcid_t *metadata_id); int PDC_Client_get_var_type_size(pdc_var_type_t dtype); -perr_t PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t data_server_id, - char *bulk_buf, hg_size_t bulk_size, uint64_t *metadata_id, +perr_t PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t access_type, + uint32_t data_server_id, char *bulk_buf, hg_size_t bulk_size, + uint64_t *metadata_id, #ifdef ENABLE_MPI MPI_Comm comm); #else int comm); #endif -perr_t PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, int n_objs, - uint32_t metadata_server_id, uint8_t is_write, +perr_t PDC_Client_transfer_request_metadata_query(hg_bulk_t *bulk_handle, char *buf, uint64_t total_buf_size, + int n_objs, uint32_t metadata_server_id, uint8_t is_write, uint64_t *output_buf_size, uint64_t *query_id); -perr_t PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, uint64_t query_id, - uint32_t metadata_server_id); +perr_t PDC_Client_transfer_request_metadata_query2(hg_bulk_t *bulk_handle, char *buf, uint64_t total_buf_size, + uint64_t query_id, uint32_t metadata_server_id); perr_t PDC_Client_transfer_request_status(pdcid_t transfer_request_id, uint32_t data_server_id, pdc_transfer_status_t *completed); -perr_t PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, +perr_t PDC_Client_transfer_request_wait_all(hg_bulk_t *bulk_handle, int n_objs, pdcid_t *transfer_request_id, uint32_t data_server_id); perr_t PDC_Client_transfer_request_wait(pdcid_t transfer_request_id, uint32_t data_server_id, diff --git a/src/api/pdc.c b/src/api/pdc.c index 6f3a462fb..642f19fc2 100644 --- a/src/api/pdc.c +++ b/src/api/pdc.c @@ -213,8 +213,8 @@ PDCclose(pdcid_t pdcid) pdc_id_list_g = (struct pdc_id_list *)(intptr_t)PDC_free(pdc_id_list_g); - // Finalize METADATA - PDC_Client_finalize(); + if (PDC_Client_finalize() != SUCCEED) + PGOTO_ERROR(FAIL, "Error with PDC_Client_finalize"); done: FUNC_LEAVE(ret_value); diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index ef503178e..053d3a478 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -94,7 +94,7 @@ int pdc_nclient_per_server_g = 0; char pdc_client_tmp_dir_g[ADDR_MAX]; struct _pdc_server_info *pdc_server_info_g = NULL; -static int * debug_server_id_count = NULL; +static int *debug_server_id_count = NULL; int pdc_io_request_seq_id = PDC_SEQ_ID_INIT_VALUE; struct pdc_request *pdc_io_request_list_g = NULL; @@ -110,7 +110,7 @@ int nread_bb_g = 0; double read_bb_size_g = 0.0; static int mercury_has_init_g = 0; -static hg_class_t * send_class_g = NULL; +static hg_class_t *send_class_g = NULL; static hg_context_t *send_context_g = NULL; int query_id_g = 0; @@ -125,7 +125,7 @@ static hg_atomic_int32_t response_done_g; hg_atomic_int32_t bulk_transfer_done_g; // global variables for DART -static DART * dart_g; +static DART *dart_g; static dart_hash_algo_t dart_hash_algo_g = DART_HASH; static dart_object_ref_type_t dart_obj_ref_type_g = REF_PRIMARY_ID; @@ -373,8 +373,8 @@ PDC_Client_read_server_addr_from_file() perr_t ret_value = SUCCEED; int max_tries = 9, sleeptime = 1; int i = 0, is_server_ready = 0; - char * p; - FILE * na_config = NULL; + char *p; + FILE *na_config = NULL; char config_fname[PATH_MAX]; char n_server_string[PATH_MAX]; @@ -455,7 +455,7 @@ client_send_flush_obj_all_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_all_out_t output; - int * rpc_return; + int *rpc_return; handle = callback_info->info.forward.handle; rpc_return = (int *)callback_info->arg; @@ -506,7 +506,7 @@ client_send_flush_obj_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_out_t output; - int * rpc_return; + int *rpc_return; handle = callback_info->info.forward.handle; rpc_return = (int *)callback_info->arg; @@ -532,7 +532,7 @@ client_send_close_all_server_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; close_server_out_t output; - int * rpc_return; + int *rpc_return; handle = callback_info->info.forward.handle; rpc_return = (int *)callback_info->arg; @@ -876,7 +876,7 @@ PDC_Client_lookup_server(int server_id, int is_init) hg_return_t hg_ret; struct _pdc_client_lookup_args lookup_args; char self_addr[ADDR_MAX]; - char * target_addr_string; + char *target_addr_string; if (server_id < 0 || server_id >= pdc_server_num_g) PGOTO_ERROR(FAIL, "Error with server id input %d", server_id); @@ -1097,14 +1097,14 @@ hg_test_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args; hg_bulk_t local_bulk_handle; uint32_t i; - void * buf = NULL; - void ** ids_buf; + void *buf = NULL; + void **ids_buf; uint32_t n_meta; uint64_t buf_sizes[2] = {0, 0}; - uint64_t * ids_buf_sizes; + uint64_t *ids_buf_sizes; uint32_t actual_cnt; - pdc_metadata_t * meta_ptr; - uint64_t * u64_arr_ptr; + pdc_metadata_t *meta_ptr; + uint64_t *u64_arr_ptr; uint32_t bulk_sgnum; bulk_args = (struct bulk_args_t *)hg_cb_info->arg; @@ -1204,7 +1204,7 @@ drc_strerror(int errnum) { FUNC_ENTER(NULL); - char * ret_value = NULL; + char *ret_value = NULL; const char *errstring = "UNDEFINED"; DRC_ERROR_STRING_MACRO(DRC_SUCCESS, errnum, errstring); @@ -1233,7 +1233,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; + char *hostname; pbool_t free_hostname = false; int local_server_id; @@ -1244,13 +1244,13 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po * "cci+tcp" */ struct hg_init_info init_info = {0}; - char * default_hg_transport = "ofi+tcp"; - char * hg_transport; + char *default_hg_transport = "ofi+tcp"; + char *hg_transport; #ifdef PDC_HAS_CRAY_DRC uint32_t credential, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char * auth_key; + char *auth_key; int rc; #endif @@ -1449,7 +1449,7 @@ PDC_Client_init() perr_t ret_value = SUCCEED; pdc_server_info_g = NULL; - char * tmp_dir; + char *tmp_dir; uint32_t port; int is_mpi_init = 0; @@ -1626,13 +1626,11 @@ PDC_Client_finalize() LOG_INFO("T_memcpy: %.2f\n", memcpy_time_g); #endif - hg_ret = HG_Context_destroy(send_context_g); - if (hg_ret != HG_SUCCESS) + if (HG_Context_destroy(send_context_g) != HG_SUCCESS) PGOTO_ERROR(FAIL, "Error with HG_Context_destroy"); - hg_ret = HG_Finalize(send_class_g); - if (hg_ret != HG_SUCCESS) - LOG_WARNING("Error with HG_Finalize\n"); + if (HG_Finalize(send_class_g) != HG_SUCCESS) + PGOTO_ERROR(FAIL, "Error with HG_Finalize"); done: FUNC_LEAVE(ret_value); @@ -1645,16 +1643,16 @@ metadata_query_bulk_cb(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value; - struct bulk_args_t * client_lookup_args; + struct bulk_args_t *client_lookup_args; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args; - void * recv_meta; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args; + void *recv_meta; client_lookup_args = (struct bulk_args_t *)callback_info->arg; handle = callback_info->info.forward.handle; @@ -2052,7 +2050,7 @@ PDC_Client_add_tag(pdcid_t obj_id, const char *tag) hg_handle_t metadata_add_tag_handle; uint64_t meta_id; uint32_t server_id; - struct _pdc_obj_info * obj_prop; + struct _pdc_obj_info *obj_prop; struct _pdc_client_lookup_args lookup_args; metadata_add_tag_in_t in; @@ -2268,7 +2266,7 @@ PDC_Client_delete_metadata(char *delete_name, pdcid_t obj_delete_prop) perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - struct _pdc_obj_prop * delete_prop; + struct _pdc_obj_prop *delete_prop; metadata_delete_in_t in; int hash_name_value; uint32_t server_id; @@ -2327,7 +2325,7 @@ PDC_Client_query_metadata_name_only(const char *obj_name, pdc_metadata_t **out) struct _pdc_metadata_query_args **lookup_args; uint32_t server_id; uint32_t i, count = 0; - hg_handle_t * metadata_query_handle; + hg_handle_t *metadata_query_handle; metadata_query_handle = (hg_handle_t *)PDC_malloc(sizeof(hg_handle_t) * pdc_server_num_g); @@ -2624,7 +2622,7 @@ PDC_Client_send_name_recv_id(const char *obj_name, uint64_t cont_id, pdcid_t obj perr_t ret_value = SUCCEED; hg_return_t hg_ret; uint32_t server_id = 0; - struct _pdc_obj_prop * create_prop = NULL; + struct _pdc_obj_prop *create_prop = NULL; gen_obj_id_in_t in; uint32_t hash_name_value; struct _pdc_client_lookup_args lookup_args; @@ -2777,7 +2775,7 @@ PDC_Client_close_all_server() if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } // End pdc_client_mpi_rank_g < pdc_server_num_g - } // End pdc_client_mpi_size_g >= pdc_server_num_g + } // End pdc_client_mpi_size_g >= pdc_server_num_g else { if (pdc_client_mpi_rank_g == 0) { for (i = 0; i < (uint32_t)pdc_server_num_g; i++) { @@ -2805,7 +2803,7 @@ PDC_Client_close_all_server() PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } } // End of mpi_rank == 0 - } // End pdc_client_mpi_size_g < pdc_server_num_g + } // End pdc_client_mpi_size_g < pdc_server_num_g #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -2974,8 +2972,9 @@ PDC_Client_flush_obj_all() } perr_t -PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t data_server_id, char *bulk_buf, - hg_size_t bulk_size, uint64_t *metadata_id, +PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t access_type, + uint32_t data_server_id, char *bulk_buf, hg_size_t bulk_size, + uint64_t *metadata_id, #ifdef ENABLE_MPI MPI_Comm comm) #else @@ -2987,7 +2986,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_all_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; int i; hg_handle_t client_send_transfer_request_all_handle; struct _pdc_transfer_request_all_args transfer_args; @@ -3015,8 +3014,9 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d transfer_request_all_register_id_g, &client_send_transfer_request_all_handle); // Create bulk handles - hg_ret = HG_Bulk_create(hg_class, 1, (void **)&bulk_buf, &bulk_size, HG_BULK_READWRITE, - &(in.local_bulk_handle)); + hg_ret = HG_Bulk_create(hg_class, 1, (void **)&bulk_buf, &bulk_size, HG_BULK_READWRITE, + &(in.local_bulk_handle)); + *bulk_handle = in.local_bulk_handle; if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create local bulk data handle"); @@ -3076,15 +3076,15 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d } perr_t -PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, uint64_t query_id, - uint32_t metadata_server_id) +PDC_Client_transfer_request_metadata_query2(hg_bulk_t *bulk_handle, char *buf, uint64_t total_buf_size, + uint64_t query_id, uint32_t metadata_server_id) { FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query2_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_handle_t client_send_transfer_request_metadata_query2_handle; struct _pdc_transfer_request_metadata_query2_args transfer_args; @@ -3110,6 +3110,7 @@ PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, // For sending metadata hg_ret = HG_Bulk_create(hg_class, 1, (void **)&buf, (hg_size_t *)&(in.total_buf_size), HG_BULK_READWRITE, &(in.local_bulk_handle)); + *bulk_handle = in.local_bulk_handle; if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create local bulk data handle"); @@ -3137,8 +3138,8 @@ PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, } perr_t -PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, int n_objs, - uint32_t metadata_server_id, uint8_t is_write, +PDC_Client_transfer_request_metadata_query(hg_bulk_t *bulk_handle, char *buf, uint64_t total_buf_size, + int n_objs, uint32_t metadata_server_id, uint8_t is_write, uint64_t *output_buf_size, uint64_t *query_id) { FUNC_ENTER(NULL); @@ -3146,7 +3147,7 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_handle_t client_send_transfer_request_metadata_query_handle; struct _pdc_transfer_request_metadata_query_args transfer_args; @@ -3174,6 +3175,7 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i // For sending metadata hg_ret = HG_Bulk_create(hg_class, 1, (void **)&buf, (hg_size_t *)&(in.total_buf_size), HG_BULK_READWRITE, &(in.local_bulk_handle)); + *bulk_handle = in.local_bulk_handle; if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create local bulk data handle"); @@ -3203,14 +3205,15 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i } perr_t -PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, uint32_t data_server_id) +PDC_Client_transfer_request_wait_all(hg_bulk_t *bulk_handle, int n_objs, pdcid_t *transfer_request_id, + uint32_t data_server_id) { FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_wait_all_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_handle_t client_send_transfer_request_wait_all_handle; struct _pdc_transfer_request_wait_all_args transfer_args; char cur_time[64]; @@ -3238,6 +3241,7 @@ PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, u // For sending metadata hg_ret = HG_Bulk_create(hg_class, 1, (void **)&transfer_request_id, (hg_size_t *)&(in.total_buf_size), HG_BULK_READWRITE, &(in.local_bulk_handle)); + *bulk_handle = in.local_bulk_handle; if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create local bulk data handle"); @@ -3269,8 +3273,8 @@ PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, u } perr_t -PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, int obj_ndim, - uint64_t *obj_dims, int remote_ndim, uint64_t *remote_offset, +PDC_Client_transfer_request(hg_bulk_t *bulk_handle, void *buf, pdcid_t obj_id, uint32_t data_server_id, + int obj_ndim, uint64_t *obj_dims, int remote_ndim, uint64_t *remote_offset, uint64_t *remote_size, size_t unit, pdc_access_t access_type, pdcid_t *metadata_id) { @@ -3279,7 +3283,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; uint32_t meta_server_id; hg_size_t total_data_size; int i; @@ -3328,6 +3332,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, // Create bulk handle hg_ret = HG_Bulk_create(hg_class, 1, (void **)&buf, (hg_size_t *)&total_data_size, HG_BULK_READWRITE, &(in.local_bulk_handle)); + *bulk_handle = in.local_bulk_handle; if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create local bulk data handle"); @@ -3505,12 +3510,12 @@ PDC_Client_buf_map(pdcid_t local_region_id, pdcid_t remote_obj_id, size_t ndim, hg_return_t hg_ret = HG_SUCCESS; buf_map_in_t in; uint32_t data_server_id, meta_server_id; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_uint32_t i, j; hg_uint32_t local_count; - void ** data_ptrs = NULL; - size_t * data_size = NULL; + void **data_ptrs = NULL; + size_t *data_size = NULL; size_t unit, unit_to; struct _pdc_buf_map_args map_args; hg_handle_t client_send_buf_map_handle; @@ -3892,11 +3897,11 @@ PDC_Client_get_data_from_server_shm_cb(const struct hg_cb_info *callback_info) int shm_fd = -1; // file descriptor, from shm_open() uint32_t i = 0; - char * shm_base = NULL; // base address, from mmap() - char * shm_addr = NULL; + char *shm_base = NULL; // base address, from mmap() + char *shm_addr = NULL; uint64_t data_size = 1; - client_read_info_t * read_info = NULL; - struct pdc_request * elt = NULL; + client_read_info_t *read_info = NULL; + struct pdc_request *elt = NULL; struct pdc_region_info *target_region = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; @@ -3984,8 +3989,8 @@ PDC_Client_data_server_read_check(int server_id, uint32_t client_id, pdc_metadat uint64_t read_size = 1; hg_handle_t data_server_read_check_handle; int shm_fd; // file descriptor, from shm_open() - char * shm_base; // base address, from mmap() - char * shm_addr; + char *shm_base; // base address, from mmap() + char *shm_addr; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; struct timeval pdc_timer_end; @@ -4109,8 +4114,8 @@ PDC_Client_data_server_read(struct pdc_request *request) data_server_read_in_t in; hg_handle_t data_server_read_handle; int server_id, n_client, n_update; - pdc_metadata_t * meta; - struct pdc_region_info * region; + pdc_metadata_t *meta; + struct pdc_region_info *region; server_id = request->server_id; n_client = request->n_client; @@ -4231,8 +4236,8 @@ PDC_Client_data_server_write_check(struct pdc_request *request, int *status) data_server_write_check_in_t in; hg_handle_t data_server_write_check_handle; int server_id; - pdc_metadata_t * meta; - struct pdc_region_info * region; + pdc_metadata_t *meta; + struct pdc_region_info *region; uint64_t write_size = 1; uint32_t i; @@ -4329,9 +4334,9 @@ PDC_Client_data_server_write(struct pdc_request *request) int server_ret; hg_handle_t data_server_write_handle; int server_id, n_client, n_update; - pdc_metadata_t * meta; - struct pdc_region_info * region; - void * buf; + pdc_metadata_t *meta; + struct pdc_region_info *region; + void *buf; int rnd; #ifdef ENABLE_TIMING @@ -4384,7 +4389,7 @@ PDC_Client_data_server_write(struct pdc_request *request) request->shm_base = mmap(0, region_size, PROT_READ | PROT_WRITE, MAP_SHARED, request->shm_fd, 0); if (request->shm_base == MAP_FAILED) PGOTO_ERROR(FAIL, "Shared memory mmap failed, region size = %" PRIu64 "", region_size); - // close and shm_unlink? + // close and shm_unlink? #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_start, 0); @@ -4594,7 +4599,7 @@ PDC_Client_write_id(pdcid_t local_obj_id, struct pdc_region_info *region, void * struct _pdc_id_info *info; struct _pdc_obj_info *object; - pdc_metadata_t * meta; + pdc_metadata_t *meta; perr_t ret_value = SUCCEED; info = PDC_find_id(local_obj_id); @@ -4814,7 +4819,7 @@ PDC_Client_add_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo perr_t ret_value = SUCCEED; int i; - uint64_t * obj_ids; + uint64_t *obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -4840,7 +4845,7 @@ PDC_Client_del_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo perr_t ret_value = SUCCEED; int i; - uint64_t * obj_ids; + uint64_t *obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -4868,7 +4873,7 @@ PDC_Client_add_tags_to_container(pdcid_t cont_id, char *tags) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; uint32_t server_id; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_cont_info *object; uint64_t cont_meta_id; cont_add_tags_rpc_in_t add_tag_rpc_in; @@ -5109,12 +5114,12 @@ PDC_Client_query_name_read_entire_obj(int nobj, char **obj_names, void ***out_bu hg_handle_t rpc_handle; hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t * buf_sizes, total_size; + uint64_t *buf_sizes, total_size; int i; query_read_obj_name_in_t bulk_rpc_in; // Reuse the existing args structure update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request * request; + struct pdc_request *request; if (nobj == 0 || obj_names == NULL || out_buf == NULL || out_buf_sizes == NULL) @@ -5397,7 +5402,7 @@ PDC_get_storage_meta_from_io_list(pdc_data_server_io_list_t **list, region_stora FUNC_ENTER(NULL); pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t * ret_value = NULL; + region_list_t *ret_value = NULL; FUNC_ENTER(NULL); @@ -5424,7 +5429,7 @@ PDC_add_storage_meta_to_io_list(pdc_data_server_io_list_t **list, region_storage FUNC_ENTER(NULL); pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t * new_region; + region_list_t *new_region; int j; perr_t ret_value = SUCCEED; @@ -5489,7 +5494,7 @@ PDC_send_region_storage_meta_shm(uint32_t server_id, int n, region_storage_meta_ buf_sizes = n * sizeof(region_storage_meta_t); hg_ret = HG_Bulk_create(send_class_g, 1, (void **)&storage_meta, (const hg_size_t *)&buf_sizes, - HG_BULK_READ_ONLY, &bulk_handle); + HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create bulk data handle"); @@ -5522,7 +5527,7 @@ PDC_Client_cp_data_to_local_server(int nobj, region_storage_meta_t **all_storage perr_t ret_value = SUCCEED; uint32_t ndim, server_id; uint64_t total_size = 0, cp_loc = 0; - void * buf = NULL; + void *buf = NULL; char shm_addr[ADDR_MAX]; int i, *total_obj = NULL, ntotal_obj = nobj, *recvcounts = NULL, *displs = NULL; region_storage_meta_t *all_region_storage_meta_1d = NULL, *my_region_storage_meta_1d = NULL; @@ -5631,8 +5636,8 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_ perr_t ret_value = SUCCEED; int i; - char * fname, *prev_fname; - FILE * fp_read = NULL; + char *fname, *prev_fname; + FILE *fp_read = NULL; uint32_t ndim; uint64_t req_start, req_count, storage_start, storage_count, file_offset, buf_size; size_t read_bytes; @@ -5730,15 +5735,15 @@ PDC_Client_query_multi_storage_info(int nobj, char **obj_names, region_storage_m hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t * buf_sizes = NULL, total_size; + uint64_t *buf_sizes = NULL, total_size; int i, j, loc, iter, *n_obj_name_by_server = NULL; - int ** obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; + int **obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; int send_n_request = 0; - char *** obj_names_by_server = NULL; - char ** obj_names_by_server_2d = NULL; + char ***obj_names_by_server = NULL; + char **obj_names_by_server_2d = NULL; query_read_obj_name_in_t bulk_rpc_in; update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request ** requests, *request; + struct pdc_request **requests, *request; if (nobj == 0) PGOTO_DONE(SUCCEED); @@ -5957,12 +5962,12 @@ PDC_Client_query_name_read_entire_obj_client_agg(int my_nobj, char **my_obj_name FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - char ** all_names = my_obj_names; - char * local_names_1d, *all_names_1d = NULL; - int * total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; + char **all_names = my_obj_names; + char *local_names_1d, *all_names_1d = NULL; + int *total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; size_t max_name_len = 64; region_storage_meta_t **all_storage_meta = NULL, **my_storage_meta = NULL; - region_storage_meta_t * my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; + region_storage_meta_t *my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer1; @@ -6246,7 +6251,7 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { if (is_client_debug_g == 1) { @@ -6317,8 +6322,8 @@ PDC_add_kvtag(pdcid_t obj_id, pdc_kvtag_t *kvtag, int is_cont) uint32_t server_id; hg_handle_t metadata_add_kvtag_handle; metadata_add_kvtag_in_t in; - struct _pdc_obj_info * obj_prop; - struct _pdc_cont_info * cont_prop; + struct _pdc_obj_info *obj_prop; + struct _pdc_cont_info *cont_prop; struct _pdc_client_lookup_args lookup_args; if (is_cont == 0) { @@ -6419,8 +6424,8 @@ PDC_get_kvtag(pdcid_t obj_id, char *tag_name, pdc_kvtag_t **kvtag, int is_cont) hg_handle_t metadata_get_kvtag_handle; metadata_get_kvtag_in_t in; struct _pdc_get_kvtag_args lookup_args; - struct _pdc_obj_info * obj_prop; - struct _pdc_cont_info * cont_prop; + struct _pdc_obj_info *obj_prop; + struct _pdc_cont_info *cont_prop; if (is_cont == 0) { obj_prop = PDC_obj_get_info(obj_id); @@ -6479,12 +6484,12 @@ kvtag_query_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_bulk_t origin_bulk_handle = hg_cb_info->info.bulk.origin_handle; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; uint32_t n_meta, actual_cnt; - void * buf = NULL; + void *buf = NULL; uint64_t buf_sizes[1]; uint32_t bulk_sgnum; - uint64_t * ids_buf_sizes; - void ** ids_buf; - uint64_t * u64_arr_ptr; + uint64_t *ids_buf_sizes; + void **ids_buf; + uint64_t *u64_arr_ptr; bulk_args = (struct bulk_args_t *)hg_cb_info->arg; @@ -6530,14 +6535,14 @@ kvtag_query_forward_cb(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value; - struct bulk_args_t * bulk_arg; + struct bulk_args_t *bulk_arg; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info * hg_info = NULL; + const struct hg_info *hg_info = NULL; bulk_arg = (struct bulk_args_t *)callback_info->arg; handle = callback_info->info.forward.handle; @@ -6707,8 +6712,8 @@ PDCtag_delete(pdcid_t obj_id, char *tag_name, int is_cont) uint32_t server_id; hg_handle_t metadata_del_kvtag_handle; metadata_get_kvtag_in_t in; - struct _pdc_obj_info * obj_prop; - struct _pdc_cont_info * cont_prop; + struct _pdc_obj_info *obj_prop; + struct _pdc_cont_info *cont_prop; struct _pdc_client_lookup_args lookup_args; if (is_cont) { @@ -6934,7 +6939,7 @@ PDCobj_put_data(const char *obj_name, void *data, uint64_t size, pdcid_t cont_id perr_t ret; // pdc_metadata_t *meta; struct _pdc_cont_info *info = NULL; - struct _pdc_id_info * id_info = NULL; + struct _pdc_id_info *id_info = NULL; pdcid_t transfer_request; id_info = PDC_find_id(cont_id); @@ -7032,7 +7037,7 @@ PDC_Client_del_metadata(pdcid_t obj_id, int is_cont) perr_t ret_value = SUCCEED; uint64_t meta_id; - struct _pdc_obj_info * obj_prop; + struct _pdc_obj_info *obj_prop; struct _pdc_cont_info *cont_prop; if (is_cont) { @@ -7159,7 +7164,7 @@ PDC_recv_nhits(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - send_nhits_t * in = (send_nhits_t *)callback_info->arg; + send_nhits_t *in = (send_nhits_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; LOG_INFO("Received %" PRIu64 " hits from server\n", in->nhits); @@ -7186,10 +7191,10 @@ PDC_send_data_query(pdc_query_t *query, pdc_query_get_op_t get_op, uint64_t *nhi perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - uint32_t * target_servers = NULL; + uint32_t *target_servers = NULL; int i, server_id, next_server = 0, prev_server = 0, ntarget = 0; hg_handle_t handle; - pdc_query_xfer_t * query_xfer; + pdc_query_xfer_t *query_xfer; struct _pdc_client_lookup_args lookup_args; struct _pdc_query_result_list *result; @@ -7276,12 +7281,12 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; uint32_t ndim; int query_id, origin; - void * buf; + void *buf; pdc_int_ret_t out; out.ret = 1; @@ -7360,7 +7365,7 @@ PDC_Client_get_sel_data(pdcid_t obj_id, pdc_selection_t *sel, void *data) uint64_t meta_id, off; get_sel_data_rpc_in_t in; struct _pdc_client_lookup_args lookup_args; - struct _pdc_obj_info * obj_prop; + struct _pdc_obj_info *obj_prop; struct _pdc_query_result_list *result_elt; if (sel == NULL) @@ -7431,11 +7436,11 @@ PDC_recv_read_coords_data(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; int query_id, seq_id; - void * buf; + void *buf; pdc_int_ret_t out; out.ret = 1; @@ -7505,9 +7510,9 @@ report_avg_server_profiling_rst() for (int i = 0; i < pdc_server_num_g; i++) { - double avg_srv_time = server_call_count_g[i] > 0 - ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) - : 0.0; + double avg_srv_time = server_call_count_g[i] > 0 + ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) + : 0.0; double srv_mem_usage = server_mem_usage_g[i] / 1024.0 / 1024.0; LOG_INFO("Server %d, avg profiling time: %.4f ms, memory usage: %.4f MB\n", i, avg_srv_time / 1000.0, srv_mem_usage); @@ -7597,7 +7602,7 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value; - struct bulk_args_t * client_lookup_args; + struct bulk_args_t *client_lookup_args; hg_handle_t handle; dart_perform_one_server_out_t output; uint32_t n_meta; @@ -7606,8 +7611,8 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; const struct hg_info *hg_info = NULL; - struct bulk_args_t * bulk_args; - void * recv_meta; + struct bulk_args_t *bulk_args; + void *recv_meta; client_lookup_args = (struct bulk_args_t *)callback_info->arg; handle = callback_info->info.forward.handle; @@ -7762,7 +7767,7 @@ dart_perform_on_servers(index_hash_result_t **hash_result, int num_servers, struct bulk_args_t *lookup_args = (struct bulk_args_t *)PDC_calloc(num_servers, sizeof(struct bulk_args_t)); uint64_t ret_value = 0; - hg_handle_t * dart_request_handles = (hg_handle_t *)PDC_calloc(num_servers, sizeof(hg_handle_t)); + hg_handle_t *dart_request_handles = (hg_handle_t *)PDC_calloc(num_servers, sizeof(hg_handle_t)); int num_requests = 0; uint32_t total_n_meta = 0; dart_op_type_t op_type = dart_in->op_type; @@ -7826,9 +7831,9 @@ PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char *query_s stopwatch_t timer; timer_start(&timer); - char * k_query = get_key(query_string, '='); - char * v_query = get_value(query_string, '='); - char * tok = NULL; + char *k_query = get_key(query_string, '='); + char *v_query = get_value(query_string, '='); + char *tok = NULL; dart_op_type_t dart_op; dart_determine_query_token_by_key_query(k_query, &tok, &dart_op); diff --git a/src/api/pdc_obj/pdc_cont.c b/src/api/pdc_obj/pdc_cont.c index f325da333..ea22388c5 100644 --- a/src/api/pdc_obj/pdc_cont.c +++ b/src/api/pdc_obj/pdc_cont.c @@ -58,7 +58,7 @@ PDCcont_create(const char *cont_name, pdcid_t cont_prop_id) perr_t ret = SUCCEED; struct _pdc_cont_info *p = NULL; struct _pdc_cont_prop *cont_prop = NULL; - struct _pdc_id_info * id_info = NULL; + struct _pdc_id_info *id_info = NULL; p = (struct _pdc_cont_info *)PDC_malloc(sizeof(struct _pdc_cont_info)); if (!p) @@ -69,7 +69,9 @@ PDCcont_create(const char *cont_name, pdcid_t cont_prop_id) PGOTO_ERROR(0, "PDC pub container memory allocation failed"); p->cont_info_pub->name = strdup(cont_name); - id_info = PDC_find_id(cont_prop_id); + id_info = PDC_find_id(cont_prop_id); + if (id_info == NULL) + PGOTO_ERROR(0, "Failed to find cont prop using pdcid"); cont_prop = (struct _pdc_cont_prop *)(id_info->obj_ptr); p->cont_pt = (struct _pdc_cont_prop *)PDC_calloc(1, sizeof(struct _pdc_cont_prop)); @@ -106,7 +108,7 @@ PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id) perr_t ret = SUCCEED; struct _pdc_cont_info *p = NULL; struct _pdc_cont_prop *cont_prop = NULL; - struct _pdc_id_info * id_info = NULL; + struct _pdc_id_info *id_info = NULL; FUNC_ENTER(NULL); @@ -153,7 +155,7 @@ PDC_cont_create_local(pdcid_t pdc, const char *cont_name, uint64_t cont_meta_id) pdcid_t ret_value = 0; struct _pdc_cont_info *p = NULL; struct _pdc_cont_prop *cont_prop = NULL; - struct _pdc_id_info * id_info = NULL; + struct _pdc_id_info *id_info = NULL; pdcid_t cont_prop_id; p = (struct _pdc_cont_info *)PDC_malloc(sizeof(struct _pdc_cont_info)); @@ -307,7 +309,7 @@ PDC_cont_get_info(pdcid_t cont_id) struct _pdc_cont_info *ret_value = NULL; struct _pdc_cont_info *info = NULL; - struct _pdc_id_info * id_info = NULL; + struct _pdc_id_info *id_info = NULL; id_info = PDC_find_id(cont_id); if (id_info == NULL) @@ -350,7 +352,7 @@ PDCcont_get_info(const char *cont_name) { FUNC_ENTER(NULL); - struct pdc_cont_info * ret_value = NULL; + struct pdc_cont_info *ret_value = NULL; struct _pdc_cont_info *tmp = NULL; pdcid_t cont_id; @@ -373,8 +375,8 @@ PDCcont_iter_start() { FUNC_ENTER(NULL); - cont_handle * ret_value = NULL; - cont_handle * conthl = NULL; + cont_handle *ret_value = NULL; + cont_handle *conthl = NULL; struct PDC_id_type *type_ptr; type_ptr = (pdc_id_list_g->PDC_id_type_list_g)[PDC_CONT]; @@ -421,7 +423,7 @@ PDCcont_iter_get_info(cont_handle *chandle) { FUNC_ENTER(NULL); - struct pdc_cont_info * ret_value = NULL; + struct pdc_cont_info *ret_value = NULL; struct _pdc_cont_info *info = NULL; info = (struct _pdc_cont_info *)(chandle->obj_ptr); diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index e2712ed0e..9e85441b9 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -116,10 +116,10 @@ PDC_obj_create(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, _pdc_ FUNC_ENTER(NULL); pdcid_t ret_value = 0; - 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; struct _pdc_cont_info *cont_info = NULL; - struct _pdc_obj_prop * obj_prop; + struct _pdc_obj_prop *obj_prop; uint64_t meta_id; uint32_t data_server_id, metadata_server_id; size_t i; @@ -169,7 +169,9 @@ PDC_obj_create(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, _pdc_ meta_id = p->cont->cont_info_pub->meta_id; } - id_info = PDC_find_id(obj_prop_id); + id_info = PDC_find_id(obj_prop_id); + if (id_info == NULL) + PGOTO_ERROR(0, "Failed to find obj prop using pdcid"); obj_prop = (struct _pdc_obj_prop *)(id_info->obj_ptr); /* struct _pdc_obj_prop field */ @@ -277,7 +279,7 @@ PDC_obj_close(struct _pdc_obj_info *op) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - pdcid_t * transfer_request_id; + pdcid_t *transfer_request_id; pdc_local_transfer_request *temp, *previous; int i, n; @@ -397,12 +399,12 @@ PDCobj_open_common(const char *obj_name, pdcid_t pdc, int is_col) pdcid_t ret_value = 0; perr_t ret = SUCCEED; struct _pdc_obj_info *p = NULL; - pdc_metadata_t * out = NULL; + pdc_metadata_t *out = NULL; pdcid_t obj_prop; size_t i; uint32_t metadata_server_id; - obj_handle * oh; - struct pdc_obj_info * info; + obj_handle *oh; + struct pdc_obj_info *info; int is_opened = 0; // Search if the object has already been opened @@ -544,8 +546,8 @@ PDCobj_iter_start(pdcid_t cont_id) { FUNC_ENTER(NULL); - obj_handle * ret_value = NULL; - obj_handle * objhl = NULL; + obj_handle *ret_value = NULL; + obj_handle *objhl = NULL; struct PDC_id_type *type_ptr; type_ptr = (pdc_id_list_g->PDC_id_type_list_g)[PDC_OBJ]; @@ -604,7 +606,7 @@ PDCobj_iter_get_info(obj_handle *ohandle) { FUNC_ENTER(NULL); - struct pdc_obj_info * ret_value = NULL; + struct pdc_obj_info *ret_value = NULL; struct _pdc_obj_info *info = NULL; unsigned i; @@ -734,7 +736,7 @@ PDCprop_set_obj_dims(pdcid_t obj_prop, PDC_int_t ndim, uint64_t *dims) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_obj_prop *prop; if (ndim <= 0) @@ -762,7 +764,7 @@ PDCprop_set_obj_type(pdcid_t obj_prop, pdc_var_type_t type) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -781,7 +783,7 @@ PDCprop_set_obj_transfer_region_type(pdcid_t obj_prop, pdc_region_partition_t re FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -800,7 +802,7 @@ PDCprop_set_obj_consistency_semantics(pdcid_t obj_prop, pdc_consistency_t consis FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -819,7 +821,7 @@ PDCprop_set_obj_buf(pdcid_t obj_prop, void *buf) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -838,7 +840,7 @@ PDCobj_set_dims(pdcid_t obj_id, int ndim, uint64_t *dims) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_obj_info *object; int reset; @@ -876,7 +878,7 @@ PDCobj_get_dims(pdcid_t obj_id, int *ndim, uint64_t **dims) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_obj_info *object; info = PDC_find_id(obj_id); @@ -896,10 +898,10 @@ PDCobj_buf_retrieve(pdcid_t obj_id) { FUNC_ENTER(NULL); - void ** ret_value = NULL; - struct _pdc_id_info * info; + void **ret_value = NULL; + struct _pdc_id_info *info; struct _pdc_obj_info *object; - void ** buffer; + void **buffer; info = PDC_find_id(obj_id); if (info == NULL) @@ -919,7 +921,7 @@ PDC_obj_get_info(pdcid_t obj_id) struct _pdc_obj_info *ret_value = NULL; struct _pdc_obj_info *info = NULL; - struct _pdc_id_info * obj; + struct _pdc_id_info *obj; size_t i; obj = PDC_find_id(obj_id); @@ -1100,7 +1102,7 @@ PDCobj_get_info(pdcid_t obj_id) { FUNC_ENTER(NULL); - struct pdc_obj_info * ret_value = NULL; + struct pdc_obj_info *ret_value = NULL; struct _pdc_obj_info *tmp = NULL; /* pdcid_t obj_id; */ diff --git a/src/api/pdc_obj/pdc_prop.c b/src/api/pdc_obj/pdc_prop.c index 76db3c8b9..e15e76a64 100644 --- a/src/api/pdc_obj/pdc_prop.c +++ b/src/api/pdc_obj/pdc_prop.c @@ -60,9 +60,9 @@ PDCprop_create(pdc_prop_type_t type, pdcid_t pdcid) pdcid_t ret_value = 0; struct _pdc_cont_prop *p = NULL; - struct _pdc_obj_prop * q = NULL; - struct _pdc_id_info * id_info = NULL; - struct _pdc_class * pdc_class; + struct _pdc_obj_prop *q = NULL; + struct _pdc_id_info *id_info = NULL; + struct _pdc_class *pdc_class; pdcid_t new_id_c; pdcid_t new_id_o; @@ -74,8 +74,10 @@ PDCprop_create(pdc_prop_type_t type, pdcid_t pdcid) new_id_c = PDC_id_register(PDC_CONT_PROP, p); p->cont_prop_id = new_id_c; id_info = PDC_find_id(pdcid); - pdc_class = (struct _pdc_class *)(id_info->obj_ptr); - p->pdc = (struct _pdc_class *)PDC_calloc(1, sizeof(struct _pdc_class)); + if (id_info == NULL) + PGOTO_ERROR(0, "Failed to find prop using pdcid"); + pdc_class = (struct _pdc_class *)(id_info->obj_ptr); + p->pdc = (struct _pdc_class *)PDC_calloc(1, sizeof(struct _pdc_class)); if (p->pdc == NULL) PGOTO_ERROR(0, "PDC class allocation failed"); if (pdc_class->name) @@ -105,8 +107,10 @@ PDCprop_create(pdc_prop_type_t type, pdcid_t pdcid) new_id_o = PDC_id_register(PDC_OBJ_PROP, q); q->obj_prop_pub->obj_prop_id = new_id_o; id_info = PDC_find_id(pdcid); - pdc_class = (struct _pdc_class *)(id_info->obj_ptr); - q->pdc = (struct _pdc_class *)PDC_calloc(1, sizeof(struct _pdc_class)); + if (id_info == NULL) + PGOTO_ERROR(0, "Failed to find pdc obj using pdcid"); + pdc_class = (struct _pdc_class *)(id_info->obj_ptr); + q->pdc = (struct _pdc_class *)PDC_calloc(1, sizeof(struct _pdc_class)); if (q->pdc == NULL) PGOTO_ERROR(0, "PDC class allocation failed"); if (pdc_class->name) @@ -132,7 +136,7 @@ PDCprop_obj_dup(pdcid_t prop_id) pdcid_t ret_value = 0; struct _pdc_obj_prop *q = NULL; struct _pdc_obj_prop *info = NULL; - struct _pdc_id_info * prop = NULL; + struct _pdc_id_info *prop = NULL; pdcid_t new_id; size_t i; @@ -291,7 +295,7 @@ PDCcont_prop_get_info(pdcid_t cont_prop) struct _pdc_cont_prop *ret_value = NULL; struct _pdc_cont_prop *info = NULL; - struct _pdc_id_info * prop; + struct _pdc_id_info *prop; prop = PDC_find_id(cont_prop); if (prop == NULL) @@ -320,9 +324,9 @@ PDCobj_prop_get_info(pdcid_t obj_prop) { FUNC_ENTER(NULL); - struct pdc_obj_prop * ret_value = NULL; + struct pdc_obj_prop *ret_value = NULL; struct _pdc_obj_prop *info = NULL; - struct _pdc_id_info * prop; + struct _pdc_id_info *prop; size_t i; prop = PDC_find_id(obj_prop); @@ -352,7 +356,7 @@ PDC_obj_prop_get_info(pdcid_t obj_prop) struct _pdc_obj_prop *ret_value = NULL; struct _pdc_obj_prop *info = NULL; - struct _pdc_id_info * prop; + struct _pdc_id_info *prop; size_t i; prop = PDC_find_id(obj_prop); diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 2a773a299..394ed9914 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -47,6 +47,8 @@ #define PDC_MERGE_TRANSFER_MIN_COUNT 50 +#define MAX_BULK_HANDLES 10 + // pdc region transfer class. Contains essential information for performing non-blocking PDC client I/O // perations. typedef struct pdc_transfer_request { @@ -75,7 +77,7 @@ typedef struct pdc_transfer_request { // For each of the contig buffer sent to a server, we have a bulk buffer. char **bulk_buf; // Reference counter for bulk_buf, if 0, we free it. - int ** bulk_buf_ref; + int **bulk_buf_ref; pdc_region_partition_t region_partition; // Consistency semantics required by user @@ -109,6 +111,10 @@ typedef struct pdc_transfer_request { // Tang: for merging transfer requests with transfer start_all/wait_all pdcid_t merged_request_id; int is_done; + + // list of bulk handles used for region request + hg_bulk_t bulk_handles[MAX_BULK_HANDLES]; + uint32_t num_bulk_handles; } pdc_transfer_request; // We pack all arguments for a start_all call to the same data server in a single structure, so we do not need @@ -127,7 +133,7 @@ typedef struct pdc_transfer_request_start_all_pkg { int index; // Data buffer. This data buffer is contiguous according to the remote region. We assume this is after // transformation of local regions - char * buf; + char *buf; struct pdc_transfer_request_start_all_pkg *next; } pdc_transfer_request_start_all_pkg; @@ -141,7 +147,7 @@ typedef struct pdc_transfer_request_wait_all_pkg { // Record the index of the metadata_id in the current transfer_request int index; // Pointer to the transfer request - pdc_transfer_request * transfer_request; + pdc_transfer_request *transfer_request; struct pdc_transfer_request_wait_all_pkg *next; } pdc_transfer_request_wait_all_pkg; @@ -197,12 +203,12 @@ PDCregion_transfer_create(void *buf, pdc_access_t access_type, pdcid_t obj_id, p FUNC_ENTER(NULL); pdcid_t ret_value = SUCCEED; - struct _pdc_id_info * objinfo2; - struct _pdc_obj_info * obj2; - pdc_transfer_request * p; - struct _pdc_id_info * reginfo1, *reginfo2; + struct _pdc_id_info *objinfo2; + struct _pdc_obj_info *obj2; + pdc_transfer_request *p; + struct _pdc_id_info *reginfo1, *reginfo2; struct pdc_region_info *reg1, *reg2; - uint64_t * ptr; + uint64_t *ptr; uint64_t unit; int j; @@ -247,7 +253,10 @@ PDCregion_transfer_create(void *buf, pdc_access_t access_type, pdcid_t obj_id, p p->consistency = obj2->obj_pt->obj_prop_pub->consistency; p->merged_request_id = 0; p->is_done = 0; - unit = p->unit; + p->num_bulk_handles = 0; + for (int i = 0; i < MAX_BULK_HANDLES; i++) + p->bulk_handles[i] = HG_BULK_NULL; + unit = p->unit; p->local_region_ndim = reg1->ndim; p->local_region_offset = (uint64_t *)PDC_malloc( @@ -287,7 +296,7 @@ PDCregion_transfer_close(pdcid_t transfer_request_id) { FUNC_ENTER(NULL); - struct _pdc_id_info * transferinfo; + struct _pdc_id_info *transferinfo; pdc_transfer_request *transfer_request; perr_t ret_value = SUCCEED; @@ -296,6 +305,18 @@ PDCregion_transfer_close(pdcid_t transfer_request_id) PGOTO_DONE(ret_value); transfer_request = (pdc_transfer_request *)(transferinfo->obj_ptr); + LOG_INFO("Freeing %d bulk handles\n", transfer_request->num_bulk_handles); + for (int i = 0; i < transfer_request->num_bulk_handles; i++) { + if (transfer_request->bulk_handles[i] == HG_BULK_NULL) + LOG_WARNING("Bulk handle added to transfer request was NULL\n"); + else { + if (HG_Bulk_free(transfer_request->bulk_handles[i]) != HG_SUCCESS) + LOG_WARNING("Failed to free bulk handle added to transfer request\n"); + + transfer_request->bulk_handles[i] = HG_BULK_NULL; + } + } + if (transfer_request->local_region_offset) transfer_request->local_region_offset = (uint64_t *)PDC_free(transfer_request->local_region_offset); if (transfer_request->metadata_id) @@ -524,7 +545,7 @@ pack_region_buffer(char *buf, uint64_t *obj_dims, size_t total_data_size, int lo uint64_t i, j; perr_t ret_value = SUCCEED; - char * ptr; + char *ptr; if (local_ndim == 1) { *new_buf = buf + local_offset[0] * unit; @@ -592,7 +613,7 @@ pack_region_metadata_query(pdc_transfer_request_start_all_pkg **transfer_request perr_t ret_value = SUCCEED; int i; - char * ptr; + char *ptr; uint64_t total_buf_size; uint8_t region_partition; @@ -640,13 +661,13 @@ unpack_region_metadata_query(char *buf, pdc_transfer_request_start_all_pkg **tra perr_t ret_value = SUCCEED; pdc_transfer_request_start_all_pkg *transfer_request_head, *transfer_request_end; - pdc_transfer_request * local_request; + pdc_transfer_request *local_request; int size; int i, j, index; int counter; - char * ptr; + char *ptr; uint64_t region_size; - uint64_t * sub_offset; + uint64_t *sub_offset; local_request = NULL; transfer_request_head = NULL; @@ -740,10 +761,10 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i perr_t ret_value = SUCCEED; int i, j, index, size, output_size, remain_size, n_objs; pdc_transfer_request_start_all_pkg **transfer_requests; - pdc_transfer_request_start_all_pkg * transfer_request_head, *transfer_request_front_head, + pdc_transfer_request_start_all_pkg *transfer_request_head, *transfer_request_front_head, *transfer_request_end, **transfer_request_output, *previous = NULL; uint64_t total_buf_size, output_buf_size, query_id; - char * buf, *output_buf; + char *buf, *output_buf; transfer_request_output = NULL; transfer_request_front_head = NULL; @@ -768,15 +789,21 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i transfer_requests[i - 1]->transfer_request->metadata_server_id) { n_objs = i - index; pack_region_metadata_query(transfer_requests + index, n_objs, &buf, &total_buf_size); + pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; + hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query( - buf, total_buf_size, n_objs, transfer_requests[index]->transfer_request->metadata_server_id, - is_write, &output_buf_size, &query_id); + bulk_handle, buf, total_buf_size, n_objs, + transfer_requests[index]->transfer_request->metadata_server_id, is_write, &output_buf_size, + &query_id); + transfer_request->num_bulk_handles++; buf = (char *)PDC_free(buf); if (query_id) { - output_buf = (char *)PDC_malloc(output_buf_size); + output_buf = (char *)PDC_malloc(output_buf_size); + bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query2( - output_buf, output_buf_size, query_id, + bulk_handle, output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); + transfer_request->num_bulk_handles++; unpack_region_metadata_query(output_buf, transfer_requests + index, &transfer_request_head, &transfer_request_end, &output_size); output_buf = (char *)PDC_free(output_buf); @@ -795,16 +822,22 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i if (size) { n_objs = size - index; pack_region_metadata_query(transfer_requests + index, n_objs, &buf, &total_buf_size); + pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; + hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query( - buf, total_buf_size, n_objs, transfer_requests[index]->transfer_request->metadata_server_id, - is_write, &output_buf_size, &query_id); + bulk_handle, buf, total_buf_size, n_objs, + transfer_requests[index]->transfer_request->metadata_server_id, is_write, &output_buf_size, + &query_id); + transfer_request->num_bulk_handles++; buf = (char *)PDC_free(buf); // If it is a valid query ID, then it means regions are overlapping. if (query_id) { - output_buf = (char *)PDC_malloc(output_buf_size); + output_buf = (char *)PDC_malloc(output_buf_size); + bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query2( - output_buf, output_buf_size, query_id, + bulk_handle, output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); + transfer_request->num_bulk_handles++; unpack_region_metadata_query(output_buf, transfer_requests + index, &transfer_request_head, &transfer_request_end, &output_size); output_buf = (char *)PDC_free(output_buf); @@ -875,7 +908,7 @@ prepare_start_all_requests(pdcid_t *transfer_request_id, int size, *read_request_pkgs, *write_request_pkgs_end, *read_request_pkgs_end, *request_pkgs, **transfer_request_output; int write_size, read_size, output_size; - struct _pdc_id_info * transferinfo; + struct _pdc_id_info *transferinfo; pdc_transfer_request *transfer_request; int set_output_buf = 0; @@ -1081,7 +1114,7 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - char * bulk_buf, *ptr, *ptr2; + char *bulk_buf, *ptr, *ptr2; size_t total_buf_size, obj_data_size, total_obj_data_size, unit, data_size, metadata_size; int i, j; @@ -1188,10 +1221,10 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ int index, i, j; int n_objs; uint64_t *metadata_id; - char ** read_bulk_buf; - char * bulk_buf; + char **read_bulk_buf; + char *bulk_buf; size_t bulk_buf_size; - int * bulk_buf_ref; + int *bulk_buf_ref; if (size == 0) PGOTO_DONE(ret_value); @@ -1206,11 +1239,15 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ PDC_Client_pack_all_requests(n_objs, transfer_requests + index, transfer_requests[index]->transfer_request->access_type, &bulk_buf, &bulk_buf_size, read_bulk_buf + index); - bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); - bulk_buf_ref[0] = n_objs; - PDC_Client_transfer_request_all(n_objs, transfer_requests[index]->transfer_request->access_type, - transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, - metadata_id + index, comm); + bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); + bulk_buf_ref[0] = n_objs; + pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; + hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; + PDC_Client_transfer_request_all( + bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, + transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); + transfer_request->num_bulk_handles++; + for (j = index; j < i; ++j) { // All requests share the same bulk buffer, reference counter is also shared among all // requests. @@ -1233,11 +1270,14 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ PDC_Client_pack_all_requests(n_objs, transfer_requests + index, transfer_requests[index]->transfer_request->access_type, &bulk_buf, &bulk_buf_size, read_bulk_buf + index); - bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); - bulk_buf_ref[0] = n_objs; - PDC_Client_transfer_request_all(n_objs, transfer_requests[index]->transfer_request->access_type, - transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, - metadata_id + index, comm); + bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); + bulk_buf_ref[0] = n_objs; + pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; + hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; + PDC_Client_transfer_request_all( + bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, + transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); + transfer_request->num_bulk_handles++; for (j = index; j < size; ++j) { // All requests share the same bulk buffer, reference counter is also shared among all @@ -1267,10 +1307,10 @@ merge_transfer_request_ids(pdcid_t *transfer_request_id, int size, pdcid_t *merg { FUNC_ENTER(NULL); - struct _pdc_id_info * transferinfo; + struct _pdc_id_info *transferinfo; pdcid_t obj_id, new_local_reg, new_remote_reg; int flag = 0, i; - void * new_buf; + void *new_buf; pdc_access_t access_type; pdc_transfer_request **all_transfer_request; uint64_t new_buf_size = 0, copy_off = 0; @@ -1376,7 +1416,7 @@ PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, int perr_t ret_value = SUCCEED; int write_size = 0, read_size = 0, posix_size = 0, merged_size = 0; pdc_transfer_request_start_all_pkg **write_transfer_requests = NULL, **read_transfer_requests = NULL; - pdcid_t * posix_transfer_request_id, *merged_request_id; + pdcid_t *posix_transfer_request_id, *merged_request_id; // Merge the transfer_request_ids when they are operating on the same obj and have contiguous off, len if (size > PDC_MERGE_TRANSFER_MIN_COUNT) { @@ -1459,7 +1499,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * transferinfo; + struct _pdc_id_info *transferinfo; pdc_transfer_request *transfer_request; size_t unit; int i; @@ -1524,10 +1564,12 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, transfer_request->read_bulk_buf[i] = transfer_request->output_buf[i]; } ret_value = PDC_Client_transfer_request( + &transfer_request->bulk_handles[transfer_request->num_bulk_handles], transfer_request->output_buf[i], transfer_request->obj_id, transfer_request->obj_servers[i], transfer_request->obj_ndim, transfer_request->obj_dims, transfer_request->remote_region_ndim, transfer_request->output_offsets[i], transfer_request->output_sizes[i], unit, transfer_request->access_type, transfer_request->metadata_id + i); + transfer_request->num_bulk_handles++; } } else if (transfer_request->region_partition == PDC_OBJ_STATIC) { @@ -1543,10 +1585,12 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, // Submit transfer request to server by designating data server ID, remote region info, and contiguous // memory buffer for copy. ret_value = PDC_Client_transfer_request( - transfer_request->new_buf, transfer_request->obj_id, transfer_request->data_server_id, - transfer_request->obj_ndim, transfer_request->obj_dims, transfer_request->remote_region_ndim, + &transfer_request->bulk_handles[transfer_request->num_bulk_handles], transfer_request->new_buf, + transfer_request->obj_id, transfer_request->data_server_id, transfer_request->obj_ndim, + transfer_request->obj_dims, transfer_request->remote_region_ndim, transfer_request->remote_region_offset, transfer_request->remote_region_size, unit, transfer_request->access_type, transfer_request->metadata_id); + transfer_request->num_bulk_handles++; } // For POSIX consistency, we block here until the data is received by the server @@ -1593,7 +1637,7 @@ release_region_buffer(char *buf, uint64_t *obj_dims, int local_ndim, uint64_t *l int k; perr_t ret_value = SUCCEED; - char * ptr; + char *ptr; if (local_ndim == 2) { if (access_type == PDC_READ) { ptr = new_buf; @@ -1632,7 +1676,7 @@ PDCregion_transfer_status(pdcid_t transfer_request_id, pdc_transfer_status_t *co FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * transferinfo; + struct _pdc_id_info *transferinfo; pdc_transfer_request *transfer_request; size_t unit; int i; @@ -1720,13 +1764,13 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) int index, i, j, merged_xfer = 0, ori_size = size, is_first = 1; size_t unit; int total_requests, n_objs; - uint64_t * metadata_ids, merge_off = 0, cur_off = 0; + uint64_t *metadata_ids, merge_off = 0, cur_off = 0; pdc_transfer_request_wait_all_pkg **transfer_requests, *transfer_request_head, *transfer_request_end, *temp; struct _pdc_id_info **transferinfo; pdc_transfer_request *transfer_request, *merged_request; - pdcid_t * my_transfer_request_id = transfer_request_id; + pdcid_t *my_transfer_request_id = transfer_request_id; double t0, t1; @@ -1812,8 +1856,11 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) metadata_ids[j] = transfer_requests[j]->metadata_id; } - PDC_Client_transfer_request_wait_all(n_objs, metadata_ids + index, + pdc_transfer_request *tr = transfer_requests[index]->transfer_request; + hg_bulk_t *bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; + PDC_Client_transfer_request_wait_all(bulk_handle, n_objs, metadata_ids + index, transfer_requests[index]->data_server_id); + tr->num_bulk_handles++; for (j = index; j < i; ++j) { if (transfer_requests[j]->transfer_request->region_partition == PDC_REGION_STATIC || transfer_requests[j]->transfer_request->region_partition == PDC_REGION_DYNAMIC || @@ -1854,8 +1901,11 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) for (j = index; j < total_requests; ++j) { metadata_ids[j] = transfer_requests[j]->metadata_id; } - PDC_Client_transfer_request_wait_all(n_objs, metadata_ids + index, + pdc_transfer_request *tr = transfer_requests[index]->transfer_request; + hg_bulk_t *bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; + PDC_Client_transfer_request_wait_all(bulk_handle, n_objs, metadata_ids + index, transfer_requests[index]->data_server_id); + tr->num_bulk_handles++; for (j = index; j < total_requests; ++j) { if (transfer_requests[j]->transfer_request->region_partition == PDC_REGION_STATIC || transfer_requests[j]->transfer_request->region_partition == PDC_REGION_DYNAMIC || @@ -1958,7 +2008,7 @@ PDCregion_transfer_wait(pdcid_t transfer_request_id) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * transferinfo; + struct _pdc_id_info *transferinfo; pdc_transfer_request *transfer_request; size_t unit; int i; diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index b75c8f567..66eb8e6fe 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -1602,7 +1602,7 @@ HG_TEST_RPC_CB(metadata_query, handle) hg_return_t ret_value = HG_SUCCESS; metadata_query_in_t in; metadata_query_out_t out; - pdc_metadata_t * query_result = NULL; + pdc_metadata_t *query_result = NULL; // Decode input HG_Get_input(handle, &in); @@ -1643,7 +1643,7 @@ HG_TEST_RPC_CB(obj_reset_dims, handle) hg_return_t ret_value = HG_SUCCESS; obj_reset_dims_in_t in; obj_reset_dims_out_t out; - pdc_metadata_t * query_result = NULL; + pdc_metadata_t *query_result = NULL; // Decode input HG_Get_input(handle, &in); @@ -2025,7 +2025,7 @@ pdc_region_write_out_progress(void *arg) HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - struct pdc_region_info * remote_reg_info = NULL; + struct pdc_region_info *remote_reg_info = NULL; region_lock_out_t out; remote_reg_info = (struct pdc_region_info *)PDC_malloc(sizeof(struct pdc_region_info)); @@ -2123,7 +2123,7 @@ pdc_region_read_from_progress(void *arg) HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - const struct hg_info * hg_info = NULL; + const struct hg_info *hg_info = NULL; hg_return_t hg_ret; size_t size; int error = 0; @@ -2173,21 +2173,21 @@ transform_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_inf hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_transform_and_release_bulk_args *bulk_args = NULL; - void * data_buf; - char * buf; + void *data_buf; + char *buf; int ndim; int transform_id; int type_extent = 0; int use_transform_size = 0; size_t unit = 1; int64_t transform_size, expected_size; - uint64_t * dims = NULL; + uint64_t *dims = NULL; pdc_var_type_t destType; - struct _pdc_region_transform_ftn_info ** registry = NULL; + struct _pdc_region_transform_ftn_info **registry = NULL; int registered_count; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t * elt; + region_buf_map_t *elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2355,12 +2355,12 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_analysis_and_release_bulk_args *bulk_args = NULL; - void * data_buf; + void *data_buf; int ndim; uint64_t type_extent; - uint64_t * dims = NULL; - struct pdc_region_info * remote_reg_info = NULL; - struct pdc_region_info * local_reg_info = NULL; + uint64_t *dims = NULL; + struct pdc_region_info *remote_reg_info = NULL; + struct pdc_region_info *local_reg_info = NULL; double start_t, end_t, analysis_t, io_t; double averages[4]; @@ -2411,7 +2411,7 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info int registered_count = PDC_get_analysis_registry(®istry); if ((registered_count >= analysis_meta_index) && (registry != NULL)) { - int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t * _cbs) = + int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t *_cbs) = registry[analysis_meta_index]->ftnPtr; int result = analysis_ftn(bulk_args->in.input_iter, bulk_args->in.output_iter, &iter_cbs); LOG_INFO("Analysis returned %d\n", result); @@ -2510,7 +2510,7 @@ buf_map_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct buf_map_release_bulk_args *bulk_args = NULL; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t * elt; + region_buf_map_t *elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2695,23 +2695,23 @@ HG_TEST_RPC_CB(region_release, handle) hg_return_t hg_ret; region_lock_in_t in; region_lock_out_t out; - const struct hg_info * hg_info = NULL; - data_server_region_t * target_obj; + const struct hg_info *hg_info = NULL; + data_server_region_t *target_obj; int error = 0; int dirty_reg = 0; hg_size_t size, size2; - void * data_buf; - struct pdc_region_info * server_region; - region_list_t * elt, *request_region, *tmp, *elt_tmp; + void *data_buf; + struct pdc_region_info *server_region; + region_list_t *elt, *request_region, *tmp, *elt_tmp; struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; - struct buf_map_release_bulk_args * buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; + struct buf_map_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info * remote_reg_info; - region_buf_map_t * eltt, *eltt2, *eltt_tmp; + struct pdc_region_info *remote_reg_info; + region_buf_map_t *eltt, *eltt2, *eltt_tmp; hg_uint32_t /*k, m, */ remote_count; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; // size_t type_size = 0; // size_t dims[4] = {0, 0, 0, 0}; #ifdef PDC_TIMING @@ -3047,10 +3047,10 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha const struct hg_info *hg_info = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; hg_uint32_t remote_count; - void * data_buf = NULL; + void *data_buf = NULL; ; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; region_buf_map_t *eltt2; region_lock_out_t out; @@ -3059,8 +3059,8 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha int dirty_reg = 0; struct buf_map_transform_and_release_bulk_args *transform_release_bulk_args = NULL; - struct pdc_region_info * remote_reg_info = NULL; - data_server_region_t * target_obj = NULL; + struct pdc_region_info *remote_reg_info = NULL; + data_server_region_t *target_obj = NULL; region_list_t *tmp, *elt, *request_region = (region_list_t *)PDC_malloc(sizeof(region_list_t)); hg_info = HG_Get_info(handle); @@ -3211,19 +3211,19 @@ HG_TEST_RPC_CB(transform_region_release, handle) region_transform_and_lock_in_t in; region_lock_in_t reg_lock_in; region_lock_out_t out; - const struct hg_info * hg_info = NULL; - data_server_region_t * target_obj; + const struct hg_info *hg_info = NULL; + data_server_region_t *target_obj; int error = 0; int dirty_reg = 0; hg_size_t size; - void * data_buf; - region_list_t * elt, *request_region, *tmp; + void *data_buf; + region_list_t *elt, *request_region, *tmp; struct buf_map_transform_and_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t * eltt; + region_buf_map_t *eltt; hg_uint32_t remote_count; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; // Decode input HG_Get_input(handle, &in); @@ -3356,14 +3356,14 @@ HG_TEST_RPC_CB(region_transform_release, handle) int dirty_reg = 0; hg_size_t size, remote_size; ; - void * data_buf; - region_list_t * elt, *request_region, *tmp; + void *data_buf; + region_list_t *elt, *request_region, *tmp; struct buf_map_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t * eltt; + region_buf_map_t *eltt; hg_uint32_t k, remote_count = 0; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; size_t type_size = 0; ; size_t dims[4] = {0, 0, 0, 0}; @@ -3512,26 +3512,26 @@ HG_TEST_RPC_CB(region_analysis_release, handle) } in; region_lock_out_t out; - const struct hg_info * hg_info = NULL; - data_server_region_t * target_obj; - data_server_region_t * lock_obj; + const struct hg_info *hg_info = NULL; + data_server_region_t *target_obj; + data_server_region_t *lock_obj; int error = 0; int dirty_reg = 0; hg_size_t size; hg_return_t hg_ret; - void * data_buf; - struct pdc_region_info * server_region; - region_list_t * elt, *request_region, *tmp; - struct region_lock_update_bulk_args * lock_update_bulk_args = NULL; + void *data_buf; + struct pdc_region_info *server_region; + region_list_t *elt, *request_region, *tmp; + struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; struct buf_map_analysis_and_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info * remote_reg_info; - region_buf_map_t * eltt, *eltt2; + struct pdc_region_info *remote_reg_info; + region_buf_map_t *eltt, *eltt2; hg_uint32_t k, remote_count = 0; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; size_t type_size = 0; size_t dims[4] = {0, 0, 0, 0}; @@ -3953,7 +3953,7 @@ HG_TEST_RPC_CB(get_remote_metadata, handle) hg_return_t ret_value = HG_SUCCESS; get_remote_metadata_in_t in; get_remote_metadata_out_t out; - pdc_metadata_t * meta; + pdc_metadata_t *meta; // Decode input HG_Get_input(handle, &in); @@ -3988,7 +3988,7 @@ HG_TEST_RPC_CB(buf_unmap_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_unmap_in_t in; buf_unmap_out_t out; - pdc_metadata_t * target_obj; + pdc_metadata_t *target_obj; region_buf_map_t *tmp, *elt; // Decode input @@ -4034,8 +4034,8 @@ HG_TEST_RPC_CB(buf_map_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_map_in_t in; buf_map_out_t out; - pdc_metadata_t * target_obj; - region_list_t * elt, *request_region; + pdc_metadata_t *target_obj; + region_list_t *elt, *request_region; region_buf_map_t *buf_map_ptr; // Decode input @@ -4095,9 +4095,9 @@ HG_TEST_RPC_CB(buf_map, handle) buf_map_in_t in; buf_map_out_t out; const struct hg_info *info; - region_list_t * request_region; - region_buf_map_t * new_buf_map_ptr = NULL; - void * data_ptr; + region_list_t *request_region; + region_buf_map_t *new_buf_map_ptr = NULL; + void *data_ptr; size_t ndim; #ifdef PDC_TIMING double start, end; @@ -4161,9 +4161,9 @@ HG_TEST_RPC_CB(query_partial, handle) hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; uint32_t i; - void ** buf_ptrs; - size_t * buf_sizes; - uint32_t * n_meta_ptr, n_buf; + void **buf_ptrs; + size_t *buf_sizes; + uint32_t *n_meta_ptr, n_buf; metadata_query_transfer_in_t in; metadata_query_transfer_out_t out; @@ -4255,7 +4255,7 @@ HG_TEST_RPC_CB(query_kvtag, handle) hg_return_t ret_value; hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t * buf_ptr; + uint64_t *buf_ptr; size_t buf_size[1]; uint32_t nmeta; pdc_kvtag_t in; @@ -4314,10 +4314,10 @@ update_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, i; - uint64_t * obj_id_ptr; + uint64_t *obj_id_ptr; pdc_int_ret_t out_struct; - void ** buf; - void * buf_1d; + void **buf; + void *buf_1d; out_struct.ret = 0; @@ -4369,7 +4369,7 @@ HG_TEST_RPC_CB(bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; bulk_rpc_in_t in_struct; int cnt; @@ -4514,7 +4514,7 @@ HG_TEST_RPC_CB(data_server_read_check, handle) // Decode input data_server_read_check_in_t in; data_server_read_check_out_t out; - server_read_check_out_t * read_out = PDC_calloc(1, sizeof(server_read_check_out_t)); + server_read_check_out_t *read_out = PDC_calloc(1, sizeof(server_read_check_out_t)); ret_value = HG_Get_input(handle, &in); @@ -4613,7 +4613,7 @@ HG_TEST_RPC_CB(get_metadata_by_id, handle) hg_return_t ret_value = HG_SUCCESS; get_metadata_by_id_in_t in; get_metadata_by_id_out_t out; - pdc_metadata_t * target = NULL; + pdc_metadata_t *target = NULL; // Decode input HG_Get_input(handle, &in); @@ -4718,8 +4718,8 @@ PDC_find_in_path(char *workingDir, char *application) FUNC_ENTER(NULL); struct stat fileStat; - char * ret_value = NULL; - char * pathVar = getenv("PATH"); + char *ret_value = NULL; + char *pathVar = getenv("PATH"); char colon = ':'; char checkPath[PATH_MAX]; @@ -4773,11 +4773,11 @@ cont_add_del_objs_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, op; cont_add_del_objs_rpc_out_t out_struct; - uint64_t * obj_ids, cont_id; + uint64_t *obj_ids, cont_id; out_struct.ret = 0; @@ -4827,8 +4827,8 @@ HG_TEST_RPC_CB(cont_add_del_objs_rpc, handle) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; cont_add_del_objs_rpc_in_t in_struct; @@ -4907,13 +4907,13 @@ query_read_obj_name_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char * tmp_buf; + char *tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t * query_read_names_args; + query_read_names_args_t *query_read_names_args; out_struct.ret = 0; @@ -4968,8 +4968,8 @@ HG_TEST_RPC_CB(query_read_obj_name_rpc, handle) hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5074,13 +5074,13 @@ get_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int i, task_id, n_regions; - int * int_ptr; - char * char_ptr, *file_path; - uint64_t * uint64_ptr, offset; + int *int_ptr; + char *char_ptr, *file_path; + uint64_t *uint64_ptr, offset; - void * buf; + void *buf; region_info_transfer_t *region_info_ptr; - region_list_t * region_list, *region_list_head = NULL; + region_list_t *region_list, *region_list_head = NULL; pdc_int_ret_t out_struct; out_struct.ret = 0; @@ -5149,7 +5149,7 @@ HG_TEST_RPC_CB(get_storage_meta_name_query_bulk_result_rpc, handle) hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5201,8 +5201,8 @@ notify_client_multi_io_complete_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int n_shm; - void * buf; - char * buf_cp; + void *buf; + char *buf_cp; pdc_int_ret_t out_struct; out_struct.ret = 0; @@ -5244,7 +5244,7 @@ HG_TEST_RPC_CB(notify_client_multi_io_complete_rpc, handle) hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5284,7 +5284,7 @@ PDC_add_task_to_list(pdc_task_list_t **target_list, perr_t (*cb)(), void *cb_arg #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { FUNC_ENTER(NULL); @@ -5327,7 +5327,7 @@ PDC_del_task_from_list(pdc_task_list_t **target_list, pdc_task_list_t *del, #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { FUNC_ENTER(NULL); @@ -5502,13 +5502,13 @@ query_read_obj_name_client_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char * tmp_buf; + char *tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t * query_read_names_args; + query_read_names_args_t *query_read_names_args; out_struct.ret = 0; @@ -5563,8 +5563,8 @@ HG_TEST_RPC_CB(query_read_obj_name_client_rpc, handle) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5613,9 +5613,9 @@ send_client_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void * buf = NULL, *buf_cp = NULL; + void *buf = NULL, *buf_cp = NULL; process_bulk_storage_meta_args_t *process_args = NULL; if (hg_cb_info->ret != HG_SUCCESS) @@ -5659,7 +5659,7 @@ HG_TEST_RPC_CB(send_client_storage_meta_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5715,7 +5715,7 @@ server_recv_shm_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void * buf = NULL, *buf_cp = NULL; + void *buf = NULL, *buf_cp = NULL; if (hg_cb_info->ret != HG_SUCCESS) PGOTO_ERROR(HG_PROTOCOL_ERROR, "Error in callback"); @@ -5751,7 +5751,7 @@ HG_TEST_RPC_CB(send_shm_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5917,7 +5917,7 @@ HG_TEST_RPC_CB(send_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_arg = NULL; + struct bulk_args_t *bulk_arg = NULL; bulk_rpc_in_t in_struct; hg_return_t (*func_ptr)(const struct hg_cb_info *hg_cb_info); struct hg_cb_info callback_info; @@ -6016,10 +6016,10 @@ HG_TEST_RPC_CB(dart_perform_one_server, handle) dart_perform_one_server_out_t out; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t * n_obj_ids_ptr; + uint64_t *n_obj_ids_ptr; uint64_t n_buf; uint64_t **buf_ptrs; - size_t * buf_sizes; + size_t *buf_sizes; uint32_t i; // Extract input from handle diff --git a/src/server/pdc_server.c b/src/server/pdc_server.c index ffb967dbd..f85968068 100644 --- a/src/server/pdc_server.c +++ b/src/server/pdc_server.c @@ -83,7 +83,7 @@ sqlite3 *sqlite3_db_g; int is_debug_g = 0; int pdc_client_num_g = 0; -hg_class_t * hg_class_g = NULL; +hg_class_t *hg_class_g = NULL; hg_context_t *hg_context_g = NULL; // Below three are guarded by pdc_server_task_mutex_g for multi-thread @@ -91,10 +91,10 @@ pdc_task_list_t *pdc_server_agg_task_head_g = NULL; pdc_task_list_t *pdc_server_s2s_task_head_g = NULL; int pdc_server_task_id_g = PDC_SERVER_TASK_INIT_VALUE; -pdc_client_info_t * pdc_client_info_g = NULL; +pdc_client_info_t *pdc_client_info_g = NULL; pdc_remote_server_info_t *pdc_remote_server_info_g = NULL; -char * all_addr_strings_1d_g = NULL; -char ** all_addr_strings_g = NULL; +char *all_addr_strings_1d_g = NULL; +char **all_addr_strings_g = NULL; int is_hash_table_init_g = 0; int lustre_stripe_size_mb_g = 16; int lustre_total_ost_g = 0; @@ -147,7 +147,7 @@ int gen_fastbit_idx_g = 0; int use_fastbit_idx_g = 0; int use_rocksdb_g = 0; int use_sqlite3_g = 0; -char * gBinningOption = NULL; +char *gBinningOption = NULL; double server_write_time_g = 0.0; double server_read_time_g = 0.0; @@ -165,9 +165,9 @@ volatile int dbg_sleep_g = 1; double total_mem_usage_g = 0.0; // Data server related -pdc_data_server_io_list_t * pdc_data_server_read_list_head_g = NULL; -pdc_data_server_io_list_t * pdc_data_server_write_list_head_g = NULL; -update_storage_meta_list_t * pdc_update_storage_meta_list_head_g = NULL; +pdc_data_server_io_list_t *pdc_data_server_read_list_head_g = NULL; +pdc_data_server_io_list_t *pdc_data_server_write_list_head_g = NULL; +update_storage_meta_list_t *pdc_update_storage_meta_list_head_g = NULL; extern data_server_region_t *dataserver_region_g; /* @@ -366,7 +366,7 @@ remove_directory(const char *dir) FUNC_ENTER(NULL); int ret_value = 0; - FTS * ftsp = NULL; + FTS *ftsp = NULL; FTSENT *curr; // Cast needed (in C) because fts_open() takes a "char * const *", instead @@ -516,7 +516,7 @@ PDC_Server_lookup_server_id(int remote_server_id) lookup_args->server_id = remote_server_id; hg_ret = HG_Addr_lookup(hg_context_g, lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Connection to remote server FAILED"); @@ -620,7 +620,7 @@ PDC_Server_lookup_client(uint32_t client_id) // Lookup and fill the client info server_lookup_args_t lookup_args; - char * target_addr_string; + char *target_addr_string; lookup_args.server_id = pdc_server_rank_g; lookup_args.client_id = client_id; @@ -743,7 +743,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) int i = 0; char self_addr_string[ADDR_MAX]; char na_info_string[NA_STRING_INFO_LEN]; - char * hostname; + char *hostname; pbool_t free_hostname = false; struct hg_init_info init_info = {0}; @@ -759,7 +759,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) uint32_t credential = 0, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char * auth_key; + char *auth_key; int rc; #endif @@ -1011,7 +1011,7 @@ PDC_Server_finalize() FUNC_ENTER(NULL); pdc_data_server_io_list_t *io_elt = NULL; - region_list_t * region_elt = NULL, *region_tmp = NULL; + region_list_t *region_elt = NULL, *region_tmp = NULL; perr_t ret_value = SUCCEED; hg_return_t hg_ret; @@ -1173,21 +1173,21 @@ PDC_Server_checkpoint() FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - pdc_metadata_t * elt; - region_list_t * region_elt; - pdc_kvtag_list_t * kvlist_elt; - pdc_hash_table_entry_head * head; + pdc_metadata_t *elt; + region_list_t *region_elt; + pdc_kvtag_list_t *kvlist_elt; + pdc_hash_table_entry_head *head; pdc_cont_hash_table_entry_t *cont_head; int n_entry, metadata_size = 0, region_count = 0, n_region, n_objs, n_write_region = 0, n_kvtag, key_len; uint32_t hash_key; HashTablePair pair; char checkpoint_file[ADDR_MAX], checkpoint_file_local[ADDR_MAX], cmd[4096]; HashTableIterator hash_table_iter; - char * checkpoint; - char * env_char; + char *checkpoint; + char *env_char; uint64_t checkpoint_size; bool use_tmpfs = false; - FILE * file; + FILE *file; #ifdef PDC_TIMING // Timing @@ -1301,7 +1301,7 @@ PDC_Server_checkpoint() metadata_size++; region_count += n_region; } // End for metadata entry linked list - } // End for hash table metadata entry + } // End for hash table metadata entry // Note data server region are managed by data server instead of metadata server data_server_region_t *region = NULL; @@ -1396,14 +1396,14 @@ PDC_Server_restart(char *filename) int n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs, total_region = 0, n_kvtag, key_len; int n_cont, all_cont; - pdc_metadata_t * metadata, *elt; - region_list_t * region_list; - pdc_hash_table_entry_head * entry; + pdc_metadata_t *metadata, *elt; + region_list_t *region_list; + pdc_hash_table_entry_head *entry; pdc_cont_hash_table_entry_t *cont_entry; - uint32_t * hash_key; + uint32_t *hash_key; unsigned idx; uint64_t checkpoint_size; - char * checkpoint_buf; + char *checkpoint_buf; #ifdef PDC_TIMING double start = MPI_Wtime(); #endif @@ -1670,8 +1670,8 @@ PDC_Server_restart(char *filename) MPI_Reduce(&nobj, &all_nobj, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&total_region, &all_n_region, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); #else - all_nobj = nobj; - all_n_region = total_region; + all_nobj = nobj; + all_n_region = total_region; #endif if (pdc_server_rank_g == 0) { @@ -1699,7 +1699,7 @@ hg_progress_thread(void *arg) { FUNC_ENTER(NULL); - hg_context_t * context = (hg_context_t *)arg; + hg_context_t *context = (hg_context_t *)arg; HG_THREAD_RETURN_TYPE tret = (HG_THREAD_RETURN_TYPE)0; hg_return_t ret = HG_SUCCESS; @@ -2192,7 +2192,7 @@ server_run(int argc, char *argv[]) rocksdb_options_set_create_if_missing(options, 1); rocksdb_block_based_table_options_t *table_options = rocksdb_block_based_options_create(); - rocksdb_filterpolicy_t * filter_policy = rocksdb_filterpolicy_create_bloom(10); + rocksdb_filterpolicy_t *filter_policy = rocksdb_filterpolicy_create_bloom(10); rocksdb_block_based_options_set_filter_policy(table_options, filter_policy); rocksdb_options_set_block_based_table_factory(options, table_options); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 53fdf1e84..20bdc9677 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -62,7 +62,7 @@ #include "pdc_logger.h" // Global object region info list in local data server -data_server_region_t * dataserver_region_g = NULL; +data_server_region_t *dataserver_region_g = NULL; data_server_region_unmap_t *dataserver_region_unmap = NULL; int pdc_buffered_bulk_update_total_g = 0; @@ -79,10 +79,10 @@ uint64_t max_mem_cache_size_mb_g = 0; int cache_percentage_g = 0; int current_read_from_cache_cnt_g = 0; int total_read_from_cache_cnt_g = 0; -FILE * pdc_cache_file_ptr_g = NULL; +FILE *pdc_cache_file_ptr_g = NULL; char pdc_cache_file_path_g[ADDR_MAX]; -query_task_t * query_task_list_head_g = NULL; +query_task_t *query_task_list_head_g = NULL; cache_storage_region_t *cache_storage_region_head_g = NULL; static int @@ -253,7 +253,7 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock perr_t ret_value = SUCCEED; pdc_metadata_t *res_meta; - region_list_t * elt, *request_region; + region_list_t *elt, *request_region; // Check if the region lock info is on current server *lock_status = 0; @@ -350,7 +350,7 @@ PDC_Server_clear_obj_region() perr_t ret_value = SUCCEED; data_server_region_t *elt, *tmp; - region_list_t * elt2, *tmp2; + region_list_t *elt2, *tmp2; if (dataserver_region_g != NULL) { DL_FOREACH_SAFE(dataserver_region_g, elt, tmp) @@ -461,10 +461,10 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han perr_t ret_value = SUCCEED; int ndim; - region_list_t * request_region; + region_list_t *request_region; data_server_region_t *new_obj_reg; - region_list_t * elt1, *tmp; - region_buf_map_t * eltt; + region_list_t *elt1, *tmp; + region_buf_map_t *eltt; int error = 0; int found_lock = 0; // time_t t; @@ -561,8 +561,8 @@ PDC_Server_release_lock_request(uint64_t obj_id, struct pdc_region_info *region) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - region_list_t * request_region; - region_list_t * elt, *tmp; + region_list_t *request_region; + region_list_t *elt, *tmp; data_server_region_t *new_obj_reg; region_lock_out_t out; @@ -603,7 +603,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) perr_t ret_value = SUCCEED; int ndim; - region_list_t * tmp1, *tmp2; + region_list_t *tmp1, *tmp2; region_list_t request_region; int found = 0; data_server_region_t *obj_reg = NULL; @@ -625,7 +625,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) obj_reg = PDC_Server_get_obj_region(in->obj_id); if (obj_reg == NULL) PGOTO_ERROR(FAIL, "Requested release object does not exist"); - // Find the lock region in the list and remove it + // Find the lock region in the list and remove it #ifdef ENABLE_MULTITHREAD hg_thread_mutex_lock(&lock_list_mutex_g); #endif @@ -738,7 +738,7 @@ PDC_Data_Server_buf_unmap(const struct hg_info *info, buf_unmap_in_t *in) perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; - region_buf_map_t * tmp, *elt; + region_buf_map_t *tmp, *elt; data_server_region_t *target_obj; target_obj = PDC_Server_get_obj_region(in->remote_obj_id); @@ -830,9 +830,9 @@ PDC_Data_Server_check_unmap() perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; pdcid_t remote_obj_id; - region_buf_map_t * tmp, *elt; + region_buf_map_t *tmp, *elt; data_server_region_unmap_t *tmp1, *elt1; - data_server_region_t * target_obj; + data_server_region_t *target_obj; int completed = 0; DL_FOREACH_SAFE(dataserver_region_unmap, elt1, tmp1) @@ -928,7 +928,7 @@ buf_unmap_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_unmap_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_unmap_handle; hg_handle_t handle; - struct transfer_buf_unmap * tranx_args; + struct transfer_buf_unmap *tranx_args; int error = 0; #ifdef ENABLE_MULTITHREAD @@ -989,7 +989,7 @@ PDC_Server_buf_unmap_lookup_server_id(int remote_server_id, struct transfer_buf_ lookup_args->server_id = remote_server_id; lookup_args->buf_unmap_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_unmap_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR(FAIL, "Connection to remote server failed"); @@ -1046,9 +1046,9 @@ PDC_Meta_Server_buf_unmap(buf_unmap_in_t *in, hg_handle_t *handle) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_unmap_handle; struct transfer_buf_unmap_args *buf_unmap_args; - struct transfer_buf_unmap * addr_args; - pdc_metadata_t * target_meta = NULL; - region_buf_map_t * tmp, *elt; + struct transfer_buf_unmap *addr_args; + pdc_metadata_t *target_meta = NULL; + region_buf_map_t *tmp, *elt; int error = 0; if ((uint32_t)pdc_server_rank_g == in->meta_server_id) { @@ -1123,14 +1123,14 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis { FUNC_ENTER(NULL); - region_buf_map_t * ret_value = NULL; + region_buf_map_t *ret_value = NULL; data_server_region_t *new_obj_reg = NULL; - region_list_t * elt_reg; - region_buf_map_t * buf_map_ptr = NULL; - region_buf_map_t * tmp; + region_list_t *elt_reg; + region_buf_map_t *buf_map_ptr = NULL; + region_buf_map_t *tmp; int dup = 0; - char * data_path = NULL; - char * user_specified_data_path = NULL; + char *data_path = NULL; + char *user_specified_data_path = NULL; char storage_location[ADDR_MAX]; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; @@ -1244,9 +1244,9 @@ PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t { FUNC_ENTER(NULL); - void * ret_value = NULL; + void *ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t * tmp; + region_buf_map_t *tmp; if (dataserver_region_g == NULL) PGOTO_ERROR(NULL, "Object list is NULL"); @@ -1298,9 +1298,9 @@ PDC_Server_get_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region) { FUNC_ENTER(NULL); - void * ret_value = NULL; + void *ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t * tmp; + region_buf_map_t *tmp; if (dataserver_region_g == NULL) PGOTO_ERROR(NULL, "Object list is NULL"); @@ -1363,7 +1363,7 @@ buf_map_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_map_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_map_handle; hg_handle_t handle; - struct transfer_buf_map * tranx_args; + struct transfer_buf_map *tranx_args; int error = 0; #ifdef ENABLE_MULTITHREAD @@ -1425,7 +1425,7 @@ PDC_Server_buf_map_lookup_server_id(int remote_server_id, struct transfer_buf_ma lookup_args->server_id = remote_server_id; lookup_args->buf_map_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_map_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR(FAIL, "Connection to remote server FAILED"); @@ -1479,9 +1479,9 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_map_handle; struct transfer_buf_map_args *tranx_args = NULL; - struct transfer_buf_map * addr_args; - pdc_metadata_t * target_meta = NULL; - region_buf_map_t * buf_map_ptr; + struct transfer_buf_map *addr_args; + pdc_metadata_t *target_meta = NULL; + region_buf_map_t *buf_map_ptr; int error = 0; // dataserver and metadata server is on the same node @@ -1721,11 +1721,11 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; - void ** buf_ptrs; - hg_size_t * buf_sizes; + void **buf_ptrs; + hg_size_t *buf_sizes; bulk_rpc_in_t bulk_rpc_in; int i; - region_list_t * region_elt; + region_list_t *region_elt; notify_multi_io_args_t *bulk_args; if (client_id >= (uint32_t)pdc_client_num_g) @@ -1910,7 +1910,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t * region_elt = NULL; + region_list_t *region_elt = NULL; region_list_t r_target; /* uint32_t i; */ @@ -1991,7 +1991,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check perr_t ret_value = FAIL; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t * region_elt = NULL, *region_tmp = NULL; + region_list_t *region_elt = NULL, *region_tmp = NULL; int found_region = 0; pdc_metadata_t meta; @@ -2088,7 +2088,7 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * perr_t ret_value = SUCCEED; pdc_metadata_t *target_meta = NULL; - region_list_t * region_elt = NULL; + region_list_t *region_elt = NULL; // Find object metadata *n_loc = 0; @@ -2237,17 +2237,17 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) perr_t ret_value = SUCCEED; uint32_t server_id = 0; uint32_t i, j; - pdc_metadata_t * region_meta = NULL, *region_meta_prev = NULL; - region_list_t * region_elt, req_region, **overlap_regions_2d = NULL; + pdc_metadata_t *region_meta = NULL, *region_meta_prev = NULL; + region_list_t *region_elt, req_region, **overlap_regions_2d = NULL; region_info_transfer_t local_region_transfer[PDC_SERVER_MAX_PROC_PER_NODE]; - region_info_transfer_t * all_requests = NULL; + region_info_transfer_t *all_requests = NULL; update_region_storage_meta_bulk_t *send_buf = NULL; update_region_storage_meta_bulk_t *result_storage_meta = NULL; uint32_t total_request_cnt; int data_size = sizeof(region_info_transfer_t); - int * send_bytes = NULL; - int * displs = NULL; - int * request_overlap_cnt = NULL; + int *send_bytes = NULL; + int *displs = NULL; + int *request_overlap_cnt = NULL; int nrequest_per_server = 0; if (regions_head == NULL) @@ -2540,7 +2540,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_list_elt, *io_list = NULL, *io_list_target = NULL; - region_list_t * region_elt = NULL, *region_tmp; + region_list_t *region_elt = NULL, *region_tmp; int real_bb_cnt = 0, real_lustre_cnt = 0; int write_to_bb_cnt = 0; int count; @@ -2906,7 +2906,7 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) hg_return_t hg_ret; perr_t ret_value = SUCCEED; uint32_t server_id = 0; - pdc_metadata_t * region_meta = NULL; + pdc_metadata_t *region_meta = NULL; hg_handle_t update_region_loc_handle; update_region_loc_in_t in; server_lookup_args_t lookup_args; @@ -2982,7 +2982,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ int i; uint64_t obj_id = 0; update_region_storage_meta_bulk_t *curr_buf_ptr; - uint64_t * obj_id_ptr; + uint64_t *obj_id_ptr; // Sanity check if (NULL == region || region->storage_location[0] == 0 || NULL == region->meta) { @@ -3057,8 +3057,8 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk perr_t ret_value = SUCCEED; int i; - pdc_metadata_t * target_meta = NULL; - region_list_t * region_elt = NULL, *new_region = NULL; + pdc_metadata_t *target_meta = NULL; + region_list_t *region_elt = NULL, *new_region = NULL; update_region_storage_meta_bulk_t *bulk_ptr; int update_success = 0, express_insert = 0; uint64_t obj_id; @@ -3167,7 +3167,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) int i; uint32_t server_id = 0; update_region_storage_meta_bulk_t *recv_buf = NULL; - void ** all_meta = NULL; + void **all_meta = NULL; #endif #ifdef ENABLE_MPI @@ -3215,9 +3215,9 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) } perr_t -PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * bulk_data, perr_t (*cb)(), +PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t *bulk_data, perr_t (*cb)(), update_storage_meta_list_t *meta_list_target, - int * n_updated) + int *n_updated) { FUNC_ENTER(NULL); @@ -3428,7 +3428,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re PGOTO_ERROR(FAIL, "fread failed"); *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { uint64_t buf_serialize_offset; /* fseek (fp, storage_offset, SEEK_SET); */ @@ -3509,8 +3509,8 @@ PDC_Server_read_one_region(region_list_t *read_region) size_t total_read_bytes = 0; uint32_t n_storage_regions = 0; region_list_t *region_elt; - FILE * fp_read = NULL; - char * prev_path = NULL; + FILE *fp_read = NULL; + char *prev_path = NULL; int is_shm_created = 0, is_read_succeed = 0; #ifdef ENABLE_TIMING double fopen_time; @@ -3628,8 +3628,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) uint64_t offset = 0; uint32_t i = 0; region_list_t *region_elt = NULL, *previous_region = NULL; - FILE * fp_read = NULL, *fp_write = NULL; - char * prev_path = NULL; + FILE *fp_read = NULL, *fp_write = NULL; + char *prev_path = NULL; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; #endif @@ -4054,11 +4054,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; data_server_region_t *region = NULL; - region_list_t * overlap_region = NULL; + region_list_t *overlap_region = NULL; int is_contained = 0; uint64_t i, j, pos; - uint64_t * overlap_offset, *overlap_size; - char * tmp_buf; + uint64_t *overlap_offset, *overlap_size; + char *tmp_buf; #if 0 size_t total_write_size = 0, local_write_size; int is_overlap; @@ -4317,11 +4317,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, if (is_contained == 0) { request_region->offset = lseek(region->fd, 0, SEEK_END); #ifdef ENABLE_ZFP - zfp_field * field; + zfp_field *field; zfp_stream *zfp; size_t bufsize; - void * buffer; - bitstream * stream; + void *buffer; + bitstream *stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4391,10 +4391,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; ssize_t request_bytes = unit; data_server_region_t *region = NULL; - region_list_t * elt; + region_list_t *elt; uint64_t i, j, pos; - uint64_t * overlap_offset, *overlap_size; - char * tmp_buf; + uint64_t *overlap_offset, *overlap_size; + char *tmp_buf; #ifdef PDC_TIMING double start = MPI_Wtime(), start_posix; @@ -4480,10 +4480,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_ZFP // Uncompress the data - zfp_field * field; + zfp_field *field; zfp_stream *zfp; size_t bufsize, decompress_size; - bitstream * stream; + bitstream *stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4727,7 +4727,7 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args perr_t ret_value = SUCCEED; pdc_metadata_t *meta = NULL; - region_list_t * region_elt = NULL, *region_head = NULL, *res_region_list = NULL; + region_list_t *region_elt = NULL, *region_head = NULL, *res_region_list = NULL; int region_count = 0, i = 0; // FIXME: currently use timestep value of 0 @@ -4842,7 +4842,7 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t perr_t ret_value = SUCCEED; accumulate_storage_meta_t *accu_meta; - region_list_t * req_region = NULL, *region_elt = NULL, *read_list_head = NULL; + region_list_t *req_region = NULL, *region_elt = NULL, *read_list_head = NULL; int i, is_sort_read; size_t j; @@ -5006,16 +5006,16 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac hg_return_t hg_ret = HG_SUCCESS; perr_t ret_value; - storage_meta_name_query_in_t * args; + storage_meta_name_query_in_t *args; storage_meta_query_one_name_args_t *query_args; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; bulk_rpc_in_t bulk_rpc_in; - void ** buf_ptrs; - hg_size_t * buf_sizes; + void **buf_ptrs; + hg_size_t *buf_sizes; uint32_t server_id; - region_info_transfer_t ** region_infos; - region_list_t * region_elt; + region_info_transfer_t **region_infos; + region_list_t *region_elt; int i, j; args = (storage_meta_name_query_in_t *)callback_info->arg; @@ -5135,9 +5135,9 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) perr_t ret_value = SUCCEED; int i, j; - region_storage_meta_t * storage_metas = (region_storage_meta_t *)buf_cp; + region_storage_meta_t *storage_metas = (region_storage_meta_t *)buf_cp; pdc_data_server_io_list_t *io_list_elt, *io_list_target; - region_list_t * new_region; + region_list_t *new_region; #ifdef ENABLE_MULTITHREAD hg_thread_mutex_lock(&data_read_list_mutex_g); @@ -5248,7 +5248,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) perr_t ret_value = SUCCEED; uint64_t offset, read_bytes; - FILE * fp_read = NULL; + FILE *fp_read = NULL; if (region->is_data_ready == 1) FUNC_LEAVE(SUCCEED); @@ -5291,9 +5291,9 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) perr_t ret_value = SUCCEED; region_list_t *region_elt; - char * prev_path = NULL; + char *prev_path = NULL; uint64_t offset, read_bytes; - FILE * fp_read = NULL; + FILE *fp_read = NULL; int read_count = 0; @@ -5434,8 +5434,8 @@ PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_com FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - region_list_t * req_region = NULL, *region_tmp = NULL; - region_list_t * storage_region_list_head = NULL; + region_list_t *req_region = NULL, *region_tmp = NULL; + region_list_t *storage_region_list_head = NULL; pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; uint64_t obj_id; int iter, count, is_same_region, i, can_skip; @@ -5705,7 +5705,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE * edata = (TYPE *)(_data); \ + TYPE *edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -5841,7 +5841,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE * edata = (TYPE *)(_data); \ + TYPE *edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -5998,11 +5998,11 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast char keyName[128]; char offName[128]; char out_name[256]; - double * keys = NULL; - int64_t * offsets = NULL; + double *keys = NULL; + int64_t *offsets = NULL; uint32_t *bms = NULL; uint64_t nk = 0, no = 0, nb = 0; - FILE * fp; + FILE *fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6088,7 +6088,7 @@ queryData(const char *name) FUNC_ENTER(NULL); uint64_t nhits, i; - uint64_t * buf; + uint64_t *buf; double val1 = 0.0, val2 = 10.0; FastBitSelectionHandle sel1 = fastbit_selection_osr(name, FastBitCompareGreater, val1); FastBitSelectionHandle sel2 = fastbit_selection_osr(name, FastBitCompareLess, val2); @@ -6126,7 +6126,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i char offName[128]; char out_name[256]; uint64_t nk = 0, no = 0, nb = 0, size; - FILE * fp; + FILE *fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6203,9 +6203,9 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, perr_t ret_value = SUCCEED; FastBitDataType ft = 0; uint64_t type_size; - uint32_t * bms = NULL; - double * keys = NULL; - int64_t * offsets = NULL; + uint32_t *bms = NULL; + double *keys = NULL; + int64_t *offsets = NULL; int timestep; double v1, v2; size_t i; @@ -6372,7 +6372,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - region_list_t * region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; + region_list_t *region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; pdc_selection_t *sel = query->sel; uint64_t nelem; size_t i, j, unit_size; @@ -6386,7 +6386,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ uint32_t ulo = 0, uhi = 0; int64_t i64lo = 0, i64hi = 0; uint64_t ui64lo = 0, ui64hi = 0; - void * value = NULL, *buf = NULL; + void *value = NULL, *buf = NULL; int n_eval_region = 0, can_skip, region_iter = 0; LOG_INFO("Start query evaluation\n"); @@ -6712,7 +6712,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ n_eval_region++; } // End DL_FOREACH - } // End not use fastbit + } // End not use fastbit if (n_eval_region == 0 && combine_op == PDC_QUERY_AND) { if (sel->nhits > 0) { @@ -7026,7 +7026,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) hg_bulk_t bulk_handle; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; int client_id; client_id = task->client_id; @@ -7091,7 +7091,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; int server_id; server_id = task->manager; @@ -7268,9 +7268,9 @@ PDC_Server_read_coords(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - query_task_t * task = (query_task_t *)callback_info->arg; + query_task_t *task = (query_task_t *)callback_info->arg; pdc_query_constraint_t *constraint; - region_list_t * storage_region_head, *region_elt, *cache_region; + region_list_t *storage_region_head, *region_elt, *cache_region; size_t ndim, unit_size; uint64_t i, *coord, data_off, buf_off, my_size; @@ -7331,11 +7331,11 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t * task_elt = NULL; + query_task_t *task_elt = NULL; uint64_t nhits, obj_id; uint32_t ndim; int query_id, origin; - void * buf; + void *buf; pdc_int_ret_t out; out.ret = 1; @@ -7407,7 +7407,7 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t * task_elt; + query_task_t *task_elt; uint64_t nhits = 0, total_hits; size_t ndim, unit_size; int i, query_id, origin, found_task; @@ -7613,7 +7613,7 @@ add_storage_region_to_buf(void **in_buf, uint64_t *buf_alloc, uint64_t *buf_off, FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - void * buf = *in_buf; + void *buf = *in_buf; uint64_t my_size, tmp_size; if (in_buf == NULL || *in_buf == NULL || region == NULL || buf_alloc == NULL || buf_off == NULL || @@ -7793,8 +7793,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in pdc_metadata_t *meta = NULL; int i, server_id, count, avg_count, nsent, nsent_server; - region_list_t * elt, *new_region = NULL; - void * region_bulk_buf; + region_list_t *elt, *new_region = NULL; + void *region_bulk_buf; uint64_t buf_alloc = 0, buf_off = 0; bulk_rpc_in_t header; @@ -7932,16 +7932,16 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; - void * buf; - region_list_t * regions = NULL; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; + void *buf; + region_list_t *regions = NULL; int i, nregion, *loc_len_ptr, *has_hist_ptr, found_task; uint64_t buf_off, *offset_ptr = NULL, *size_ptr = NULL; - char * loc_ptr = NULL; + char *loc_ptr = NULL; region_info_transfer_t *region_info_ptr = NULL; - pdc_histogram_t * hist_ptr = NULL; - query_task_t * task_elt = NULL; - pdc_query_t * query = NULL; + pdc_histogram_t *hist_ptr = NULL; + query_task_t *task_elt = NULL; + pdc_query_t *query = NULL; pdc_int_ret_t out; out.ret = 1; @@ -8094,10 +8094,10 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; pdc_query_xfer_t *query_xfer = (pdc_query_xfer_t *)callback_info->arg; int obj_idx = 0; - uint64_t * obj_ids; - query_task_t * new_task = NULL, *task_elt; + uint64_t *obj_ids; + query_task_t *new_task = NULL, *task_elt; int query_id_exist = 0; - pdc_query_t * query; + pdc_query_t *query; query = PDC_deserialize_query(query_xfer); if (NULL == query) @@ -8197,7 +8197,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; if (server_id >= pdc_server_size_g) PGOTO_ERROR(FAIL, "server_id %d invalid", server_id); @@ -8285,12 +8285,12 @@ PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - get_sel_data_rpc_in_t * in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t * task_elt, *task = NULL; + get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; + query_task_t *task_elt, *task = NULL; uint64_t nhits, *coord, *coords = NULL, obj_id, buf_off, my_size, data_off, i; size_t ndim, unit_size; cache_storage_region_t *cache_region_elt; - region_list_t * storage_region_head = NULL, *cache_region, *region_elt; + region_list_t *storage_region_head = NULL, *cache_region, *region_elt; pdc_var_type_t data_type; // find task @@ -8373,8 +8373,8 @@ PDC_Server_recv_get_sel_data(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t * task_elt, *task = NULL; - pdc_metadata_t * meta; + query_task_t *task_elt, *task = NULL; + pdc_metadata_t *meta; struct hg_cb_info fake_callback_info = {0}; DL_FOREACH(query_task_list_head_g, task_elt) diff --git a/src/tests/misc/client_server.c b/src/tests/misc/client_server.c index a4efe8ac1..309fbc61e 100644 --- a/src/tests/misc/client_server.c +++ b/src/tests/misc/client_server.c @@ -183,7 +183,7 @@ main(int argc, char **argv) size = 1; #endif - hg_class_t * hg_class = NULL; + hg_class_t *hg_class = NULL; hg_context_t *hg_context = NULL; hg_return_t hg_ret = 0; From d24d9a0a8156e3d1cb133faa068b9d4423fccf5e Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 4 Jul 2025 14:33:14 +0000 Subject: [PATCH 2/8] Committing clang-format changes --- src/api/include/pdc_client_connect.h | 22 +- src/api/pdc_client_connect.c | 214 +++++++-------- src/api/pdc_obj/pdc_cont.c | 16 +- src/api/pdc_obj/pdc_obj.c | 44 ++-- src/api/pdc_obj/pdc_prop.c | 16 +- src/api/pdc_region/pdc_region_transfer.c | 64 ++--- src/server/pdc_client_server_common.c | 210 +++++++-------- src/server/pdc_server.c | 62 ++--- .../pdc_server_region/pdc_server_data.c | 248 +++++++++--------- src/tests/misc/client_server.c | 2 +- 10 files changed, 449 insertions(+), 449 deletions(-) diff --git a/src/api/include/pdc_client_connect.h b/src/api/include/pdc_client_connect.h index e351fb661..e8999ab2f 100644 --- a/src/api/include/pdc_client_connect.h +++ b/src/api/include/pdc_client_connect.h @@ -60,23 +60,23 @@ struct _pdc_client_lookup_args { uint32_t client_id; int ret; int is_init; - char *ret_string; - char *client_addr; + char * ret_string; + char * client_addr; uint32_t user_id; - const char *app_name; + const char * app_name; int time_step; uint32_t hash_value; - const char *tags; + const char * tags; hg_request_t *request; }; struct _pdc_client_transform_args { size_t size; - void *data; - void *transform_result; + void * data; + void * transform_result; struct _pdc_region_transform_ftn_info *this_transform; - struct pdc_region_info *region_info; + struct pdc_region_info * region_info; int type_extent; int transform_state; int ret; @@ -148,8 +148,8 @@ struct _pdc_query_result_list { int query_id; uint64_t nhits; uint64_t *coords; - void *data; - void **data_arr; + void * data; + void ** data_arr; uint64_t *data_arr_size; uint64_t recv_data_nhits; @@ -187,8 +187,8 @@ struct client_genetic_lookup_args { struct _dart_perform_one_thread_param { int server_id; dart_perform_one_server_in_t *dart_in; - uint64_t **dart_out; - size_t *dart_out_size; + uint64_t ** dart_out; + size_t * dart_out_size; }; #define PDC_CLIENT_DATA_SERVER() ((pdc_client_mpi_rank_g / pdc_nclient_per_server_g) % pdc_server_num_g) diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index 053d3a478..049114d35 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -94,7 +94,7 @@ int pdc_nclient_per_server_g = 0; char pdc_client_tmp_dir_g[ADDR_MAX]; struct _pdc_server_info *pdc_server_info_g = NULL; -static int *debug_server_id_count = NULL; +static int * debug_server_id_count = NULL; int pdc_io_request_seq_id = PDC_SEQ_ID_INIT_VALUE; struct pdc_request *pdc_io_request_list_g = NULL; @@ -110,7 +110,7 @@ int nread_bb_g = 0; double read_bb_size_g = 0.0; static int mercury_has_init_g = 0; -static hg_class_t *send_class_g = NULL; +static hg_class_t * send_class_g = NULL; static hg_context_t *send_context_g = NULL; int query_id_g = 0; @@ -125,7 +125,7 @@ static hg_atomic_int32_t response_done_g; hg_atomic_int32_t bulk_transfer_done_g; // global variables for DART -static DART *dart_g; +static DART * dart_g; static dart_hash_algo_t dart_hash_algo_g = DART_HASH; static dart_object_ref_type_t dart_obj_ref_type_g = REF_PRIMARY_ID; @@ -373,8 +373,8 @@ PDC_Client_read_server_addr_from_file() perr_t ret_value = SUCCEED; int max_tries = 9, sleeptime = 1; int i = 0, is_server_ready = 0; - char *p; - FILE *na_config = NULL; + char * p; + FILE * na_config = NULL; char config_fname[PATH_MAX]; char n_server_string[PATH_MAX]; @@ -455,7 +455,7 @@ client_send_flush_obj_all_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_all_out_t output; - int *rpc_return; + int * rpc_return; handle = callback_info->info.forward.handle; rpc_return = (int *)callback_info->arg; @@ -506,7 +506,7 @@ client_send_flush_obj_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_out_t output; - int *rpc_return; + int * rpc_return; handle = callback_info->info.forward.handle; rpc_return = (int *)callback_info->arg; @@ -532,7 +532,7 @@ client_send_close_all_server_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; close_server_out_t output; - int *rpc_return; + int * rpc_return; handle = callback_info->info.forward.handle; rpc_return = (int *)callback_info->arg; @@ -876,7 +876,7 @@ PDC_Client_lookup_server(int server_id, int is_init) hg_return_t hg_ret; struct _pdc_client_lookup_args lookup_args; char self_addr[ADDR_MAX]; - char *target_addr_string; + char * target_addr_string; if (server_id < 0 || server_id >= pdc_server_num_g) PGOTO_ERROR(FAIL, "Error with server id input %d", server_id); @@ -1097,14 +1097,14 @@ hg_test_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args; hg_bulk_t local_bulk_handle; uint32_t i; - void *buf = NULL; - void **ids_buf; + void * buf = NULL; + void ** ids_buf; uint32_t n_meta; uint64_t buf_sizes[2] = {0, 0}; - uint64_t *ids_buf_sizes; + uint64_t * ids_buf_sizes; uint32_t actual_cnt; - pdc_metadata_t *meta_ptr; - uint64_t *u64_arr_ptr; + pdc_metadata_t * meta_ptr; + uint64_t * u64_arr_ptr; uint32_t bulk_sgnum; bulk_args = (struct bulk_args_t *)hg_cb_info->arg; @@ -1204,7 +1204,7 @@ drc_strerror(int errnum) { FUNC_ENTER(NULL); - char *ret_value = NULL; + char * ret_value = NULL; const char *errstring = "UNDEFINED"; DRC_ERROR_STRING_MACRO(DRC_SUCCESS, errnum, errstring); @@ -1233,7 +1233,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; + char * hostname; pbool_t free_hostname = false; int local_server_id; @@ -1244,13 +1244,13 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po * "cci+tcp" */ struct hg_init_info init_info = {0}; - char *default_hg_transport = "ofi+tcp"; - char *hg_transport; + char * default_hg_transport = "ofi+tcp"; + char * hg_transport; #ifdef PDC_HAS_CRAY_DRC uint32_t credential, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char *auth_key; + char * auth_key; int rc; #endif @@ -1449,7 +1449,7 @@ PDC_Client_init() perr_t ret_value = SUCCEED; pdc_server_info_g = NULL; - char *tmp_dir; + char * tmp_dir; uint32_t port; int is_mpi_init = 0; @@ -1643,16 +1643,16 @@ metadata_query_bulk_cb(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value; - struct bulk_args_t *client_lookup_args; + struct bulk_args_t * client_lookup_args; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args; - void *recv_meta; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args; + void * recv_meta; client_lookup_args = (struct bulk_args_t *)callback_info->arg; handle = callback_info->info.forward.handle; @@ -2050,7 +2050,7 @@ PDC_Client_add_tag(pdcid_t obj_id, const char *tag) hg_handle_t metadata_add_tag_handle; uint64_t meta_id; uint32_t server_id; - struct _pdc_obj_info *obj_prop; + struct _pdc_obj_info * obj_prop; struct _pdc_client_lookup_args lookup_args; metadata_add_tag_in_t in; @@ -2266,7 +2266,7 @@ PDC_Client_delete_metadata(char *delete_name, pdcid_t obj_delete_prop) perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - struct _pdc_obj_prop *delete_prop; + struct _pdc_obj_prop * delete_prop; metadata_delete_in_t in; int hash_name_value; uint32_t server_id; @@ -2325,7 +2325,7 @@ PDC_Client_query_metadata_name_only(const char *obj_name, pdc_metadata_t **out) struct _pdc_metadata_query_args **lookup_args; uint32_t server_id; uint32_t i, count = 0; - hg_handle_t *metadata_query_handle; + hg_handle_t * metadata_query_handle; metadata_query_handle = (hg_handle_t *)PDC_malloc(sizeof(hg_handle_t) * pdc_server_num_g); @@ -2622,7 +2622,7 @@ PDC_Client_send_name_recv_id(const char *obj_name, uint64_t cont_id, pdcid_t obj perr_t ret_value = SUCCEED; hg_return_t hg_ret; uint32_t server_id = 0; - struct _pdc_obj_prop *create_prop = NULL; + struct _pdc_obj_prop * create_prop = NULL; gen_obj_id_in_t in; uint32_t hash_name_value; struct _pdc_client_lookup_args lookup_args; @@ -2775,7 +2775,7 @@ PDC_Client_close_all_server() if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } // End pdc_client_mpi_rank_g < pdc_server_num_g - } // End pdc_client_mpi_size_g >= pdc_server_num_g + } // End pdc_client_mpi_size_g >= pdc_server_num_g else { if (pdc_client_mpi_rank_g == 0) { for (i = 0; i < (uint32_t)pdc_server_num_g; i++) { @@ -2803,7 +2803,7 @@ PDC_Client_close_all_server() PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } } // End of mpi_rank == 0 - } // End pdc_client_mpi_size_g < pdc_server_num_g + } // End pdc_client_mpi_size_g < pdc_server_num_g #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -2986,7 +2986,7 @@ PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_all_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; int i; hg_handle_t client_send_transfer_request_all_handle; struct _pdc_transfer_request_all_args transfer_args; @@ -3015,7 +3015,7 @@ PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t // Create bulk handles hg_ret = HG_Bulk_create(hg_class, 1, (void **)&bulk_buf, &bulk_size, HG_BULK_READWRITE, - &(in.local_bulk_handle)); + &(in.local_bulk_handle)); *bulk_handle = in.local_bulk_handle; if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create local bulk data handle"); @@ -3084,7 +3084,7 @@ PDC_Client_transfer_request_metadata_query2(hg_bulk_t *bulk_handle, char *buf, u perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query2_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_handle_t client_send_transfer_request_metadata_query2_handle; struct _pdc_transfer_request_metadata_query2_args transfer_args; @@ -3147,7 +3147,7 @@ PDC_Client_transfer_request_metadata_query(hg_bulk_t *bulk_handle, char *buf, ui perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_handle_t client_send_transfer_request_metadata_query_handle; struct _pdc_transfer_request_metadata_query_args transfer_args; @@ -3213,7 +3213,7 @@ PDC_Client_transfer_request_wait_all(hg_bulk_t *bulk_handle, int n_objs, pdcid_t perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_wait_all_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_handle_t client_send_transfer_request_wait_all_handle; struct _pdc_transfer_request_wait_all_args transfer_args; char cur_time[64]; @@ -3283,7 +3283,7 @@ PDC_Client_transfer_request(hg_bulk_t *bulk_handle, void *buf, pdcid_t obj_id, u perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; uint32_t meta_server_id; hg_size_t total_data_size; int i; @@ -3510,12 +3510,12 @@ PDC_Client_buf_map(pdcid_t local_region_id, pdcid_t remote_obj_id, size_t ndim, hg_return_t hg_ret = HG_SUCCESS; buf_map_in_t in; uint32_t data_server_id, meta_server_id; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_uint32_t i, j; hg_uint32_t local_count; - void **data_ptrs = NULL; - size_t *data_size = NULL; + void ** data_ptrs = NULL; + size_t * data_size = NULL; size_t unit, unit_to; struct _pdc_buf_map_args map_args; hg_handle_t client_send_buf_map_handle; @@ -3897,11 +3897,11 @@ PDC_Client_get_data_from_server_shm_cb(const struct hg_cb_info *callback_info) int shm_fd = -1; // file descriptor, from shm_open() uint32_t i = 0; - char *shm_base = NULL; // base address, from mmap() - char *shm_addr = NULL; + char * shm_base = NULL; // base address, from mmap() + char * shm_addr = NULL; uint64_t data_size = 1; - client_read_info_t *read_info = NULL; - struct pdc_request *elt = NULL; + client_read_info_t * read_info = NULL; + struct pdc_request * elt = NULL; struct pdc_region_info *target_region = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; @@ -3989,8 +3989,8 @@ PDC_Client_data_server_read_check(int server_id, uint32_t client_id, pdc_metadat uint64_t read_size = 1; hg_handle_t data_server_read_check_handle; int shm_fd; // file descriptor, from shm_open() - char *shm_base; // base address, from mmap() - char *shm_addr; + char * shm_base; // base address, from mmap() + char * shm_addr; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; struct timeval pdc_timer_end; @@ -4114,8 +4114,8 @@ PDC_Client_data_server_read(struct pdc_request *request) data_server_read_in_t in; hg_handle_t data_server_read_handle; int server_id, n_client, n_update; - pdc_metadata_t *meta; - struct pdc_region_info *region; + pdc_metadata_t * meta; + struct pdc_region_info * region; server_id = request->server_id; n_client = request->n_client; @@ -4236,8 +4236,8 @@ PDC_Client_data_server_write_check(struct pdc_request *request, int *status) data_server_write_check_in_t in; hg_handle_t data_server_write_check_handle; int server_id; - pdc_metadata_t *meta; - struct pdc_region_info *region; + pdc_metadata_t * meta; + struct pdc_region_info * region; uint64_t write_size = 1; uint32_t i; @@ -4334,9 +4334,9 @@ PDC_Client_data_server_write(struct pdc_request *request) int server_ret; hg_handle_t data_server_write_handle; int server_id, n_client, n_update; - pdc_metadata_t *meta; - struct pdc_region_info *region; - void *buf; + pdc_metadata_t * meta; + struct pdc_region_info * region; + void * buf; int rnd; #ifdef ENABLE_TIMING @@ -4389,7 +4389,7 @@ PDC_Client_data_server_write(struct pdc_request *request) request->shm_base = mmap(0, region_size, PROT_READ | PROT_WRITE, MAP_SHARED, request->shm_fd, 0); if (request->shm_base == MAP_FAILED) PGOTO_ERROR(FAIL, "Shared memory mmap failed, region size = %" PRIu64 "", region_size); - // close and shm_unlink? + // close and shm_unlink? #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_start, 0); @@ -4599,7 +4599,7 @@ PDC_Client_write_id(pdcid_t local_obj_id, struct pdc_region_info *region, void * struct _pdc_id_info *info; struct _pdc_obj_info *object; - pdc_metadata_t *meta; + pdc_metadata_t * meta; perr_t ret_value = SUCCEED; info = PDC_find_id(local_obj_id); @@ -4819,7 +4819,7 @@ PDC_Client_add_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo perr_t ret_value = SUCCEED; int i; - uint64_t *obj_ids; + uint64_t * obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -4845,7 +4845,7 @@ PDC_Client_del_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo perr_t ret_value = SUCCEED; int i; - uint64_t *obj_ids; + uint64_t * obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -4873,7 +4873,7 @@ PDC_Client_add_tags_to_container(pdcid_t cont_id, char *tags) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; uint32_t server_id; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_cont_info *object; uint64_t cont_meta_id; cont_add_tags_rpc_in_t add_tag_rpc_in; @@ -5114,12 +5114,12 @@ PDC_Client_query_name_read_entire_obj(int nobj, char **obj_names, void ***out_bu hg_handle_t rpc_handle; hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t *buf_sizes, total_size; + uint64_t * buf_sizes, total_size; int i; query_read_obj_name_in_t bulk_rpc_in; // Reuse the existing args structure update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request *request; + struct pdc_request * request; if (nobj == 0 || obj_names == NULL || out_buf == NULL || out_buf_sizes == NULL) @@ -5402,7 +5402,7 @@ PDC_get_storage_meta_from_io_list(pdc_data_server_io_list_t **list, region_stora FUNC_ENTER(NULL); pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t *ret_value = NULL; + region_list_t * ret_value = NULL; FUNC_ENTER(NULL); @@ -5429,7 +5429,7 @@ PDC_add_storage_meta_to_io_list(pdc_data_server_io_list_t **list, region_storage FUNC_ENTER(NULL); pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t *new_region; + region_list_t * new_region; int j; perr_t ret_value = SUCCEED; @@ -5494,7 +5494,7 @@ PDC_send_region_storage_meta_shm(uint32_t server_id, int n, region_storage_meta_ buf_sizes = n * sizeof(region_storage_meta_t); hg_ret = HG_Bulk_create(send_class_g, 1, (void **)&storage_meta, (const hg_size_t *)&buf_sizes, - HG_BULK_READ_ONLY, &bulk_handle); + HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create bulk data handle"); @@ -5527,7 +5527,7 @@ PDC_Client_cp_data_to_local_server(int nobj, region_storage_meta_t **all_storage perr_t ret_value = SUCCEED; uint32_t ndim, server_id; uint64_t total_size = 0, cp_loc = 0; - void *buf = NULL; + void * buf = NULL; char shm_addr[ADDR_MAX]; int i, *total_obj = NULL, ntotal_obj = nobj, *recvcounts = NULL, *displs = NULL; region_storage_meta_t *all_region_storage_meta_1d = NULL, *my_region_storage_meta_1d = NULL; @@ -5636,8 +5636,8 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_ perr_t ret_value = SUCCEED; int i; - char *fname, *prev_fname; - FILE *fp_read = NULL; + char * fname, *prev_fname; + FILE * fp_read = NULL; uint32_t ndim; uint64_t req_start, req_count, storage_start, storage_count, file_offset, buf_size; size_t read_bytes; @@ -5735,15 +5735,15 @@ PDC_Client_query_multi_storage_info(int nobj, char **obj_names, region_storage_m hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t *buf_sizes = NULL, total_size; + uint64_t * buf_sizes = NULL, total_size; int i, j, loc, iter, *n_obj_name_by_server = NULL; - int **obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; + int ** obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; int send_n_request = 0; - char ***obj_names_by_server = NULL; - char **obj_names_by_server_2d = NULL; + char *** obj_names_by_server = NULL; + char ** obj_names_by_server_2d = NULL; query_read_obj_name_in_t bulk_rpc_in; update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request **requests, *request; + struct pdc_request ** requests, *request; if (nobj == 0) PGOTO_DONE(SUCCEED); @@ -5962,12 +5962,12 @@ PDC_Client_query_name_read_entire_obj_client_agg(int my_nobj, char **my_obj_name FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - char **all_names = my_obj_names; - char *local_names_1d, *all_names_1d = NULL; - int *total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; + char ** all_names = my_obj_names; + char * local_names_1d, *all_names_1d = NULL; + int * total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; size_t max_name_len = 64; region_storage_meta_t **all_storage_meta = NULL, **my_storage_meta = NULL; - region_storage_meta_t *my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; + region_storage_meta_t * my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer1; @@ -6251,7 +6251,7 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { if (is_client_debug_g == 1) { @@ -6322,8 +6322,8 @@ PDC_add_kvtag(pdcid_t obj_id, pdc_kvtag_t *kvtag, int is_cont) uint32_t server_id; hg_handle_t metadata_add_kvtag_handle; metadata_add_kvtag_in_t in; - struct _pdc_obj_info *obj_prop; - struct _pdc_cont_info *cont_prop; + struct _pdc_obj_info * obj_prop; + struct _pdc_cont_info * cont_prop; struct _pdc_client_lookup_args lookup_args; if (is_cont == 0) { @@ -6424,8 +6424,8 @@ PDC_get_kvtag(pdcid_t obj_id, char *tag_name, pdc_kvtag_t **kvtag, int is_cont) hg_handle_t metadata_get_kvtag_handle; metadata_get_kvtag_in_t in; struct _pdc_get_kvtag_args lookup_args; - struct _pdc_obj_info *obj_prop; - struct _pdc_cont_info *cont_prop; + struct _pdc_obj_info * obj_prop; + struct _pdc_cont_info * cont_prop; if (is_cont == 0) { obj_prop = PDC_obj_get_info(obj_id); @@ -6484,12 +6484,12 @@ kvtag_query_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_bulk_t origin_bulk_handle = hg_cb_info->info.bulk.origin_handle; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; uint32_t n_meta, actual_cnt; - void *buf = NULL; + void * buf = NULL; uint64_t buf_sizes[1]; uint32_t bulk_sgnum; - uint64_t *ids_buf_sizes; - void **ids_buf; - uint64_t *u64_arr_ptr; + uint64_t * ids_buf_sizes; + void ** ids_buf; + uint64_t * u64_arr_ptr; bulk_args = (struct bulk_args_t *)hg_cb_info->arg; @@ -6535,14 +6535,14 @@ kvtag_query_forward_cb(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value; - struct bulk_args_t *bulk_arg; + struct bulk_args_t * bulk_arg; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info *hg_info = NULL; + const struct hg_info * hg_info = NULL; bulk_arg = (struct bulk_args_t *)callback_info->arg; handle = callback_info->info.forward.handle; @@ -6712,8 +6712,8 @@ PDCtag_delete(pdcid_t obj_id, char *tag_name, int is_cont) uint32_t server_id; hg_handle_t metadata_del_kvtag_handle; metadata_get_kvtag_in_t in; - struct _pdc_obj_info *obj_prop; - struct _pdc_cont_info *cont_prop; + struct _pdc_obj_info * obj_prop; + struct _pdc_cont_info * cont_prop; struct _pdc_client_lookup_args lookup_args; if (is_cont) { @@ -6939,7 +6939,7 @@ PDCobj_put_data(const char *obj_name, void *data, uint64_t size, pdcid_t cont_id perr_t ret; // pdc_metadata_t *meta; struct _pdc_cont_info *info = NULL; - struct _pdc_id_info *id_info = NULL; + struct _pdc_id_info * id_info = NULL; pdcid_t transfer_request; id_info = PDC_find_id(cont_id); @@ -7037,7 +7037,7 @@ PDC_Client_del_metadata(pdcid_t obj_id, int is_cont) perr_t ret_value = SUCCEED; uint64_t meta_id; - struct _pdc_obj_info *obj_prop; + struct _pdc_obj_info * obj_prop; struct _pdc_cont_info *cont_prop; if (is_cont) { @@ -7164,7 +7164,7 @@ PDC_recv_nhits(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - send_nhits_t *in = (send_nhits_t *)callback_info->arg; + send_nhits_t * in = (send_nhits_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; LOG_INFO("Received %" PRIu64 " hits from server\n", in->nhits); @@ -7191,10 +7191,10 @@ PDC_send_data_query(pdc_query_t *query, pdc_query_get_op_t get_op, uint64_t *nhi perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - uint32_t *target_servers = NULL; + uint32_t * target_servers = NULL; int i, server_id, next_server = 0, prev_server = 0, ntarget = 0; hg_handle_t handle; - pdc_query_xfer_t *query_xfer; + pdc_query_xfer_t * query_xfer; struct _pdc_client_lookup_args lookup_args; struct _pdc_query_result_list *result; @@ -7281,12 +7281,12 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; uint32_t ndim; int query_id, origin; - void *buf; + void * buf; pdc_int_ret_t out; out.ret = 1; @@ -7365,7 +7365,7 @@ PDC_Client_get_sel_data(pdcid_t obj_id, pdc_selection_t *sel, void *data) uint64_t meta_id, off; get_sel_data_rpc_in_t in; struct _pdc_client_lookup_args lookup_args; - struct _pdc_obj_info *obj_prop; + struct _pdc_obj_info * obj_prop; struct _pdc_query_result_list *result_elt; if (sel == NULL) @@ -7436,11 +7436,11 @@ PDC_recv_read_coords_data(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; int query_id, seq_id; - void *buf; + void * buf; pdc_int_ret_t out; out.ret = 1; @@ -7510,9 +7510,9 @@ report_avg_server_profiling_rst() for (int i = 0; i < pdc_server_num_g; i++) { - double avg_srv_time = server_call_count_g[i] > 0 - ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) - : 0.0; + double avg_srv_time = server_call_count_g[i] > 0 + ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) + : 0.0; double srv_mem_usage = server_mem_usage_g[i] / 1024.0 / 1024.0; LOG_INFO("Server %d, avg profiling time: %.4f ms, memory usage: %.4f MB\n", i, avg_srv_time / 1000.0, srv_mem_usage); @@ -7602,7 +7602,7 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value; - struct bulk_args_t *client_lookup_args; + struct bulk_args_t * client_lookup_args; hg_handle_t handle; dart_perform_one_server_out_t output; uint32_t n_meta; @@ -7611,8 +7611,8 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args; - void *recv_meta; + struct bulk_args_t * bulk_args; + void * recv_meta; client_lookup_args = (struct bulk_args_t *)callback_info->arg; handle = callback_info->info.forward.handle; @@ -7767,7 +7767,7 @@ dart_perform_on_servers(index_hash_result_t **hash_result, int num_servers, struct bulk_args_t *lookup_args = (struct bulk_args_t *)PDC_calloc(num_servers, sizeof(struct bulk_args_t)); uint64_t ret_value = 0; - hg_handle_t *dart_request_handles = (hg_handle_t *)PDC_calloc(num_servers, sizeof(hg_handle_t)); + hg_handle_t * dart_request_handles = (hg_handle_t *)PDC_calloc(num_servers, sizeof(hg_handle_t)); int num_requests = 0; uint32_t total_n_meta = 0; dart_op_type_t op_type = dart_in->op_type; @@ -7831,9 +7831,9 @@ PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char *query_s stopwatch_t timer; timer_start(&timer); - char *k_query = get_key(query_string, '='); - char *v_query = get_value(query_string, '='); - char *tok = NULL; + char * k_query = get_key(query_string, '='); + char * v_query = get_value(query_string, '='); + char * tok = NULL; dart_op_type_t dart_op; dart_determine_query_token_by_key_query(k_query, &tok, &dart_op); diff --git a/src/api/pdc_obj/pdc_cont.c b/src/api/pdc_obj/pdc_cont.c index ea22388c5..589c037ba 100644 --- a/src/api/pdc_obj/pdc_cont.c +++ b/src/api/pdc_obj/pdc_cont.c @@ -58,7 +58,7 @@ PDCcont_create(const char *cont_name, pdcid_t cont_prop_id) perr_t ret = SUCCEED; struct _pdc_cont_info *p = NULL; struct _pdc_cont_prop *cont_prop = NULL; - struct _pdc_id_info *id_info = NULL; + struct _pdc_id_info * id_info = NULL; p = (struct _pdc_cont_info *)PDC_malloc(sizeof(struct _pdc_cont_info)); if (!p) @@ -108,7 +108,7 @@ PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id) perr_t ret = SUCCEED; struct _pdc_cont_info *p = NULL; struct _pdc_cont_prop *cont_prop = NULL; - struct _pdc_id_info *id_info = NULL; + struct _pdc_id_info * id_info = NULL; FUNC_ENTER(NULL); @@ -155,7 +155,7 @@ PDC_cont_create_local(pdcid_t pdc, const char *cont_name, uint64_t cont_meta_id) pdcid_t ret_value = 0; struct _pdc_cont_info *p = NULL; struct _pdc_cont_prop *cont_prop = NULL; - struct _pdc_id_info *id_info = NULL; + struct _pdc_id_info * id_info = NULL; pdcid_t cont_prop_id; p = (struct _pdc_cont_info *)PDC_malloc(sizeof(struct _pdc_cont_info)); @@ -309,7 +309,7 @@ PDC_cont_get_info(pdcid_t cont_id) struct _pdc_cont_info *ret_value = NULL; struct _pdc_cont_info *info = NULL; - struct _pdc_id_info *id_info = NULL; + struct _pdc_id_info * id_info = NULL; id_info = PDC_find_id(cont_id); if (id_info == NULL) @@ -352,7 +352,7 @@ PDCcont_get_info(const char *cont_name) { FUNC_ENTER(NULL); - struct pdc_cont_info *ret_value = NULL; + struct pdc_cont_info * ret_value = NULL; struct _pdc_cont_info *tmp = NULL; pdcid_t cont_id; @@ -375,8 +375,8 @@ PDCcont_iter_start() { FUNC_ENTER(NULL); - cont_handle *ret_value = NULL; - cont_handle *conthl = NULL; + cont_handle * ret_value = NULL; + cont_handle * conthl = NULL; struct PDC_id_type *type_ptr; type_ptr = (pdc_id_list_g->PDC_id_type_list_g)[PDC_CONT]; @@ -423,7 +423,7 @@ PDCcont_iter_get_info(cont_handle *chandle) { FUNC_ENTER(NULL); - struct pdc_cont_info *ret_value = NULL; + struct pdc_cont_info * ret_value = NULL; struct _pdc_cont_info *info = NULL; info = (struct _pdc_cont_info *)(chandle->obj_ptr); diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 9e85441b9..8623d805c 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -116,10 +116,10 @@ PDC_obj_create(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, _pdc_ FUNC_ENTER(NULL); pdcid_t ret_value = 0; - 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; struct _pdc_cont_info *cont_info = NULL; - struct _pdc_obj_prop *obj_prop; + struct _pdc_obj_prop * obj_prop; uint64_t meta_id; uint32_t data_server_id, metadata_server_id; size_t i; @@ -279,7 +279,7 @@ PDC_obj_close(struct _pdc_obj_info *op) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - pdcid_t *transfer_request_id; + pdcid_t * transfer_request_id; pdc_local_transfer_request *temp, *previous; int i, n; @@ -399,12 +399,12 @@ PDCobj_open_common(const char *obj_name, pdcid_t pdc, int is_col) pdcid_t ret_value = 0; perr_t ret = SUCCEED; struct _pdc_obj_info *p = NULL; - pdc_metadata_t *out = NULL; + pdc_metadata_t * out = NULL; pdcid_t obj_prop; size_t i; uint32_t metadata_server_id; - obj_handle *oh; - struct pdc_obj_info *info; + obj_handle * oh; + struct pdc_obj_info * info; int is_opened = 0; // Search if the object has already been opened @@ -546,8 +546,8 @@ PDCobj_iter_start(pdcid_t cont_id) { FUNC_ENTER(NULL); - obj_handle *ret_value = NULL; - obj_handle *objhl = NULL; + obj_handle * ret_value = NULL; + obj_handle * objhl = NULL; struct PDC_id_type *type_ptr; type_ptr = (pdc_id_list_g->PDC_id_type_list_g)[PDC_OBJ]; @@ -606,7 +606,7 @@ PDCobj_iter_get_info(obj_handle *ohandle) { FUNC_ENTER(NULL); - struct pdc_obj_info *ret_value = NULL; + struct pdc_obj_info * ret_value = NULL; struct _pdc_obj_info *info = NULL; unsigned i; @@ -736,7 +736,7 @@ PDCprop_set_obj_dims(pdcid_t obj_prop, PDC_int_t ndim, uint64_t *dims) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_obj_prop *prop; if (ndim <= 0) @@ -764,7 +764,7 @@ PDCprop_set_obj_type(pdcid_t obj_prop, pdc_var_type_t type) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -783,7 +783,7 @@ PDCprop_set_obj_transfer_region_type(pdcid_t obj_prop, pdc_region_partition_t re FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -802,7 +802,7 @@ PDCprop_set_obj_consistency_semantics(pdcid_t obj_prop, pdc_consistency_t consis FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -821,7 +821,7 @@ PDCprop_set_obj_buf(pdcid_t obj_prop, void *buf) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_obj_prop *prop; info = PDC_find_id(obj_prop); @@ -840,7 +840,7 @@ PDCobj_set_dims(pdcid_t obj_id, int ndim, uint64_t *dims) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_obj_info *object; int reset; @@ -878,7 +878,7 @@ PDCobj_get_dims(pdcid_t obj_id, int *ndim, uint64_t **dims) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_obj_info *object; info = PDC_find_id(obj_id); @@ -898,10 +898,10 @@ PDCobj_buf_retrieve(pdcid_t obj_id) { FUNC_ENTER(NULL); - void **ret_value = NULL; - struct _pdc_id_info *info; + void ** ret_value = NULL; + struct _pdc_id_info * info; struct _pdc_obj_info *object; - void **buffer; + void ** buffer; info = PDC_find_id(obj_id); if (info == NULL) @@ -921,7 +921,7 @@ PDC_obj_get_info(pdcid_t obj_id) struct _pdc_obj_info *ret_value = NULL; struct _pdc_obj_info *info = NULL; - struct _pdc_id_info *obj; + struct _pdc_id_info * obj; size_t i; obj = PDC_find_id(obj_id); @@ -1102,7 +1102,7 @@ PDCobj_get_info(pdcid_t obj_id) { FUNC_ENTER(NULL); - struct pdc_obj_info *ret_value = NULL; + struct pdc_obj_info * ret_value = NULL; struct _pdc_obj_info *tmp = NULL; /* pdcid_t obj_id; */ diff --git a/src/api/pdc_obj/pdc_prop.c b/src/api/pdc_obj/pdc_prop.c index e15e76a64..0ebdb5d44 100644 --- a/src/api/pdc_obj/pdc_prop.c +++ b/src/api/pdc_obj/pdc_prop.c @@ -60,9 +60,9 @@ PDCprop_create(pdc_prop_type_t type, pdcid_t pdcid) pdcid_t ret_value = 0; struct _pdc_cont_prop *p = NULL; - struct _pdc_obj_prop *q = NULL; - struct _pdc_id_info *id_info = NULL; - struct _pdc_class *pdc_class; + struct _pdc_obj_prop * q = NULL; + struct _pdc_id_info * id_info = NULL; + struct _pdc_class * pdc_class; pdcid_t new_id_c; pdcid_t new_id_o; @@ -136,7 +136,7 @@ PDCprop_obj_dup(pdcid_t prop_id) pdcid_t ret_value = 0; struct _pdc_obj_prop *q = NULL; struct _pdc_obj_prop *info = NULL; - struct _pdc_id_info *prop = NULL; + struct _pdc_id_info * prop = NULL; pdcid_t new_id; size_t i; @@ -295,7 +295,7 @@ PDCcont_prop_get_info(pdcid_t cont_prop) struct _pdc_cont_prop *ret_value = NULL; struct _pdc_cont_prop *info = NULL; - struct _pdc_id_info *prop; + struct _pdc_id_info * prop; prop = PDC_find_id(cont_prop); if (prop == NULL) @@ -324,9 +324,9 @@ PDCobj_prop_get_info(pdcid_t obj_prop) { FUNC_ENTER(NULL); - struct pdc_obj_prop *ret_value = NULL; + struct pdc_obj_prop * ret_value = NULL; struct _pdc_obj_prop *info = NULL; - struct _pdc_id_info *prop; + struct _pdc_id_info * prop; size_t i; prop = PDC_find_id(obj_prop); @@ -356,7 +356,7 @@ PDC_obj_prop_get_info(pdcid_t obj_prop) struct _pdc_obj_prop *ret_value = NULL; struct _pdc_obj_prop *info = NULL; - struct _pdc_id_info *prop; + struct _pdc_id_info * prop; size_t i; prop = PDC_find_id(obj_prop); diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 394ed9914..59a8885af 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -77,7 +77,7 @@ typedef struct pdc_transfer_request { // For each of the contig buffer sent to a server, we have a bulk buffer. char **bulk_buf; // Reference counter for bulk_buf, if 0, we free it. - int **bulk_buf_ref; + int ** bulk_buf_ref; pdc_region_partition_t region_partition; // Consistency semantics required by user @@ -133,7 +133,7 @@ typedef struct pdc_transfer_request_start_all_pkg { int index; // Data buffer. This data buffer is contiguous according to the remote region. We assume this is after // transformation of local regions - char *buf; + char * buf; struct pdc_transfer_request_start_all_pkg *next; } pdc_transfer_request_start_all_pkg; @@ -147,7 +147,7 @@ typedef struct pdc_transfer_request_wait_all_pkg { // Record the index of the metadata_id in the current transfer_request int index; // Pointer to the transfer request - pdc_transfer_request *transfer_request; + pdc_transfer_request * transfer_request; struct pdc_transfer_request_wait_all_pkg *next; } pdc_transfer_request_wait_all_pkg; @@ -203,12 +203,12 @@ PDCregion_transfer_create(void *buf, pdc_access_t access_type, pdcid_t obj_id, p FUNC_ENTER(NULL); pdcid_t ret_value = SUCCEED; - struct _pdc_id_info *objinfo2; - struct _pdc_obj_info *obj2; - pdc_transfer_request *p; - struct _pdc_id_info *reginfo1, *reginfo2; + struct _pdc_id_info * objinfo2; + struct _pdc_obj_info * obj2; + pdc_transfer_request * p; + struct _pdc_id_info * reginfo1, *reginfo2; struct pdc_region_info *reg1, *reg2; - uint64_t *ptr; + uint64_t * ptr; uint64_t unit; int j; @@ -296,7 +296,7 @@ PDCregion_transfer_close(pdcid_t transfer_request_id) { FUNC_ENTER(NULL); - struct _pdc_id_info *transferinfo; + struct _pdc_id_info * transferinfo; pdc_transfer_request *transfer_request; perr_t ret_value = SUCCEED; @@ -545,7 +545,7 @@ pack_region_buffer(char *buf, uint64_t *obj_dims, size_t total_data_size, int lo uint64_t i, j; perr_t ret_value = SUCCEED; - char *ptr; + char * ptr; if (local_ndim == 1) { *new_buf = buf + local_offset[0] * unit; @@ -613,7 +613,7 @@ pack_region_metadata_query(pdc_transfer_request_start_all_pkg **transfer_request perr_t ret_value = SUCCEED; int i; - char *ptr; + char * ptr; uint64_t total_buf_size; uint8_t region_partition; @@ -661,13 +661,13 @@ unpack_region_metadata_query(char *buf, pdc_transfer_request_start_all_pkg **tra perr_t ret_value = SUCCEED; pdc_transfer_request_start_all_pkg *transfer_request_head, *transfer_request_end; - pdc_transfer_request *local_request; + pdc_transfer_request * local_request; int size; int i, j, index; int counter; - char *ptr; + char * ptr; uint64_t region_size; - uint64_t *sub_offset; + uint64_t * sub_offset; local_request = NULL; transfer_request_head = NULL; @@ -761,10 +761,10 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i perr_t ret_value = SUCCEED; int i, j, index, size, output_size, remain_size, n_objs; pdc_transfer_request_start_all_pkg **transfer_requests; - pdc_transfer_request_start_all_pkg *transfer_request_head, *transfer_request_front_head, + pdc_transfer_request_start_all_pkg * transfer_request_head, *transfer_request_front_head, *transfer_request_end, **transfer_request_output, *previous = NULL; uint64_t total_buf_size, output_buf_size, query_id; - char *buf, *output_buf; + char * buf, *output_buf; transfer_request_output = NULL; transfer_request_front_head = NULL; @@ -908,7 +908,7 @@ prepare_start_all_requests(pdcid_t *transfer_request_id, int size, *read_request_pkgs, *write_request_pkgs_end, *read_request_pkgs_end, *request_pkgs, **transfer_request_output; int write_size, read_size, output_size; - struct _pdc_id_info *transferinfo; + struct _pdc_id_info * transferinfo; pdc_transfer_request *transfer_request; int set_output_buf = 0; @@ -1114,7 +1114,7 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - char *bulk_buf, *ptr, *ptr2; + char * bulk_buf, *ptr, *ptr2; size_t total_buf_size, obj_data_size, total_obj_data_size, unit, data_size, metadata_size; int i, j; @@ -1221,10 +1221,10 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ int index, i, j; int n_objs; uint64_t *metadata_id; - char **read_bulk_buf; - char *bulk_buf; + char ** read_bulk_buf; + char * bulk_buf; size_t bulk_buf_size; - int *bulk_buf_ref; + int * bulk_buf_ref; if (size == 0) PGOTO_DONE(ret_value); @@ -1307,10 +1307,10 @@ merge_transfer_request_ids(pdcid_t *transfer_request_id, int size, pdcid_t *merg { FUNC_ENTER(NULL); - struct _pdc_id_info *transferinfo; + struct _pdc_id_info * transferinfo; pdcid_t obj_id, new_local_reg, new_remote_reg; int flag = 0, i; - void *new_buf; + void * new_buf; pdc_access_t access_type; pdc_transfer_request **all_transfer_request; uint64_t new_buf_size = 0, copy_off = 0; @@ -1416,7 +1416,7 @@ PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, int perr_t ret_value = SUCCEED; int write_size = 0, read_size = 0, posix_size = 0, merged_size = 0; pdc_transfer_request_start_all_pkg **write_transfer_requests = NULL, **read_transfer_requests = NULL; - pdcid_t *posix_transfer_request_id, *merged_request_id; + pdcid_t * posix_transfer_request_id, *merged_request_id; // Merge the transfer_request_ids when they are operating on the same obj and have contiguous off, len if (size > PDC_MERGE_TRANSFER_MIN_COUNT) { @@ -1499,7 +1499,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *transferinfo; + struct _pdc_id_info * transferinfo; pdc_transfer_request *transfer_request; size_t unit; int i; @@ -1637,7 +1637,7 @@ release_region_buffer(char *buf, uint64_t *obj_dims, int local_ndim, uint64_t *l int k; perr_t ret_value = SUCCEED; - char *ptr; + char * ptr; if (local_ndim == 2) { if (access_type == PDC_READ) { ptr = new_buf; @@ -1676,7 +1676,7 @@ PDCregion_transfer_status(pdcid_t transfer_request_id, pdc_transfer_status_t *co FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *transferinfo; + struct _pdc_id_info * transferinfo; pdc_transfer_request *transfer_request; size_t unit; int i; @@ -1764,13 +1764,13 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) int index, i, j, merged_xfer = 0, ori_size = size, is_first = 1; size_t unit; int total_requests, n_objs; - uint64_t *metadata_ids, merge_off = 0, cur_off = 0; + uint64_t * metadata_ids, merge_off = 0, cur_off = 0; pdc_transfer_request_wait_all_pkg **transfer_requests, *transfer_request_head, *transfer_request_end, *temp; struct _pdc_id_info **transferinfo; pdc_transfer_request *transfer_request, *merged_request; - pdcid_t *my_transfer_request_id = transfer_request_id; + pdcid_t * my_transfer_request_id = transfer_request_id; double t0, t1; @@ -1857,7 +1857,7 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) } pdc_transfer_request *tr = transfer_requests[index]->transfer_request; - hg_bulk_t *bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; + hg_bulk_t * bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; PDC_Client_transfer_request_wait_all(bulk_handle, n_objs, metadata_ids + index, transfer_requests[index]->data_server_id); tr->num_bulk_handles++; @@ -1902,7 +1902,7 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) metadata_ids[j] = transfer_requests[j]->metadata_id; } pdc_transfer_request *tr = transfer_requests[index]->transfer_request; - hg_bulk_t *bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; + hg_bulk_t * bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; PDC_Client_transfer_request_wait_all(bulk_handle, n_objs, metadata_ids + index, transfer_requests[index]->data_server_id); tr->num_bulk_handles++; @@ -2008,7 +2008,7 @@ PDCregion_transfer_wait(pdcid_t transfer_request_id) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *transferinfo; + struct _pdc_id_info * transferinfo; pdc_transfer_request *transfer_request; size_t unit; int i; diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index 66eb8e6fe..b75c8f567 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -1602,7 +1602,7 @@ HG_TEST_RPC_CB(metadata_query, handle) hg_return_t ret_value = HG_SUCCESS; metadata_query_in_t in; metadata_query_out_t out; - pdc_metadata_t *query_result = NULL; + pdc_metadata_t * query_result = NULL; // Decode input HG_Get_input(handle, &in); @@ -1643,7 +1643,7 @@ HG_TEST_RPC_CB(obj_reset_dims, handle) hg_return_t ret_value = HG_SUCCESS; obj_reset_dims_in_t in; obj_reset_dims_out_t out; - pdc_metadata_t *query_result = NULL; + pdc_metadata_t * query_result = NULL; // Decode input HG_Get_input(handle, &in); @@ -2025,7 +2025,7 @@ pdc_region_write_out_progress(void *arg) HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - struct pdc_region_info *remote_reg_info = NULL; + struct pdc_region_info * remote_reg_info = NULL; region_lock_out_t out; remote_reg_info = (struct pdc_region_info *)PDC_malloc(sizeof(struct pdc_region_info)); @@ -2123,7 +2123,7 @@ pdc_region_read_from_progress(void *arg) HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - const struct hg_info *hg_info = NULL; + const struct hg_info * hg_info = NULL; hg_return_t hg_ret; size_t size; int error = 0; @@ -2173,21 +2173,21 @@ transform_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_inf hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_transform_and_release_bulk_args *bulk_args = NULL; - void *data_buf; - char *buf; + void * data_buf; + char * buf; int ndim; int transform_id; int type_extent = 0; int use_transform_size = 0; size_t unit = 1; int64_t transform_size, expected_size; - uint64_t *dims = NULL; + uint64_t * dims = NULL; pdc_var_type_t destType; - struct _pdc_region_transform_ftn_info **registry = NULL; + struct _pdc_region_transform_ftn_info ** registry = NULL; int registered_count; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t *elt; + region_buf_map_t * elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2355,12 +2355,12 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_analysis_and_release_bulk_args *bulk_args = NULL; - void *data_buf; + void * data_buf; int ndim; uint64_t type_extent; - uint64_t *dims = NULL; - struct pdc_region_info *remote_reg_info = NULL; - struct pdc_region_info *local_reg_info = NULL; + uint64_t * dims = NULL; + struct pdc_region_info * remote_reg_info = NULL; + struct pdc_region_info * local_reg_info = NULL; double start_t, end_t, analysis_t, io_t; double averages[4]; @@ -2411,7 +2411,7 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info int registered_count = PDC_get_analysis_registry(®istry); if ((registered_count >= analysis_meta_index) && (registry != NULL)) { - int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t *_cbs) = + int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t * _cbs) = registry[analysis_meta_index]->ftnPtr; int result = analysis_ftn(bulk_args->in.input_iter, bulk_args->in.output_iter, &iter_cbs); LOG_INFO("Analysis returned %d\n", result); @@ -2510,7 +2510,7 @@ buf_map_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct buf_map_release_bulk_args *bulk_args = NULL; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t *elt; + region_buf_map_t * elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2695,23 +2695,23 @@ HG_TEST_RPC_CB(region_release, handle) hg_return_t hg_ret; region_lock_in_t in; region_lock_out_t out; - const struct hg_info *hg_info = NULL; - data_server_region_t *target_obj; + const struct hg_info * hg_info = NULL; + data_server_region_t * target_obj; int error = 0; int dirty_reg = 0; hg_size_t size, size2; - void *data_buf; - struct pdc_region_info *server_region; - region_list_t *elt, *request_region, *tmp, *elt_tmp; + void * data_buf; + struct pdc_region_info * server_region; + region_list_t * elt, *request_region, *tmp, *elt_tmp; struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; - struct buf_map_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; + struct buf_map_release_bulk_args * buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info *remote_reg_info; - region_buf_map_t *eltt, *eltt2, *eltt_tmp; + struct pdc_region_info * remote_reg_info; + region_buf_map_t * eltt, *eltt2, *eltt_tmp; hg_uint32_t /*k, m, */ remote_count; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; // size_t type_size = 0; // size_t dims[4] = {0, 0, 0, 0}; #ifdef PDC_TIMING @@ -3047,10 +3047,10 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha const struct hg_info *hg_info = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; hg_uint32_t remote_count; - void *data_buf = NULL; + void * data_buf = NULL; ; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; region_buf_map_t *eltt2; region_lock_out_t out; @@ -3059,8 +3059,8 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha int dirty_reg = 0; struct buf_map_transform_and_release_bulk_args *transform_release_bulk_args = NULL; - struct pdc_region_info *remote_reg_info = NULL; - data_server_region_t *target_obj = NULL; + struct pdc_region_info * remote_reg_info = NULL; + data_server_region_t * target_obj = NULL; region_list_t *tmp, *elt, *request_region = (region_list_t *)PDC_malloc(sizeof(region_list_t)); hg_info = HG_Get_info(handle); @@ -3211,19 +3211,19 @@ HG_TEST_RPC_CB(transform_region_release, handle) region_transform_and_lock_in_t in; region_lock_in_t reg_lock_in; region_lock_out_t out; - const struct hg_info *hg_info = NULL; - data_server_region_t *target_obj; + const struct hg_info * hg_info = NULL; + data_server_region_t * target_obj; int error = 0; int dirty_reg = 0; hg_size_t size; - void *data_buf; - region_list_t *elt, *request_region, *tmp; + void * data_buf; + region_list_t * elt, *request_region, *tmp; struct buf_map_transform_and_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t *eltt; + region_buf_map_t * eltt; hg_uint32_t remote_count; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; // Decode input HG_Get_input(handle, &in); @@ -3356,14 +3356,14 @@ HG_TEST_RPC_CB(region_transform_release, handle) int dirty_reg = 0; hg_size_t size, remote_size; ; - void *data_buf; - region_list_t *elt, *request_region, *tmp; + void * data_buf; + region_list_t * elt, *request_region, *tmp; struct buf_map_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t *eltt; + region_buf_map_t * eltt; hg_uint32_t k, remote_count = 0; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; size_t type_size = 0; ; size_t dims[4] = {0, 0, 0, 0}; @@ -3512,26 +3512,26 @@ HG_TEST_RPC_CB(region_analysis_release, handle) } in; region_lock_out_t out; - const struct hg_info *hg_info = NULL; - data_server_region_t *target_obj; - data_server_region_t *lock_obj; + const struct hg_info * hg_info = NULL; + data_server_region_t * target_obj; + data_server_region_t * lock_obj; int error = 0; int dirty_reg = 0; hg_size_t size; hg_return_t hg_ret; - void *data_buf; - struct pdc_region_info *server_region; - region_list_t *elt, *request_region, *tmp; - struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; + void * data_buf; + struct pdc_region_info * server_region; + region_list_t * elt, *request_region, *tmp; + struct region_lock_update_bulk_args * lock_update_bulk_args = NULL; struct buf_map_analysis_and_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info *remote_reg_info; - region_buf_map_t *eltt, *eltt2; + struct pdc_region_info * remote_reg_info; + region_buf_map_t * eltt, *eltt2; hg_uint32_t k, remote_count = 0; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; size_t type_size = 0; size_t dims[4] = {0, 0, 0, 0}; @@ -3953,7 +3953,7 @@ HG_TEST_RPC_CB(get_remote_metadata, handle) hg_return_t ret_value = HG_SUCCESS; get_remote_metadata_in_t in; get_remote_metadata_out_t out; - pdc_metadata_t *meta; + pdc_metadata_t * meta; // Decode input HG_Get_input(handle, &in); @@ -3988,7 +3988,7 @@ HG_TEST_RPC_CB(buf_unmap_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_unmap_in_t in; buf_unmap_out_t out; - pdc_metadata_t *target_obj; + pdc_metadata_t * target_obj; region_buf_map_t *tmp, *elt; // Decode input @@ -4034,8 +4034,8 @@ HG_TEST_RPC_CB(buf_map_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_map_in_t in; buf_map_out_t out; - pdc_metadata_t *target_obj; - region_list_t *elt, *request_region; + pdc_metadata_t * target_obj; + region_list_t * elt, *request_region; region_buf_map_t *buf_map_ptr; // Decode input @@ -4095,9 +4095,9 @@ HG_TEST_RPC_CB(buf_map, handle) buf_map_in_t in; buf_map_out_t out; const struct hg_info *info; - region_list_t *request_region; - region_buf_map_t *new_buf_map_ptr = NULL; - void *data_ptr; + region_list_t * request_region; + region_buf_map_t * new_buf_map_ptr = NULL; + void * data_ptr; size_t ndim; #ifdef PDC_TIMING double start, end; @@ -4161,9 +4161,9 @@ HG_TEST_RPC_CB(query_partial, handle) hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; uint32_t i; - void **buf_ptrs; - size_t *buf_sizes; - uint32_t *n_meta_ptr, n_buf; + void ** buf_ptrs; + size_t * buf_sizes; + uint32_t * n_meta_ptr, n_buf; metadata_query_transfer_in_t in; metadata_query_transfer_out_t out; @@ -4255,7 +4255,7 @@ HG_TEST_RPC_CB(query_kvtag, handle) hg_return_t ret_value; hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t *buf_ptr; + uint64_t * buf_ptr; size_t buf_size[1]; uint32_t nmeta; pdc_kvtag_t in; @@ -4314,10 +4314,10 @@ update_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, i; - uint64_t *obj_id_ptr; + uint64_t * obj_id_ptr; pdc_int_ret_t out_struct; - void **buf; - void *buf_1d; + void ** buf; + void * buf_1d; out_struct.ret = 0; @@ -4369,7 +4369,7 @@ HG_TEST_RPC_CB(bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; bulk_rpc_in_t in_struct; int cnt; @@ -4514,7 +4514,7 @@ HG_TEST_RPC_CB(data_server_read_check, handle) // Decode input data_server_read_check_in_t in; data_server_read_check_out_t out; - server_read_check_out_t *read_out = PDC_calloc(1, sizeof(server_read_check_out_t)); + server_read_check_out_t * read_out = PDC_calloc(1, sizeof(server_read_check_out_t)); ret_value = HG_Get_input(handle, &in); @@ -4613,7 +4613,7 @@ HG_TEST_RPC_CB(get_metadata_by_id, handle) hg_return_t ret_value = HG_SUCCESS; get_metadata_by_id_in_t in; get_metadata_by_id_out_t out; - pdc_metadata_t *target = NULL; + pdc_metadata_t * target = NULL; // Decode input HG_Get_input(handle, &in); @@ -4718,8 +4718,8 @@ PDC_find_in_path(char *workingDir, char *application) FUNC_ENTER(NULL); struct stat fileStat; - char *ret_value = NULL; - char *pathVar = getenv("PATH"); + char * ret_value = NULL; + char * pathVar = getenv("PATH"); char colon = ':'; char checkPath[PATH_MAX]; @@ -4773,11 +4773,11 @@ cont_add_del_objs_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, op; cont_add_del_objs_rpc_out_t out_struct; - uint64_t *obj_ids, cont_id; + uint64_t * obj_ids, cont_id; out_struct.ret = 0; @@ -4827,8 +4827,8 @@ HG_TEST_RPC_CB(cont_add_del_objs_rpc, handle) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; cont_add_del_objs_rpc_in_t in_struct; @@ -4907,13 +4907,13 @@ query_read_obj_name_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char *tmp_buf; + char * tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t *query_read_names_args; + query_read_names_args_t * query_read_names_args; out_struct.ret = 0; @@ -4968,8 +4968,8 @@ HG_TEST_RPC_CB(query_read_obj_name_rpc, handle) hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5074,13 +5074,13 @@ get_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int i, task_id, n_regions; - int *int_ptr; - char *char_ptr, *file_path; - uint64_t *uint64_ptr, offset; + int * int_ptr; + char * char_ptr, *file_path; + uint64_t * uint64_ptr, offset; - void *buf; + void * buf; region_info_transfer_t *region_info_ptr; - region_list_t *region_list, *region_list_head = NULL; + region_list_t * region_list, *region_list_head = NULL; pdc_int_ret_t out_struct; out_struct.ret = 0; @@ -5149,7 +5149,7 @@ HG_TEST_RPC_CB(get_storage_meta_name_query_bulk_result_rpc, handle) hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5201,8 +5201,8 @@ notify_client_multi_io_complete_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int n_shm; - void *buf; - char *buf_cp; + void * buf; + char * buf_cp; pdc_int_ret_t out_struct; out_struct.ret = 0; @@ -5244,7 +5244,7 @@ HG_TEST_RPC_CB(notify_client_multi_io_complete_rpc, handle) hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5284,7 +5284,7 @@ PDC_add_task_to_list(pdc_task_list_t **target_list, perr_t (*cb)(), void *cb_arg #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { FUNC_ENTER(NULL); @@ -5327,7 +5327,7 @@ PDC_del_task_from_list(pdc_task_list_t **target_list, pdc_task_list_t *del, #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { FUNC_ENTER(NULL); @@ -5502,13 +5502,13 @@ query_read_obj_name_client_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char *tmp_buf; + char * tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t *query_read_names_args; + query_read_names_args_t * query_read_names_args; out_struct.ret = 0; @@ -5563,8 +5563,8 @@ HG_TEST_RPC_CB(query_read_obj_name_client_rpc, handle) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5613,9 +5613,9 @@ send_client_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void *buf = NULL, *buf_cp = NULL; + void * buf = NULL, *buf_cp = NULL; process_bulk_storage_meta_args_t *process_args = NULL; if (hg_cb_info->ret != HG_SUCCESS) @@ -5659,7 +5659,7 @@ HG_TEST_RPC_CB(send_client_storage_meta_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5715,7 +5715,7 @@ server_recv_shm_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void *buf = NULL, *buf_cp = NULL; + void * buf = NULL, *buf_cp = NULL; if (hg_cb_info->ret != HG_SUCCESS) PGOTO_ERROR(HG_PROTOCOL_ERROR, "Error in callback"); @@ -5751,7 +5751,7 @@ HG_TEST_RPC_CB(send_shm_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5917,7 +5917,7 @@ HG_TEST_RPC_CB(send_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_arg = NULL; + struct bulk_args_t * bulk_arg = NULL; bulk_rpc_in_t in_struct; hg_return_t (*func_ptr)(const struct hg_cb_info *hg_cb_info); struct hg_cb_info callback_info; @@ -6016,10 +6016,10 @@ HG_TEST_RPC_CB(dart_perform_one_server, handle) dart_perform_one_server_out_t out; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t *n_obj_ids_ptr; + uint64_t * n_obj_ids_ptr; uint64_t n_buf; uint64_t **buf_ptrs; - size_t *buf_sizes; + size_t * buf_sizes; uint32_t i; // Extract input from handle diff --git a/src/server/pdc_server.c b/src/server/pdc_server.c index f85968068..ffb967dbd 100644 --- a/src/server/pdc_server.c +++ b/src/server/pdc_server.c @@ -83,7 +83,7 @@ sqlite3 *sqlite3_db_g; int is_debug_g = 0; int pdc_client_num_g = 0; -hg_class_t *hg_class_g = NULL; +hg_class_t * hg_class_g = NULL; hg_context_t *hg_context_g = NULL; // Below three are guarded by pdc_server_task_mutex_g for multi-thread @@ -91,10 +91,10 @@ pdc_task_list_t *pdc_server_agg_task_head_g = NULL; pdc_task_list_t *pdc_server_s2s_task_head_g = NULL; int pdc_server_task_id_g = PDC_SERVER_TASK_INIT_VALUE; -pdc_client_info_t *pdc_client_info_g = NULL; +pdc_client_info_t * pdc_client_info_g = NULL; pdc_remote_server_info_t *pdc_remote_server_info_g = NULL; -char *all_addr_strings_1d_g = NULL; -char **all_addr_strings_g = NULL; +char * all_addr_strings_1d_g = NULL; +char ** all_addr_strings_g = NULL; int is_hash_table_init_g = 0; int lustre_stripe_size_mb_g = 16; int lustre_total_ost_g = 0; @@ -147,7 +147,7 @@ int gen_fastbit_idx_g = 0; int use_fastbit_idx_g = 0; int use_rocksdb_g = 0; int use_sqlite3_g = 0; -char *gBinningOption = NULL; +char * gBinningOption = NULL; double server_write_time_g = 0.0; double server_read_time_g = 0.0; @@ -165,9 +165,9 @@ volatile int dbg_sleep_g = 1; double total_mem_usage_g = 0.0; // Data server related -pdc_data_server_io_list_t *pdc_data_server_read_list_head_g = NULL; -pdc_data_server_io_list_t *pdc_data_server_write_list_head_g = NULL; -update_storage_meta_list_t *pdc_update_storage_meta_list_head_g = NULL; +pdc_data_server_io_list_t * pdc_data_server_read_list_head_g = NULL; +pdc_data_server_io_list_t * pdc_data_server_write_list_head_g = NULL; +update_storage_meta_list_t * pdc_update_storage_meta_list_head_g = NULL; extern data_server_region_t *dataserver_region_g; /* @@ -366,7 +366,7 @@ remove_directory(const char *dir) FUNC_ENTER(NULL); int ret_value = 0; - FTS *ftsp = NULL; + FTS * ftsp = NULL; FTSENT *curr; // Cast needed (in C) because fts_open() takes a "char * const *", instead @@ -516,7 +516,7 @@ PDC_Server_lookup_server_id(int remote_server_id) lookup_args->server_id = remote_server_id; hg_ret = HG_Addr_lookup(hg_context_g, lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Connection to remote server FAILED"); @@ -620,7 +620,7 @@ PDC_Server_lookup_client(uint32_t client_id) // Lookup and fill the client info server_lookup_args_t lookup_args; - char *target_addr_string; + char * target_addr_string; lookup_args.server_id = pdc_server_rank_g; lookup_args.client_id = client_id; @@ -743,7 +743,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) int i = 0; char self_addr_string[ADDR_MAX]; char na_info_string[NA_STRING_INFO_LEN]; - char *hostname; + char * hostname; pbool_t free_hostname = false; struct hg_init_info init_info = {0}; @@ -759,7 +759,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) uint32_t credential = 0, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char *auth_key; + char * auth_key; int rc; #endif @@ -1011,7 +1011,7 @@ PDC_Server_finalize() FUNC_ENTER(NULL); pdc_data_server_io_list_t *io_elt = NULL; - region_list_t *region_elt = NULL, *region_tmp = NULL; + region_list_t * region_elt = NULL, *region_tmp = NULL; perr_t ret_value = SUCCEED; hg_return_t hg_ret; @@ -1173,21 +1173,21 @@ PDC_Server_checkpoint() FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - pdc_metadata_t *elt; - region_list_t *region_elt; - pdc_kvtag_list_t *kvlist_elt; - pdc_hash_table_entry_head *head; + pdc_metadata_t * elt; + region_list_t * region_elt; + pdc_kvtag_list_t * kvlist_elt; + pdc_hash_table_entry_head * head; pdc_cont_hash_table_entry_t *cont_head; int n_entry, metadata_size = 0, region_count = 0, n_region, n_objs, n_write_region = 0, n_kvtag, key_len; uint32_t hash_key; HashTablePair pair; char checkpoint_file[ADDR_MAX], checkpoint_file_local[ADDR_MAX], cmd[4096]; HashTableIterator hash_table_iter; - char *checkpoint; - char *env_char; + char * checkpoint; + char * env_char; uint64_t checkpoint_size; bool use_tmpfs = false; - FILE *file; + FILE * file; #ifdef PDC_TIMING // Timing @@ -1301,7 +1301,7 @@ PDC_Server_checkpoint() metadata_size++; region_count += n_region; } // End for metadata entry linked list - } // End for hash table metadata entry + } // End for hash table metadata entry // Note data server region are managed by data server instead of metadata server data_server_region_t *region = NULL; @@ -1396,14 +1396,14 @@ PDC_Server_restart(char *filename) int n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs, total_region = 0, n_kvtag, key_len; int n_cont, all_cont; - pdc_metadata_t *metadata, *elt; - region_list_t *region_list; - pdc_hash_table_entry_head *entry; + pdc_metadata_t * metadata, *elt; + region_list_t * region_list; + pdc_hash_table_entry_head * entry; pdc_cont_hash_table_entry_t *cont_entry; - uint32_t *hash_key; + uint32_t * hash_key; unsigned idx; uint64_t checkpoint_size; - char *checkpoint_buf; + char * checkpoint_buf; #ifdef PDC_TIMING double start = MPI_Wtime(); #endif @@ -1670,8 +1670,8 @@ PDC_Server_restart(char *filename) MPI_Reduce(&nobj, &all_nobj, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&total_region, &all_n_region, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); #else - all_nobj = nobj; - all_n_region = total_region; + all_nobj = nobj; + all_n_region = total_region; #endif if (pdc_server_rank_g == 0) { @@ -1699,7 +1699,7 @@ hg_progress_thread(void *arg) { FUNC_ENTER(NULL); - hg_context_t *context = (hg_context_t *)arg; + hg_context_t * context = (hg_context_t *)arg; HG_THREAD_RETURN_TYPE tret = (HG_THREAD_RETURN_TYPE)0; hg_return_t ret = HG_SUCCESS; @@ -2192,7 +2192,7 @@ server_run(int argc, char *argv[]) rocksdb_options_set_create_if_missing(options, 1); rocksdb_block_based_table_options_t *table_options = rocksdb_block_based_options_create(); - rocksdb_filterpolicy_t *filter_policy = rocksdb_filterpolicy_create_bloom(10); + rocksdb_filterpolicy_t * filter_policy = rocksdb_filterpolicy_create_bloom(10); rocksdb_block_based_options_set_filter_policy(table_options, filter_policy); rocksdb_options_set_block_based_table_factory(options, table_options); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 20bdc9677..53fdf1e84 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -62,7 +62,7 @@ #include "pdc_logger.h" // Global object region info list in local data server -data_server_region_t *dataserver_region_g = NULL; +data_server_region_t * dataserver_region_g = NULL; data_server_region_unmap_t *dataserver_region_unmap = NULL; int pdc_buffered_bulk_update_total_g = 0; @@ -79,10 +79,10 @@ uint64_t max_mem_cache_size_mb_g = 0; int cache_percentage_g = 0; int current_read_from_cache_cnt_g = 0; int total_read_from_cache_cnt_g = 0; -FILE *pdc_cache_file_ptr_g = NULL; +FILE * pdc_cache_file_ptr_g = NULL; char pdc_cache_file_path_g[ADDR_MAX]; -query_task_t *query_task_list_head_g = NULL; +query_task_t * query_task_list_head_g = NULL; cache_storage_region_t *cache_storage_region_head_g = NULL; static int @@ -253,7 +253,7 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock perr_t ret_value = SUCCEED; pdc_metadata_t *res_meta; - region_list_t *elt, *request_region; + region_list_t * elt, *request_region; // Check if the region lock info is on current server *lock_status = 0; @@ -350,7 +350,7 @@ PDC_Server_clear_obj_region() perr_t ret_value = SUCCEED; data_server_region_t *elt, *tmp; - region_list_t *elt2, *tmp2; + region_list_t * elt2, *tmp2; if (dataserver_region_g != NULL) { DL_FOREACH_SAFE(dataserver_region_g, elt, tmp) @@ -461,10 +461,10 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han perr_t ret_value = SUCCEED; int ndim; - region_list_t *request_region; + region_list_t * request_region; data_server_region_t *new_obj_reg; - region_list_t *elt1, *tmp; - region_buf_map_t *eltt; + region_list_t * elt1, *tmp; + region_buf_map_t * eltt; int error = 0; int found_lock = 0; // time_t t; @@ -561,8 +561,8 @@ PDC_Server_release_lock_request(uint64_t obj_id, struct pdc_region_info *region) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - region_list_t *request_region; - region_list_t *elt, *tmp; + region_list_t * request_region; + region_list_t * elt, *tmp; data_server_region_t *new_obj_reg; region_lock_out_t out; @@ -603,7 +603,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) perr_t ret_value = SUCCEED; int ndim; - region_list_t *tmp1, *tmp2; + region_list_t * tmp1, *tmp2; region_list_t request_region; int found = 0; data_server_region_t *obj_reg = NULL; @@ -625,7 +625,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) obj_reg = PDC_Server_get_obj_region(in->obj_id); if (obj_reg == NULL) PGOTO_ERROR(FAIL, "Requested release object does not exist"); - // Find the lock region in the list and remove it + // Find the lock region in the list and remove it #ifdef ENABLE_MULTITHREAD hg_thread_mutex_lock(&lock_list_mutex_g); #endif @@ -738,7 +738,7 @@ PDC_Data_Server_buf_unmap(const struct hg_info *info, buf_unmap_in_t *in) perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; - region_buf_map_t *tmp, *elt; + region_buf_map_t * tmp, *elt; data_server_region_t *target_obj; target_obj = PDC_Server_get_obj_region(in->remote_obj_id); @@ -830,9 +830,9 @@ PDC_Data_Server_check_unmap() perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; pdcid_t remote_obj_id; - region_buf_map_t *tmp, *elt; + region_buf_map_t * tmp, *elt; data_server_region_unmap_t *tmp1, *elt1; - data_server_region_t *target_obj; + data_server_region_t * target_obj; int completed = 0; DL_FOREACH_SAFE(dataserver_region_unmap, elt1, tmp1) @@ -928,7 +928,7 @@ buf_unmap_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_unmap_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_unmap_handle; hg_handle_t handle; - struct transfer_buf_unmap *tranx_args; + struct transfer_buf_unmap * tranx_args; int error = 0; #ifdef ENABLE_MULTITHREAD @@ -989,7 +989,7 @@ PDC_Server_buf_unmap_lookup_server_id(int remote_server_id, struct transfer_buf_ lookup_args->server_id = remote_server_id; lookup_args->buf_unmap_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_unmap_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR(FAIL, "Connection to remote server failed"); @@ -1046,9 +1046,9 @@ PDC_Meta_Server_buf_unmap(buf_unmap_in_t *in, hg_handle_t *handle) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_unmap_handle; struct transfer_buf_unmap_args *buf_unmap_args; - struct transfer_buf_unmap *addr_args; - pdc_metadata_t *target_meta = NULL; - region_buf_map_t *tmp, *elt; + struct transfer_buf_unmap * addr_args; + pdc_metadata_t * target_meta = NULL; + region_buf_map_t * tmp, *elt; int error = 0; if ((uint32_t)pdc_server_rank_g == in->meta_server_id) { @@ -1123,14 +1123,14 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis { FUNC_ENTER(NULL); - region_buf_map_t *ret_value = NULL; + region_buf_map_t * ret_value = NULL; data_server_region_t *new_obj_reg = NULL; - region_list_t *elt_reg; - region_buf_map_t *buf_map_ptr = NULL; - region_buf_map_t *tmp; + region_list_t * elt_reg; + region_buf_map_t * buf_map_ptr = NULL; + region_buf_map_t * tmp; int dup = 0; - char *data_path = NULL; - char *user_specified_data_path = NULL; + char * data_path = NULL; + char * user_specified_data_path = NULL; char storage_location[ADDR_MAX]; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; @@ -1244,9 +1244,9 @@ PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t { FUNC_ENTER(NULL); - void *ret_value = NULL; + void * ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t *tmp; + region_buf_map_t * tmp; if (dataserver_region_g == NULL) PGOTO_ERROR(NULL, "Object list is NULL"); @@ -1298,9 +1298,9 @@ PDC_Server_get_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region) { FUNC_ENTER(NULL); - void *ret_value = NULL; + void * ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t *tmp; + region_buf_map_t * tmp; if (dataserver_region_g == NULL) PGOTO_ERROR(NULL, "Object list is NULL"); @@ -1363,7 +1363,7 @@ buf_map_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_map_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_map_handle; hg_handle_t handle; - struct transfer_buf_map *tranx_args; + struct transfer_buf_map * tranx_args; int error = 0; #ifdef ENABLE_MULTITHREAD @@ -1425,7 +1425,7 @@ PDC_Server_buf_map_lookup_server_id(int remote_server_id, struct transfer_buf_ma lookup_args->server_id = remote_server_id; lookup_args->buf_map_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_map_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR(FAIL, "Connection to remote server FAILED"); @@ -1479,9 +1479,9 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_map_handle; struct transfer_buf_map_args *tranx_args = NULL; - struct transfer_buf_map *addr_args; - pdc_metadata_t *target_meta = NULL; - region_buf_map_t *buf_map_ptr; + struct transfer_buf_map * addr_args; + pdc_metadata_t * target_meta = NULL; + region_buf_map_t * buf_map_ptr; int error = 0; // dataserver and metadata server is on the same node @@ -1721,11 +1721,11 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; - void **buf_ptrs; - hg_size_t *buf_sizes; + void ** buf_ptrs; + hg_size_t * buf_sizes; bulk_rpc_in_t bulk_rpc_in; int i; - region_list_t *region_elt; + region_list_t * region_elt; notify_multi_io_args_t *bulk_args; if (client_id >= (uint32_t)pdc_client_num_g) @@ -1910,7 +1910,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t *region_elt = NULL; + region_list_t * region_elt = NULL; region_list_t r_target; /* uint32_t i; */ @@ -1991,7 +1991,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check perr_t ret_value = FAIL; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t *region_elt = NULL, *region_tmp = NULL; + region_list_t * region_elt = NULL, *region_tmp = NULL; int found_region = 0; pdc_metadata_t meta; @@ -2088,7 +2088,7 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * perr_t ret_value = SUCCEED; pdc_metadata_t *target_meta = NULL; - region_list_t *region_elt = NULL; + region_list_t * region_elt = NULL; // Find object metadata *n_loc = 0; @@ -2237,17 +2237,17 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) perr_t ret_value = SUCCEED; uint32_t server_id = 0; uint32_t i, j; - pdc_metadata_t *region_meta = NULL, *region_meta_prev = NULL; - region_list_t *region_elt, req_region, **overlap_regions_2d = NULL; + pdc_metadata_t * region_meta = NULL, *region_meta_prev = NULL; + region_list_t * region_elt, req_region, **overlap_regions_2d = NULL; region_info_transfer_t local_region_transfer[PDC_SERVER_MAX_PROC_PER_NODE]; - region_info_transfer_t *all_requests = NULL; + region_info_transfer_t * all_requests = NULL; update_region_storage_meta_bulk_t *send_buf = NULL; update_region_storage_meta_bulk_t *result_storage_meta = NULL; uint32_t total_request_cnt; int data_size = sizeof(region_info_transfer_t); - int *send_bytes = NULL; - int *displs = NULL; - int *request_overlap_cnt = NULL; + int * send_bytes = NULL; + int * displs = NULL; + int * request_overlap_cnt = NULL; int nrequest_per_server = 0; if (regions_head == NULL) @@ -2540,7 +2540,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_list_elt, *io_list = NULL, *io_list_target = NULL; - region_list_t *region_elt = NULL, *region_tmp; + region_list_t * region_elt = NULL, *region_tmp; int real_bb_cnt = 0, real_lustre_cnt = 0; int write_to_bb_cnt = 0; int count; @@ -2906,7 +2906,7 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) hg_return_t hg_ret; perr_t ret_value = SUCCEED; uint32_t server_id = 0; - pdc_metadata_t *region_meta = NULL; + pdc_metadata_t * region_meta = NULL; hg_handle_t update_region_loc_handle; update_region_loc_in_t in; server_lookup_args_t lookup_args; @@ -2982,7 +2982,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ int i; uint64_t obj_id = 0; update_region_storage_meta_bulk_t *curr_buf_ptr; - uint64_t *obj_id_ptr; + uint64_t * obj_id_ptr; // Sanity check if (NULL == region || region->storage_location[0] == 0 || NULL == region->meta) { @@ -3057,8 +3057,8 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk perr_t ret_value = SUCCEED; int i; - pdc_metadata_t *target_meta = NULL; - region_list_t *region_elt = NULL, *new_region = NULL; + pdc_metadata_t * target_meta = NULL; + region_list_t * region_elt = NULL, *new_region = NULL; update_region_storage_meta_bulk_t *bulk_ptr; int update_success = 0, express_insert = 0; uint64_t obj_id; @@ -3167,7 +3167,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) int i; uint32_t server_id = 0; update_region_storage_meta_bulk_t *recv_buf = NULL; - void **all_meta = NULL; + void ** all_meta = NULL; #endif #ifdef ENABLE_MPI @@ -3215,9 +3215,9 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) } perr_t -PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t *bulk_data, perr_t (*cb)(), +PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * bulk_data, perr_t (*cb)(), update_storage_meta_list_t *meta_list_target, - int *n_updated) + int * n_updated) { FUNC_ENTER(NULL); @@ -3428,7 +3428,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re PGOTO_ERROR(FAIL, "fread failed"); *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { uint64_t buf_serialize_offset; /* fseek (fp, storage_offset, SEEK_SET); */ @@ -3509,8 +3509,8 @@ PDC_Server_read_one_region(region_list_t *read_region) size_t total_read_bytes = 0; uint32_t n_storage_regions = 0; region_list_t *region_elt; - FILE *fp_read = NULL; - char *prev_path = NULL; + FILE * fp_read = NULL; + char * prev_path = NULL; int is_shm_created = 0, is_read_succeed = 0; #ifdef ENABLE_TIMING double fopen_time; @@ -3628,8 +3628,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) uint64_t offset = 0; uint32_t i = 0; region_list_t *region_elt = NULL, *previous_region = NULL; - FILE *fp_read = NULL, *fp_write = NULL; - char *prev_path = NULL; + FILE * fp_read = NULL, *fp_write = NULL; + char * prev_path = NULL; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; #endif @@ -4054,11 +4054,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; data_server_region_t *region = NULL; - region_list_t *overlap_region = NULL; + region_list_t * overlap_region = NULL; int is_contained = 0; uint64_t i, j, pos; - uint64_t *overlap_offset, *overlap_size; - char *tmp_buf; + uint64_t * overlap_offset, *overlap_size; + char * tmp_buf; #if 0 size_t total_write_size = 0, local_write_size; int is_overlap; @@ -4317,11 +4317,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, if (is_contained == 0) { request_region->offset = lseek(region->fd, 0, SEEK_END); #ifdef ENABLE_ZFP - zfp_field *field; + zfp_field * field; zfp_stream *zfp; size_t bufsize; - void *buffer; - bitstream *stream; + void * buffer; + bitstream * stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4391,10 +4391,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; ssize_t request_bytes = unit; data_server_region_t *region = NULL; - region_list_t *elt; + region_list_t * elt; uint64_t i, j, pos; - uint64_t *overlap_offset, *overlap_size; - char *tmp_buf; + uint64_t * overlap_offset, *overlap_size; + char * tmp_buf; #ifdef PDC_TIMING double start = MPI_Wtime(), start_posix; @@ -4480,10 +4480,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_ZFP // Uncompress the data - zfp_field *field; + zfp_field * field; zfp_stream *zfp; size_t bufsize, decompress_size; - bitstream *stream; + bitstream * stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4727,7 +4727,7 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args perr_t ret_value = SUCCEED; pdc_metadata_t *meta = NULL; - region_list_t *region_elt = NULL, *region_head = NULL, *res_region_list = NULL; + region_list_t * region_elt = NULL, *region_head = NULL, *res_region_list = NULL; int region_count = 0, i = 0; // FIXME: currently use timestep value of 0 @@ -4842,7 +4842,7 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t perr_t ret_value = SUCCEED; accumulate_storage_meta_t *accu_meta; - region_list_t *req_region = NULL, *region_elt = NULL, *read_list_head = NULL; + region_list_t * req_region = NULL, *region_elt = NULL, *read_list_head = NULL; int i, is_sort_read; size_t j; @@ -5006,16 +5006,16 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac hg_return_t hg_ret = HG_SUCCESS; perr_t ret_value; - storage_meta_name_query_in_t *args; + storage_meta_name_query_in_t * args; storage_meta_query_one_name_args_t *query_args; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; bulk_rpc_in_t bulk_rpc_in; - void **buf_ptrs; - hg_size_t *buf_sizes; + void ** buf_ptrs; + hg_size_t * buf_sizes; uint32_t server_id; - region_info_transfer_t **region_infos; - region_list_t *region_elt; + region_info_transfer_t ** region_infos; + region_list_t * region_elt; int i, j; args = (storage_meta_name_query_in_t *)callback_info->arg; @@ -5135,9 +5135,9 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) perr_t ret_value = SUCCEED; int i, j; - region_storage_meta_t *storage_metas = (region_storage_meta_t *)buf_cp; + region_storage_meta_t * storage_metas = (region_storage_meta_t *)buf_cp; pdc_data_server_io_list_t *io_list_elt, *io_list_target; - region_list_t *new_region; + region_list_t * new_region; #ifdef ENABLE_MULTITHREAD hg_thread_mutex_lock(&data_read_list_mutex_g); @@ -5248,7 +5248,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) perr_t ret_value = SUCCEED; uint64_t offset, read_bytes; - FILE *fp_read = NULL; + FILE * fp_read = NULL; if (region->is_data_ready == 1) FUNC_LEAVE(SUCCEED); @@ -5291,9 +5291,9 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) perr_t ret_value = SUCCEED; region_list_t *region_elt; - char *prev_path = NULL; + char * prev_path = NULL; uint64_t offset, read_bytes; - FILE *fp_read = NULL; + FILE * fp_read = NULL; int read_count = 0; @@ -5434,8 +5434,8 @@ PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_com FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - region_list_t *req_region = NULL, *region_tmp = NULL; - region_list_t *storage_region_list_head = NULL; + region_list_t * req_region = NULL, *region_tmp = NULL; + region_list_t * storage_region_list_head = NULL; pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; uint64_t obj_id; int iter, count, is_same_region, i, can_skip; @@ -5705,7 +5705,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE *edata = (TYPE *)(_data); \ + TYPE * edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -5841,7 +5841,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE *edata = (TYPE *)(_data); \ + TYPE * edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -5998,11 +5998,11 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast char keyName[128]; char offName[128]; char out_name[256]; - double *keys = NULL; - int64_t *offsets = NULL; + double * keys = NULL; + int64_t * offsets = NULL; uint32_t *bms = NULL; uint64_t nk = 0, no = 0, nb = 0; - FILE *fp; + FILE * fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6088,7 +6088,7 @@ queryData(const char *name) FUNC_ENTER(NULL); uint64_t nhits, i; - uint64_t *buf; + uint64_t * buf; double val1 = 0.0, val2 = 10.0; FastBitSelectionHandle sel1 = fastbit_selection_osr(name, FastBitCompareGreater, val1); FastBitSelectionHandle sel2 = fastbit_selection_osr(name, FastBitCompareLess, val2); @@ -6126,7 +6126,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i char offName[128]; char out_name[256]; uint64_t nk = 0, no = 0, nb = 0, size; - FILE *fp; + FILE * fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6203,9 +6203,9 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, perr_t ret_value = SUCCEED; FastBitDataType ft = 0; uint64_t type_size; - uint32_t *bms = NULL; - double *keys = NULL; - int64_t *offsets = NULL; + uint32_t * bms = NULL; + double * keys = NULL; + int64_t * offsets = NULL; int timestep; double v1, v2; size_t i; @@ -6372,7 +6372,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - region_list_t *region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; + region_list_t * region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; pdc_selection_t *sel = query->sel; uint64_t nelem; size_t i, j, unit_size; @@ -6386,7 +6386,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ uint32_t ulo = 0, uhi = 0; int64_t i64lo = 0, i64hi = 0; uint64_t ui64lo = 0, ui64hi = 0; - void *value = NULL, *buf = NULL; + void * value = NULL, *buf = NULL; int n_eval_region = 0, can_skip, region_iter = 0; LOG_INFO("Start query evaluation\n"); @@ -6712,7 +6712,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ n_eval_region++; } // End DL_FOREACH - } // End not use fastbit + } // End not use fastbit if (n_eval_region == 0 && combine_op == PDC_QUERY_AND) { if (sel->nhits > 0) { @@ -7026,7 +7026,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) hg_bulk_t bulk_handle; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; int client_id; client_id = task->client_id; @@ -7091,7 +7091,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; int server_id; server_id = task->manager; @@ -7268,9 +7268,9 @@ PDC_Server_read_coords(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - query_task_t *task = (query_task_t *)callback_info->arg; + query_task_t * task = (query_task_t *)callback_info->arg; pdc_query_constraint_t *constraint; - region_list_t *storage_region_head, *region_elt, *cache_region; + region_list_t * storage_region_head, *region_elt, *cache_region; size_t ndim, unit_size; uint64_t i, *coord, data_off, buf_off, my_size; @@ -7331,11 +7331,11 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t *task_elt = NULL; + query_task_t * task_elt = NULL; uint64_t nhits, obj_id; uint32_t ndim; int query_id, origin; - void *buf; + void * buf; pdc_int_ret_t out; out.ret = 1; @@ -7407,7 +7407,7 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t *task_elt; + query_task_t * task_elt; uint64_t nhits = 0, total_hits; size_t ndim, unit_size; int i, query_id, origin, found_task; @@ -7613,7 +7613,7 @@ add_storage_region_to_buf(void **in_buf, uint64_t *buf_alloc, uint64_t *buf_off, FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - void *buf = *in_buf; + void * buf = *in_buf; uint64_t my_size, tmp_size; if (in_buf == NULL || *in_buf == NULL || region == NULL || buf_alloc == NULL || buf_off == NULL || @@ -7793,8 +7793,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in pdc_metadata_t *meta = NULL; int i, server_id, count, avg_count, nsent, nsent_server; - region_list_t *elt, *new_region = NULL; - void *region_bulk_buf; + region_list_t * elt, *new_region = NULL; + void * region_bulk_buf; uint64_t buf_alloc = 0, buf_off = 0; bulk_rpc_in_t header; @@ -7932,16 +7932,16 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - void *buf; - region_list_t *regions = NULL; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; + void * buf; + region_list_t * regions = NULL; int i, nregion, *loc_len_ptr, *has_hist_ptr, found_task; uint64_t buf_off, *offset_ptr = NULL, *size_ptr = NULL; - char *loc_ptr = NULL; + char * loc_ptr = NULL; region_info_transfer_t *region_info_ptr = NULL; - pdc_histogram_t *hist_ptr = NULL; - query_task_t *task_elt = NULL; - pdc_query_t *query = NULL; + pdc_histogram_t * hist_ptr = NULL; + query_task_t * task_elt = NULL; + pdc_query_t * query = NULL; pdc_int_ret_t out; out.ret = 1; @@ -8094,10 +8094,10 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; pdc_query_xfer_t *query_xfer = (pdc_query_xfer_t *)callback_info->arg; int obj_idx = 0; - uint64_t *obj_ids; - query_task_t *new_task = NULL, *task_elt; + uint64_t * obj_ids; + query_task_t * new_task = NULL, *task_elt; int query_id_exist = 0; - pdc_query_t *query; + pdc_query_t * query; query = PDC_deserialize_query(query_xfer); if (NULL == query) @@ -8197,7 +8197,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; if (server_id >= pdc_server_size_g) PGOTO_ERROR(FAIL, "server_id %d invalid", server_id); @@ -8285,12 +8285,12 @@ PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); hg_return_t ret_value = HG_SUCCESS; - get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t *task_elt, *task = NULL; + get_sel_data_rpc_in_t * in = (get_sel_data_rpc_in_t *)callback_info->arg; + query_task_t * task_elt, *task = NULL; uint64_t nhits, *coord, *coords = NULL, obj_id, buf_off, my_size, data_off, i; size_t ndim, unit_size; cache_storage_region_t *cache_region_elt; - region_list_t *storage_region_head = NULL, *cache_region, *region_elt; + region_list_t * storage_region_head = NULL, *cache_region, *region_elt; pdc_var_type_t data_type; // find task @@ -8373,8 +8373,8 @@ PDC_Server_recv_get_sel_data(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t *task_elt, *task = NULL; - pdc_metadata_t *meta; + query_task_t * task_elt, *task = NULL; + pdc_metadata_t * meta; struct hg_cb_info fake_callback_info = {0}; DL_FOREACH(query_task_list_head_g, task_elt) diff --git a/src/tests/misc/client_server.c b/src/tests/misc/client_server.c index 309fbc61e..a4efe8ac1 100644 --- a/src/tests/misc/client_server.c +++ b/src/tests/misc/client_server.c @@ -183,7 +183,7 @@ main(int argc, char **argv) size = 1; #endif - hg_class_t *hg_class = NULL; + hg_class_t * hg_class = NULL; hg_context_t *hg_context = NULL; hg_return_t hg_ret = 0; From 4661d06410af426d932b95afae2ebf8457330d91 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 5 Jul 2025 01:30:52 -0400 Subject: [PATCH 3/8] client side HG_Finalize now passes on serial tests --- src/tests/region/region_transfer_all_append_3D.c | 7 +------ src/tests/region/region_transfer_all_split_wait.c | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/tests/region/region_transfer_all_append_3D.c b/src/tests/region/region_transfer_all_append_3D.c index e50bcd362..d1b6aa42b 100644 --- a/src/tests/region/region_transfer_all_append_3D.c +++ b/src/tests/region/region_transfer_all_append_3D.c @@ -86,11 +86,6 @@ main(int argc, char **argv) dims[1] = DIM1; dims[2] = DIM2; - // create a pdc - pdc = PDCinit("pdc"); - LOG_INFO("create a new pdc\n"); - - // create a container property // create a pdc TASSERT((pdc = PDCinit("pdc")) != 0, "Call to PDCinit succeeded", "Call to PDCinit failed"); // create a container property @@ -325,7 +320,7 @@ main(int argc, char **argv) TASSERT((obj[i] = PDCobj_open(obj_name, pdc)) != 0, "Call to PDCobj_open succeeded", "Call to PDCobj_open failed"); } - + TASSERT(PDCregion_close(reg) >= 0, "Call to PDCregion_close succeeded", "Call to PDCregion_close failed"); offset[0] = 0; diff --git a/src/tests/region/region_transfer_all_split_wait.c b/src/tests/region/region_transfer_all_split_wait.c index b583a20c2..894976329 100644 --- a/src/tests/region/region_transfer_all_split_wait.c +++ b/src/tests/region/region_transfer_all_split_wait.c @@ -70,10 +70,6 @@ main(int argc, char **argv) dims[0] = BUF_LEN; - // create a pdc - pdc = PDCinit("pdc"); - LOG_INFO("create a new pdc\n"); - // create a container property TASSERT((pdc = PDCinit("pdc")) != 0, "Call to PDCinit succeeded", "Call to PDCinit failed"); // create a container property From 32a1404d9962e99803f93347bbaaa7fc774551fa Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 5 Jul 2025 05:34:47 +0000 Subject: [PATCH 4/8] Committing clang-format changes --- src/tests/region/region_transfer_all_append_3D.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/region/region_transfer_all_append_3D.c b/src/tests/region/region_transfer_all_append_3D.c index d1b6aa42b..019a86fd4 100644 --- a/src/tests/region/region_transfer_all_append_3D.c +++ b/src/tests/region/region_transfer_all_append_3D.c @@ -320,7 +320,7 @@ main(int argc, char **argv) TASSERT((obj[i] = PDCobj_open(obj_name, pdc)) != 0, "Call to PDCobj_open succeeded", "Call to PDCobj_open failed"); } - + TASSERT(PDCregion_close(reg) >= 0, "Call to PDCregion_close succeeded", "Call to PDCregion_close failed"); offset[0] = 0; From dea97914a21917611390f8043260909bf6c7036f Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 5 Jul 2025 10:47:57 -0400 Subject: [PATCH 5/8] cleanup --- .gitignore | 5 +- src/api/pdc_region/pdc_region_transfer.c | 153 ++++++++++++++++------- 2 files changed, 115 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 89730e41e..0ccf616c8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ src/install # ignore vscode files .vscode +# ignore intellij files +.idea + # ignore macos files .DS_Store @@ -24,4 +27,4 @@ docs/build **/*venv # ignore .zed -.zed \ No newline at end of file +.zed diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 59a8885af..ccda46024 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -49,8 +49,10 @@ #define MAX_BULK_HANDLES 10 -// pdc region transfer class. Contains essential information for performing non-blocking PDC client I/O -// perations. +/** + * PDC region transfer class. Contains essential information for performing non-blocking PDC client I/O + * operations + */ typedef struct pdc_transfer_request { pdcid_t obj_id; pdcid_t local_obj_id; @@ -113,8 +115,11 @@ typedef struct pdc_transfer_request { int is_done; // list of bulk handles used for region request - hg_bulk_t bulk_handles[MAX_BULK_HANDLES]; - uint32_t num_bulk_handles; + hg_bulk_t* bulk_handles; + // current number of bulk handles stored in array + uint32_t num_bulk_handles; + // current length of the array + uint32_t bulk_handles_capacity; } pdc_transfer_request; // We pack all arguments for a start_all call to the same data server in a single structure, so we do not need @@ -151,6 +156,83 @@ typedef struct pdc_transfer_request_wait_all_pkg { struct pdc_transfer_request_wait_all_pkg *next; } pdc_transfer_request_wait_all_pkg; +#define REGION_TRANSFER_INIT_BULK_HANDLES 2 + +/** + * @brief Initialize a pdc_transfer_request's bulk handle array. + * + * This function allocates memory for an initial number of bulk handles in a transfer request. + * Each entry is initialized to HG_BULK_NULL. The initial capacity is set to + * REGION_TRANSFER_INIT_BULK_HANDLES. + * + * \param tr Pointer to a pdc_transfer_request structure to initialize. + * + * \return SUCCEED on success, FAIL on failure (e.g., if `tr` is NULL or memory allocation fails). + */ +perr_t PDCregion_transfer_init_bulk_handles(pdc_transfer_request* tr) +{ + FUNC_ENTER(NULL); + + perr_t ret_value = SUCCEED; + + if (tr == NULL) + PGOTO_ERROR(FAIL, "tr was NULL"); + + tr->bulk_handles_capacity = REGION_TRANSFER_INIT_BULK_HANDLES; + tr->num_bulk_handles = 0; + tr->bulk_handles = (hg_bulk_t*)PDC_malloc(sizeof(hg_bulk_t) * tr->bulk_handles_capacity); + + for (int i = 0; i < tr->bulk_handles_capacity; i++) + tr->bulk_handles[i] = HG_BULK_NULL; + +done: + FUNC_LEAVE(ret_value); +} + +/** + * @brief Add a new bulk handle to a transfer request. + * + * If the internal array is full, it reallocates the array with increased capacity + * (doubling it each time). New elements are initialized to HG_BULK_NULL. + * + * \param tr Pointer to a pdc_transfer_request structure where the bulk handle should be added. + * \param bulk_handle The bulk handle to add to the transfer request. + * + * \return SUCCEED on success, FAIL on error (e.g., invalid input or reallocation failure). + */ +perr_t PDCregion_transfer_add_bulk_handle(pdc_transfer_request* tr, hg_bulk_t bulk_handle) +{ + FUNC_ENTER(NULL); + + perr_t ret_value = SUCCEED; + + if (tr == NULL) + PGOTO_ERROR(FAIL, "Invalid pdc transfer request"); + if (tr->bulk_handles == NULL && tr->num_bulk_handles > 0) + PGOTO_ERROR(FAIL, "PDC transfer request has bulk handles but bulk_handles is NULL"); + + // Grow array if needed + if (tr->num_bulk_handles >= tr->bulk_handles_capacity) { + size_t new_capacity = tr->bulk_handles_capacity > 0 ? tr->bulk_handles_capacity * 2 : REGION_TRANSFER_INIT_BULK_HANDLES; + hg_bulk_t* new_array = (hg_bulk_t*)PDC_realloc(tr->bulk_handles, new_capacity * sizeof(hg_bulk_t)); + if (new_array == NULL) + PGOTO_ERROR(FAIL, "Failed to reallocate bulk handle array"); + + // Initialize the new slots to HG_BULK_NULL + for (size_t i = tr->bulk_handles_capacity; i < new_capacity; i++) + new_array[i] = HG_BULK_NULL; + + tr->bulk_handles = new_array; + tr->bulk_handles_capacity = new_capacity; + } + + tr->bulk_handles[tr->num_bulk_handles] = bulk_handle; + tr->num_bulk_handles++; + +done: + FUNC_LEAVE(ret_value); +} + static int sort_by_data_server_start_all(const void *elem1, const void *elem2) { @@ -253,9 +335,7 @@ PDCregion_transfer_create(void *buf, pdc_access_t access_type, pdcid_t obj_id, p p->consistency = obj2->obj_pt->obj_prop_pub->consistency; p->merged_request_id = 0; p->is_done = 0; - p->num_bulk_handles = 0; - for (int i = 0; i < MAX_BULK_HANDLES; i++) - p->bulk_handles[i] = HG_BULK_NULL; + PDCregion_transfer_init_bulk_handles(p); unit = p->unit; p->local_region_ndim = reg1->ndim; @@ -765,6 +845,7 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i *transfer_request_end, **transfer_request_output, *previous = NULL; uint64_t total_buf_size, output_buf_size, query_id; char * buf, *output_buf; + hg_bulk_t bulk_handle; transfer_request_output = NULL; transfer_request_front_head = NULL; @@ -789,21 +870,18 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i transfer_requests[i - 1]->transfer_request->metadata_server_id) { n_objs = i - index; pack_region_metadata_query(transfer_requests + index, n_objs, &buf, &total_buf_size); - pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; - hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query( - bulk_handle, buf, total_buf_size, n_objs, + &bulk_handle, buf, total_buf_size, n_objs, transfer_requests[index]->transfer_request->metadata_server_id, is_write, &output_buf_size, &query_id); - transfer_request->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); buf = (char *)PDC_free(buf); if (query_id) { output_buf = (char *)PDC_malloc(output_buf_size); - bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query2( - bulk_handle, output_buf, output_buf_size, query_id, + &bulk_handle, output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); - transfer_request->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); unpack_region_metadata_query(output_buf, transfer_requests + index, &transfer_request_head, &transfer_request_end, &output_size); output_buf = (char *)PDC_free(output_buf); @@ -822,22 +900,19 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i if (size) { n_objs = size - index; pack_region_metadata_query(transfer_requests + index, n_objs, &buf, &total_buf_size); - pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; - hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query( - bulk_handle, buf, total_buf_size, n_objs, + &bulk_handle, buf, total_buf_size, n_objs, transfer_requests[index]->transfer_request->metadata_server_id, is_write, &output_buf_size, &query_id); - transfer_request->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); buf = (char *)PDC_free(buf); // If it is a valid query ID, then it means regions are overlapping. if (query_id) { output_buf = (char *)PDC_malloc(output_buf_size); - bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_metadata_query2( - bulk_handle, output_buf, output_buf_size, query_id, + &bulk_handle, output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); - transfer_request->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); unpack_region_metadata_query(output_buf, transfer_requests + index, &transfer_request_head, &transfer_request_end, &output_size); output_buf = (char *)PDC_free(output_buf); @@ -1225,6 +1300,7 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ char * bulk_buf; size_t bulk_buf_size; int * bulk_buf_ref; + hg_bulk_t bulk_handle; if (size == 0) PGOTO_DONE(ret_value); @@ -1241,13 +1317,10 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ &bulk_buf_size, read_bulk_buf + index); bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); bulk_buf_ref[0] = n_objs; - pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; - hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_all( - bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, + &bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); - transfer_request->num_bulk_handles++; - + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); for (j = index; j < i; ++j) { // All requests share the same bulk buffer, reference counter is also shared among all // requests. @@ -1272,12 +1345,10 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ &bulk_buf_size, read_bulk_buf + index); bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); bulk_buf_ref[0] = n_objs; - pdc_transfer_request *transfer_request = transfer_requests[index]->transfer_request; - hg_bulk_t *bulk_handle = &transfer_request->bulk_handles[transfer_request->num_bulk_handles]; PDC_Client_transfer_request_all( - bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, + &bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); - transfer_request->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); for (j = index; j < size; ++j) { // All requests share the same bulk buffer, reference counter is also shared among all @@ -1503,6 +1574,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, pdc_transfer_request *transfer_request; size_t unit; int i; + hg_bulk_t bulk_handle; transferinfo = PDC_find_id(transfer_request_id); if (NULL == transferinfo) @@ -1564,12 +1636,12 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, transfer_request->read_bulk_buf[i] = transfer_request->output_buf[i]; } ret_value = PDC_Client_transfer_request( - &transfer_request->bulk_handles[transfer_request->num_bulk_handles], + &bulk_handle, transfer_request->output_buf[i], transfer_request->obj_id, transfer_request->obj_servers[i], transfer_request->obj_ndim, transfer_request->obj_dims, transfer_request->remote_region_ndim, transfer_request->output_offsets[i], transfer_request->output_sizes[i], unit, transfer_request->access_type, transfer_request->metadata_id + i); - transfer_request->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_request, bulk_handle); } } else if (transfer_request->region_partition == PDC_OBJ_STATIC) { @@ -1585,12 +1657,12 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, // Submit transfer request to server by designating data server ID, remote region info, and contiguous // memory buffer for copy. ret_value = PDC_Client_transfer_request( - &transfer_request->bulk_handles[transfer_request->num_bulk_handles], transfer_request->new_buf, + &bulk_handle, transfer_request->new_buf, transfer_request->obj_id, transfer_request->data_server_id, transfer_request->obj_ndim, transfer_request->obj_dims, transfer_request->remote_region_ndim, transfer_request->remote_region_offset, transfer_request->remote_region_size, unit, transfer_request->access_type, transfer_request->metadata_id); - transfer_request->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_request, bulk_handle); } // For POSIX consistency, we block here until the data is received by the server @@ -1767,6 +1839,7 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) uint64_t * metadata_ids, merge_off = 0, cur_off = 0; pdc_transfer_request_wait_all_pkg **transfer_requests, *transfer_request_head, *transfer_request_end, *temp; + hg_bulk_t bulk_handle; struct _pdc_id_info **transferinfo; pdc_transfer_request *transfer_request, *merged_request; @@ -1856,11 +1929,9 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) metadata_ids[j] = transfer_requests[j]->metadata_id; } - pdc_transfer_request *tr = transfer_requests[index]->transfer_request; - hg_bulk_t * bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; - PDC_Client_transfer_request_wait_all(bulk_handle, n_objs, metadata_ids + index, + PDC_Client_transfer_request_wait_all(&bulk_handle, n_objs, metadata_ids + index, transfer_requests[index]->data_server_id); - tr->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); for (j = index; j < i; ++j) { if (transfer_requests[j]->transfer_request->region_partition == PDC_REGION_STATIC || transfer_requests[j]->transfer_request->region_partition == PDC_REGION_DYNAMIC || @@ -1901,11 +1972,9 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) for (j = index; j < total_requests; ++j) { metadata_ids[j] = transfer_requests[j]->metadata_id; } - pdc_transfer_request *tr = transfer_requests[index]->transfer_request; - hg_bulk_t * bulk_handle = &tr->bulk_handles[tr->num_bulk_handles]; - PDC_Client_transfer_request_wait_all(bulk_handle, n_objs, metadata_ids + index, + PDC_Client_transfer_request_wait_all(&bulk_handle, n_objs, metadata_ids + index, transfer_requests[index]->data_server_id); - tr->num_bulk_handles++; + PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); for (j = index; j < total_requests; ++j) { if (transfer_requests[j]->transfer_request->region_partition == PDC_REGION_STATIC || transfer_requests[j]->transfer_request->region_partition == PDC_REGION_DYNAMIC || From 659d5cd95af43c025d56abf04cef560c50524722 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 5 Jul 2025 14:48:18 +0000 Subject: [PATCH 6/8] Committing clang-format changes --- src/api/pdc_region/pdc_region_transfer.c | 57 +++++++++++++----------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index ccda46024..19dbff832 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -115,7 +115,7 @@ typedef struct pdc_transfer_request { int is_done; // list of bulk handles used for region request - hg_bulk_t* bulk_handles; + hg_bulk_t *bulk_handles; // current number of bulk handles stored in array uint32_t num_bulk_handles; // current length of the array @@ -169,7 +169,8 @@ typedef struct pdc_transfer_request_wait_all_pkg { * * \return SUCCEED on success, FAIL on failure (e.g., if `tr` is NULL or memory allocation fails). */ -perr_t PDCregion_transfer_init_bulk_handles(pdc_transfer_request* tr) +perr_t +PDCregion_transfer_init_bulk_handles(pdc_transfer_request *tr) { FUNC_ENTER(NULL); @@ -179,8 +180,8 @@ perr_t PDCregion_transfer_init_bulk_handles(pdc_transfer_request* tr) PGOTO_ERROR(FAIL, "tr was NULL"); tr->bulk_handles_capacity = REGION_TRANSFER_INIT_BULK_HANDLES; - tr->num_bulk_handles = 0; - tr->bulk_handles = (hg_bulk_t*)PDC_malloc(sizeof(hg_bulk_t) * tr->bulk_handles_capacity); + tr->num_bulk_handles = 0; + tr->bulk_handles = (hg_bulk_t *)PDC_malloc(sizeof(hg_bulk_t) * tr->bulk_handles_capacity); for (int i = 0; i < tr->bulk_handles_capacity; i++) tr->bulk_handles[i] = HG_BULK_NULL; @@ -200,7 +201,8 @@ perr_t PDCregion_transfer_init_bulk_handles(pdc_transfer_request* tr) * * \return SUCCEED on success, FAIL on error (e.g., invalid input or reallocation failure). */ -perr_t PDCregion_transfer_add_bulk_handle(pdc_transfer_request* tr, hg_bulk_t bulk_handle) +perr_t +PDCregion_transfer_add_bulk_handle(pdc_transfer_request *tr, hg_bulk_t bulk_handle) { FUNC_ENTER(NULL); @@ -213,8 +215,9 @@ perr_t PDCregion_transfer_add_bulk_handle(pdc_transfer_request* tr, hg_bulk_t bu // Grow array if needed if (tr->num_bulk_handles >= tr->bulk_handles_capacity) { - size_t new_capacity = tr->bulk_handles_capacity > 0 ? tr->bulk_handles_capacity * 2 : REGION_TRANSFER_INIT_BULK_HANDLES; - hg_bulk_t* new_array = (hg_bulk_t*)PDC_realloc(tr->bulk_handles, new_capacity * sizeof(hg_bulk_t)); + size_t new_capacity = + tr->bulk_handles_capacity > 0 ? tr->bulk_handles_capacity * 2 : REGION_TRANSFER_INIT_BULK_HANDLES; + hg_bulk_t *new_array = (hg_bulk_t *)PDC_realloc(tr->bulk_handles, new_capacity * sizeof(hg_bulk_t)); if (new_array == NULL) PGOTO_ERROR(FAIL, "Failed to reallocate bulk handle array"); @@ -222,7 +225,7 @@ perr_t PDCregion_transfer_add_bulk_handle(pdc_transfer_request* tr, hg_bulk_t bu for (size_t i = tr->bulk_handles_capacity; i < new_capacity; i++) new_array[i] = HG_BULK_NULL; - tr->bulk_handles = new_array; + tr->bulk_handles = new_array; tr->bulk_handles_capacity = new_capacity; } @@ -843,8 +846,8 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i pdc_transfer_request_start_all_pkg **transfer_requests; pdc_transfer_request_start_all_pkg * transfer_request_head, *transfer_request_front_head, *transfer_request_end, **transfer_request_output, *previous = NULL; - uint64_t total_buf_size, output_buf_size, query_id; - char * buf, *output_buf; + uint64_t total_buf_size, output_buf_size, query_id; + char * buf, *output_buf; hg_bulk_t bulk_handle; transfer_request_output = NULL; @@ -877,7 +880,7 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); buf = (char *)PDC_free(buf); if (query_id) { - output_buf = (char *)PDC_malloc(output_buf_size); + output_buf = (char *)PDC_malloc(output_buf_size); PDC_Client_transfer_request_metadata_query2( &bulk_handle, output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); @@ -908,7 +911,7 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i buf = (char *)PDC_free(buf); // If it is a valid query ID, then it means regions are overlapping. if (query_id) { - output_buf = (char *)PDC_malloc(output_buf_size); + output_buf = (char *)PDC_malloc(output_buf_size); PDC_Client_transfer_request_metadata_query2( &bulk_handle, output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); @@ -1315,8 +1318,8 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ PDC_Client_pack_all_requests(n_objs, transfer_requests + index, transfer_requests[index]->transfer_request->access_type, &bulk_buf, &bulk_buf_size, read_bulk_buf + index); - bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); - bulk_buf_ref[0] = n_objs; + bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); + bulk_buf_ref[0] = n_objs; PDC_Client_transfer_request_all( &bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); @@ -1343,8 +1346,8 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ PDC_Client_pack_all_requests(n_objs, transfer_requests + index, transfer_requests[index]->transfer_request->access_type, &bulk_buf, &bulk_buf_size, read_bulk_buf + index); - bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); - bulk_buf_ref[0] = n_objs; + bulk_buf_ref = (int *)PDC_malloc(sizeof(int)); + bulk_buf_ref[0] = n_objs; PDC_Client_transfer_request_all( &bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); @@ -1574,7 +1577,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, pdc_transfer_request *transfer_request; size_t unit; int i; - hg_bulk_t bulk_handle; + hg_bulk_t bulk_handle; transferinfo = PDC_find_id(transfer_request_id); if (NULL == transferinfo) @@ -1636,11 +1639,11 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, transfer_request->read_bulk_buf[i] = transfer_request->output_buf[i]; } ret_value = PDC_Client_transfer_request( - &bulk_handle, - transfer_request->output_buf[i], transfer_request->obj_id, transfer_request->obj_servers[i], - transfer_request->obj_ndim, transfer_request->obj_dims, transfer_request->remote_region_ndim, - transfer_request->output_offsets[i], transfer_request->output_sizes[i], unit, - transfer_request->access_type, transfer_request->metadata_id + i); + &bulk_handle, transfer_request->output_buf[i], transfer_request->obj_id, + transfer_request->obj_servers[i], transfer_request->obj_ndim, transfer_request->obj_dims, + transfer_request->remote_region_ndim, transfer_request->output_offsets[i], + transfer_request->output_sizes[i], unit, transfer_request->access_type, + transfer_request->metadata_id + i); PDCregion_transfer_add_bulk_handle(transfer_request, bulk_handle); } } @@ -1657,11 +1660,11 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, // Submit transfer request to server by designating data server ID, remote region info, and contiguous // memory buffer for copy. ret_value = PDC_Client_transfer_request( - &bulk_handle, transfer_request->new_buf, - transfer_request->obj_id, transfer_request->data_server_id, transfer_request->obj_ndim, - transfer_request->obj_dims, transfer_request->remote_region_ndim, - transfer_request->remote_region_offset, transfer_request->remote_region_size, unit, - transfer_request->access_type, transfer_request->metadata_id); + &bulk_handle, transfer_request->new_buf, transfer_request->obj_id, + transfer_request->data_server_id, transfer_request->obj_ndim, transfer_request->obj_dims, + transfer_request->remote_region_ndim, transfer_request->remote_region_offset, + transfer_request->remote_region_size, unit, transfer_request->access_type, + transfer_request->metadata_id); PDCregion_transfer_add_bulk_handle(transfer_request, bulk_handle); } From 8d4db095d434a6e8ee847b8154c30443f8bb86e2 Mon Sep 17 00:00:00 2001 From: Noah Lewis <47840925+TheAssembler1@users.noreply.github.com> Date: Sat, 5 Jul 2025 10:49:36 -0400 Subject: [PATCH 7/8] Update pdc_region_transfer.c --- src/api/pdc_region/pdc_region_transfer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 19dbff832..8c263bda3 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -47,8 +47,6 @@ #define PDC_MERGE_TRANSFER_MIN_COUNT 50 -#define MAX_BULK_HANDLES 10 - /** * PDC region transfer class. Contains essential information for performing non-blocking PDC client I/O * operations From bb9141047cc348f0c54d709783ddf3d1de9de8fe Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 5 Jul 2025 11:01:13 -0400 Subject: [PATCH 8/8] free bulk handles during region transfer close --- src/api/pdc_region/pdc_region_transfer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 8c263bda3..98c4aa98b 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -386,7 +386,6 @@ PDCregion_transfer_close(pdcid_t transfer_request_id) PGOTO_DONE(ret_value); transfer_request = (pdc_transfer_request *)(transferinfo->obj_ptr); - LOG_INFO("Freeing %d bulk handles\n", transfer_request->num_bulk_handles); for (int i = 0; i < transfer_request->num_bulk_handles; i++) { if (transfer_request->bulk_handles[i] == HG_BULK_NULL) LOG_WARNING("Bulk handle added to transfer request was NULL\n"); @@ -397,7 +396,8 @@ PDCregion_transfer_close(pdcid_t transfer_request_id) transfer_request->bulk_handles[i] = HG_BULK_NULL; } } - + if (transfer_request->bulk_handles) + transfer_request->bulk_handles = PDC_free(transfer_request->bulk_handles); if (transfer_request->local_region_offset) transfer_request->local_region_offset = (uint64_t *)PDC_free(transfer_request->local_region_offset); if (transfer_request->metadata_id)