From 875a174625f8b0031653e97bc5897dcbd4751d5c Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 16 Sep 2025 15:09:42 -0400 Subject: [PATCH 1/5] rename collective calls prefix with _coll --- docs/source/api.rst | 4 +- examples/bdcats.c | 36 +-- examples/bdcats_batch.c | 30 +-- examples/haccio.c | 8 +- examples/haccio_v2.c | 8 +- examples/read_write_col_perf.c | 2 +- examples/tileio.c | 6 +- examples/tileio_v2.c | 4 +- examples/vpicio.c | 24 +- examples/vpicio_batch.c | 26 +- examples/vpicio_old.c | 24 +- src/api/include/pdc_client_connect.h | 36 +-- src/api/pdc_client_connect.c | 238 ++++++++-------- src/api/pdc_meta/pdc_metadata_client.c | 6 +- src/api/pdc_obj/include/pdc_cont.h | 6 +- src/api/pdc_obj/include/pdc_mpi.h | 4 +- src/api/pdc_obj/include/pdc_obj.h | 2 +- src/api/pdc_obj/pdc_cont.c | 24 +- src/api/pdc_obj/pdc_mpi.c | 8 +- src/api/pdc_obj/pdc_obj.c | 46 ++-- src/api/pdc_region/include/pdc_region.h | 12 +- src/api/pdc_region/pdc_region_transfer.c | 68 ++--- .../include/pdc_server_data.h | 88 +++--- .../pdc_server_region/pdc_server_data.c | 254 +++++++++--------- src/tests/cont/cont_getid.c | 4 +- src/tests/cont/create_cont_coll.c | 4 +- src/tests/cont/open_cont.c | 4 +- src/tests/deprecated/blocked_lock.c | 4 +- src/tests/deprecated/buf_map_mpi_v2.c | 4 +- src/tests/deprecated/buf_obj_map_mpi.c | 6 +- src/tests/deprecated/obj_transformation.c | 28 +- src/tests/deprecated/vpicio_old.c | 24 +- src/tests/deprecated/vpicio_v2.c | 30 +-- src/tests/misc/llsm_idioms_bench.c | 22 +- src/tests/misc/producer_waitall.c | 2 +- src/tests/misc/read_write_col_perf.c | 2 +- src/tests/misc/vpicio.c | 42 +-- src/tests/misc/vpicio_mts.c | 24 +- src/tests/obj/create_obj_coll.c | 4 +- src/tests/obj/create_obj_scale.c | 6 +- src/tests/obj/obj_life.c | 4 +- src/tests/obj/obj_round_robin_io.c | 4 +- src/tests/obj/obj_round_robin_io_all.c | 4 +- src/tests/obj/open_obj_round_robin.c | 2 +- src/tests/obj/read_obj.c | 8 +- src/tests/obj/read_obj_shared.c | 6 +- src/tests/obj/write_obj_shared.c | 4 +- src/tests/tags/kvtag_affix_query_scale.c | 14 +- src/tests/tags/kvtag_query.c | 12 +- src/tests/tags/kvtag_range_query_scale.c | 16 +- src/tools/pdc_access_eqsim.c | 6 +- src/tools/pdc_import_eqsim.c | 4 +- src/tools/pdc_query_eqsim.c | 4 +- 53 files changed, 631 insertions(+), 631 deletions(-) diff --git a/docs/source/api.rst b/docs/source/api.rst index 56de98045..ceec46738 100644 --- a/docs/source/api.rst +++ b/docs/source/api.rst @@ -48,7 +48,7 @@ PDC container APIs For developers: currently implemented in `pdc_cont.c`. This function will send a name to server and receive a container id. This function will allocate necessary memories and initialize properties for a container. -.. function:: pdcid_t PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id) +.. function:: pdcid_t PDCcont_create_coll(const char *cont_name, pdcid_t cont_prop_id) :param cont_name: the name to be assigned to a container. e.g "c1", "c2" :param cont_prop_id: property ID for inheriting a PDC property for container. @@ -201,7 +201,7 @@ PDC object APIs For developers: see `pdc_obj.c`. -.. function:: pdcid_t PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm) +.. function:: pdcid_t PDCobj_create_coll(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm) :param cont_id: Container ID, returned from ``PDCcont_create``. :param obj_name: Name of the object to be created. diff --git a/examples/bdcats.c b/examples/bdcats.c index cd1f1e95f..5106bb1ea 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -57,9 +57,9 @@ main(int argc, char **argv) pdcid_t region_xx, region_yy, region_zz, region_pxx, region_pyy, region_pzz, region_id11, region_id22; perr_t ret; - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; uint64_t numparticles; int ndim = 1; uint64_t *offset; @@ -101,63 +101,63 @@ main(int argc, char **argv) if (cont_id == 0) LOG_ERROR("Failed to create container"); - // open objects + // open objects #ifdef ENABLE_MPI - obj_xx = PDCobj_open_col("obj-var-xx", pdc_id); + obj_xx = PDCobj_open_coll("obj-var-xx", pdc_id); #else - obj_xx = PDCobj_open("obj-var-xx", pdc_id); + obj_xx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_xx == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-xx"); exit(-1); } #ifdef ENABLE_MPI - obj_yy = PDCobj_open_col("obj-var-yy", pdc_id); + obj_yy = PDCobj_open_coll("obj-var-yy", pdc_id); #else - obj_yy = PDCobj_open("obj-var-xx", pdc_id); + obj_yy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_yy == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-yy"); exit(-1); } #ifdef ENABLE_MPI - obj_zz = PDCobj_open_col("obj-var-zz", pdc_id); + obj_zz = PDCobj_open_coll("obj-var-zz", pdc_id); #else - obj_zz = PDCobj_open("obj-var-xx", pdc_id); + obj_zz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_zz == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-zz"); exit(-1); } #ifdef ENABLE_MPI - obj_pxx = PDCobj_open_col("obj-var-pxx", pdc_id); + obj_pxx = PDCobj_open_coll("obj-var-pxx", pdc_id); #else - obj_pxx = PDCobj_open("obj-var-xx", pdc_id); + obj_pxx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pxx == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-pxx"); exit(-1); } #ifdef ENABLE_MPI - obj_pyy = PDCobj_open_col("obj-var-pyy", pdc_id); + obj_pyy = PDCobj_open_coll("obj-var-pyy", pdc_id); #else - obj_pyy = PDCobj_open("obj-var-xx", pdc_id); + obj_pyy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pyy == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-pyy"); exit(-1); } #ifdef ENABLE_MPI - obj_pzz = PDCobj_open_col("obj-var-pzz", pdc_id); + obj_pzz = PDCobj_open_coll("obj-var-pzz", pdc_id); #else - obj_pzz = PDCobj_open("obj-var-xx", pdc_id); + obj_pzz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pzz == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-pzz"); exit(-1); } #ifdef ENABLE_MPI - obj_id11 = PDCobj_open_col("id11", pdc_id); + obj_id11 = PDCobj_open_coll("id11", pdc_id); #else obj_id11 = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -166,7 +166,7 @@ main(int argc, char **argv) exit(-1); } #ifdef ENABLE_MPI - obj_id22 = PDCobj_open_col("id22", pdc_id); + obj_id22 = PDCobj_open_coll("id22", pdc_id); #else obj_id22 = PDCobj_open("obj-var-xx", pdc_id); #endif diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index e69aef296..bdd772950 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -66,7 +66,7 @@ main(int argc, char **argv) char obj_name[128]; float *x, *y, *z; float *px, *py, *pz; - int * id1, *id2; + int *id1, *id2; // int x_dim = 64; // int y_dim = 64; // int z_dim = 64; @@ -175,9 +175,9 @@ main(int argc, char **argv) for (i = 0; i < timestep; ++i) { sprintf(obj_name, "obj-var-xx %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_xx[i] = PDCobj_open_col(obj_name, pdc_id); + obj_xx[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_xx[i] = PDCobj_open(obj_name, pdc_id); + obj_xx[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_xx[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); @@ -185,9 +185,9 @@ main(int argc, char **argv) } sprintf(obj_name, "obj-var-yy %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_yy[i] = PDCobj_open_col(obj_name, pdc_id); + obj_yy[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_yy[i] = PDCobj_open(obj_name, pdc_id); + obj_yy[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_yy[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); @@ -195,9 +195,9 @@ main(int argc, char **argv) } sprintf(obj_name, "obj-var-zz %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_zz[i] = PDCobj_open_col(obj_name, pdc_id); + obj_zz[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_zz[i] = PDCobj_open(obj_name, pdc_id); + obj_zz[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_zz[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); @@ -205,9 +205,9 @@ main(int argc, char **argv) } sprintf(obj_name, "obj-var-pxx %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_pxx[i] = PDCobj_open_col(obj_name, pdc_id); + obj_pxx[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_pxx[i] = PDCobj_open(obj_name, pdc_id); + obj_pxx[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pxx[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); @@ -215,9 +215,9 @@ main(int argc, char **argv) } sprintf(obj_name, "obj-var-pyy %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_pyy[i] = PDCobj_open_col(obj_name, pdc_id); + obj_pyy[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_pyy[i] = PDCobj_open(obj_name, pdc_id); + obj_pyy[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pyy[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); @@ -225,9 +225,9 @@ main(int argc, char **argv) } sprintf(obj_name, "obj-var-pzz %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_pzz[i] = PDCobj_open_col(obj_name, pdc_id); + obj_pzz[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_pzz[i] = PDCobj_open(obj_name, pdc_id); + obj_pzz[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pzz[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); @@ -235,7 +235,7 @@ main(int argc, char **argv) } sprintf(obj_name, "id11 %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_id11[i] = PDCobj_open_col(obj_name, pdc_id); + obj_id11[i] = PDCobj_open_coll(obj_name, pdc_id); #else obj_id11[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -245,7 +245,7 @@ main(int argc, char **argv) } sprintf(obj_name, "id22 %" PRIu64 "", i); #ifdef ENABLE_MPI - obj_id22[i] = PDCobj_open_col(obj_name, pdc_id); + obj_id22[i] = PDCobj_open_coll(obj_name, pdc_id); #else obj_id22[i] = PDCobj_open(obj_name, pdc_id); #endif diff --git a/examples/haccio.c b/examples/haccio.c index 81d06271a..94468611a 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -26,11 +26,11 @@ mask | int16 | 2 bytes * ------------------ */ -static char * VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; +static char *VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; static pdc_var_type_t VAR_TYPES[NUM_VARS] = {PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_INT64, PDC_INT16}; static int NUM_PARTICLES = (1 * 1024 * 1024); -void * buffers[NUM_VARS]; +void *buffers[NUM_VARS]; MPI_Comm comm; @@ -75,7 +75,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var PDCprop_set_obj_user_id(*obj_prop, getuid()); PDCprop_set_obj_app_name(*obj_prop, "HACCIO"); - pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm); + pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, comm); if (obj_id == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); @@ -117,7 +117,7 @@ main(int argc, char **argv) cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); uint64_t offset = 0, offset_remote = mpi_rank * NUM_PARTICLES, mysize = NUM_PARTICLES; diff --git a/examples/haccio_v2.c b/examples/haccio_v2.c index 2c444aba0..21d1ec341 100644 --- a/examples/haccio_v2.c +++ b/examples/haccio_v2.c @@ -26,11 +26,11 @@ mask | int16 | 2 bytes * ------------------ */ -static char * VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; +static char *VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; static pdc_var_type_t VAR_TYPES[NUM_VARS] = {PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_INT64, PDC_INT16}; static int NUM_PARTICLES = (1 * 1024 * 1024); -void * buffers[NUM_VARS]; +void *buffers[NUM_VARS]; MPI_Comm comm; @@ -76,7 +76,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var PDCprop_set_obj_app_name(*obj_prop, "HACCIO"); PDCprop_set_obj_consistency_semantics(*obj_prop, PDC_CONSISTENCY_POSIX); - pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm); + pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, comm); if (obj_id == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); @@ -119,7 +119,7 @@ main(int argc, char **argv) cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); uint64_t offset = 0, offset_remote = mpi_rank * NUM_PARTICLES, mysize = NUM_PARTICLES; diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index 7aa15998a..f6e7283cd 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -171,7 +171,7 @@ main(int argc, char **argv) // create first object sprintf(obj_name1, "o1_%d", i); #ifdef ENABLE_MPI - obj1 = PDCobj_create_mpi(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD); + obj1 = PDCobj_create_coll(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD); #else obj1 = PDCobj_create(cont, obj_name1, obj_prop); #endif diff --git a/examples/tileio.c b/examples/tileio.c index c73695390..e7ec95db6 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -43,7 +43,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t PDCprop_set_obj_app_name(*obj_prop, "mpi-tile-io"); PDCprop_set_obj_tags(*obj_prop, "tag0=1"); - pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); + pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); if (obj_id == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); @@ -99,7 +99,7 @@ main(int argc, char **argv) pdcid_t obj_id, obj_prop; pdcid_t local_region_id, global_region_id; - double * local_buffer = (double *)malloc(g_x_ept * g_y_ept * sizeof(double)); + double *local_buffer = (double *)malloc(g_x_ept * g_y_ept * sizeof(double)); uint64_t dims[NUM_DIMS] = {g_x_ept, g_y_ept}; uint64_t local_offsets[NUM_DIMS], global_offsets[NUM_DIMS]; local_offsets[0] = 0; @@ -112,7 +112,7 @@ main(int argc, char **argv) // Create containter cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); // Craete object (and its prop) obj_id = create_pdc_object(pdc_id, cont_id, "tile_io_obj", &obj_prop); diff --git a/examples/tileio_v2.c b/examples/tileio_v2.c index eef86d332..ba67138da 100644 --- a/examples/tileio_v2.c +++ b/examples/tileio_v2.c @@ -43,7 +43,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t PDCprop_set_obj_app_name(*obj_prop, "mpi-tile-io"); PDCprop_set_obj_tags(*obj_prop, "tag0=1"); - pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); + pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); if (obj_id == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); @@ -115,7 +115,7 @@ main(int argc, char **argv) // Init PDC pdc_id = PDCinit("pdc"); cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); obj_id = create_pdc_object(pdc_id, cont_id, "tile_io_obj", &obj_prop); // Create region diff --git a/examples/vpicio.c b/examples/vpicio.c index b55603924..702c17aaf 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -63,9 +63,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; @@ -116,7 +116,7 @@ main(int argc, char **argv) return 1; } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -152,44 +152,44 @@ main(int argc, char **argv) obj_prop_id22 = PDCprop_obj_dup(obj_prop_xx); PDCprop_set_obj_type(obj_prop_id22, PDC_INT); - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } - obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); if (obj_yy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); exit(-1); } - obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); if (obj_zz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); exit(-1); } - obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); if (obj_pxx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); exit(-1); } - obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); if (obj_pyy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); exit(-1); } - obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); if (obj_pzz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } - obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, comm); + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm); if (obj_id11 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } - obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, comm); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index 216627791..1eee6ff8d 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -67,9 +67,9 @@ main(int argc, char **argv) int comm = 1; #endif char obj_name[128]; - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; @@ -82,7 +82,7 @@ main(int argc, char **argv) unsigned sleep_time = 0; int test_method = 2; int do_flush = 0; - pdcid_t * transfer_request_x, *transfer_request_y, *transfer_request_z, *transfer_request_px, + pdcid_t *transfer_request_x, *transfer_request_y, *transfer_request_z, *transfer_request_px, *transfer_request_py, *transfer_request_pz, *transfer_request_id1, *transfer_request_id2, *ptr, *temp_requests; @@ -149,7 +149,7 @@ main(int argc, char **argv) return 1; } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -250,49 +250,49 @@ main(int argc, char **argv) for (i = 0; i < timestamps; ++i) { sprintf(obj_name, "obj-var-xx %" PRIu64 "", i); - obj_xx[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_xx, 0, comm); + obj_xx[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_xx, 0, comm); if (obj_xx[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } sprintf(obj_name, "obj-var-yy %" PRIu64 "", i); - obj_yy[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_yy, 0, comm); + obj_yy[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_yy, 0, comm); if (obj_yy[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); exit(-1); } sprintf(obj_name, "obj-var-zz %" PRIu64 "", i); - obj_zz[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_zz, 0, comm); + obj_zz[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_zz, 0, comm); if (obj_zz[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); exit(-1); } sprintf(obj_name, "obj-var-pxx %" PRIu64 "", i); - obj_pxx[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_pxx, 0, comm); + obj_pxx[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_pxx, 0, comm); if (obj_pxx[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); exit(-1); } sprintf(obj_name, "obj-var-pyy %" PRIu64 "", i); - obj_pyy[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_pyy, 0, comm); + obj_pyy[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_pyy, 0, comm); if (obj_pyy[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); exit(-1); } sprintf(obj_name, "obj-var-pzz %" PRIu64 "", i); - obj_pzz[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_pzz, 0, comm); + obj_pzz[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_pzz, 0, comm); if (obj_pzz[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } sprintf(obj_name, "id11 %" PRIu64 "", i); - obj_id11[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_id11, 0, comm); + obj_id11[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_id11, 0, comm); if (obj_id11[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } sprintf(obj_name, "id22 %" PRIu64 "", i); - obj_id22[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_id22, 0, comm); + obj_id22[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_id22, 0, comm); if (obj_id22[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index 30c7e2316..e7e2496cd 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -63,9 +63,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; @@ -113,7 +113,7 @@ main(int argc, char **argv) return 1; } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -149,44 +149,44 @@ main(int argc, char **argv) obj_prop_id22 = PDCprop_obj_dup(obj_prop_xx); PDCprop_set_obj_type(obj_prop_id22, PDC_INT); - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } - obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); if (obj_yy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); exit(-1); } - obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); if (obj_zz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); exit(-1); } - obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); if (obj_pxx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); exit(-1); } - obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); if (obj_pyy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); exit(-1); } - obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); if (obj_pzz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } - obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, comm); + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm); if (obj_id11 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } - obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, comm); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/src/api/include/pdc_client_connect.h b/src/api/include/pdc_client_connect.h index e8999ab2f..452b987fd 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) @@ -604,7 +604,7 @@ perr_t PDC_Client_query_container_name(const char *cont_name, uint64_t *cont_met * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_query_container_name_col(const char *cont_name, uint64_t *cont_meta_id); +perr_t PDC_Client_query_container_name_coll(const char *cont_name, uint64_t *cont_meta_id); /** * Async request send to server to read a region and put it in users buffer @@ -675,7 +675,7 @@ perr_t PDC_Client_create_cont_id(const char *cont_name, pdcid_t cont_create_prop * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_create_cont_id_mpi(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); +perr_t PDC_Client_create_cont_id_coll(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); /** * Client sends query requests to server @@ -699,7 +699,7 @@ perr_t PDC_Client_query_kvtag(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **p * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, MPI_Comm comm); +perr_t PDC_Client_query_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, MPI_Comm comm); #endif /** @@ -951,7 +951,7 @@ perr_t PDC_Client_add_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdc * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_create_cont_id_mpi(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); +perr_t PDC_Client_create_cont_id_coll(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); /** * Query and read a number of objects with their obj name @@ -1093,9 +1093,9 @@ perr_t PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char * * \param n_res [OUT] Number of object IDs * \param out [OUT] Object IDs */ -perr_t PDC_Client_search_obj_ref_through_dart_mpi(dart_hash_algo_t hash_algo, char *query_string, - dart_object_ref_type_t ref_type, int *n_res, uint64_t **out, - MPI_Comm comm); +perr_t PDC_Client_search_obj_ref_through_dart_coll(dart_hash_algo_t hash_algo, char *query_string, + dart_object_ref_type_t ref_type, int *n_res, + uint64_t **out, MPI_Comm comm); #endif /** diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index ca2cb7ff2..55b41d36b 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); @@ -2544,7 +2544,7 @@ PDC_Client_create_cont_id(const char *cont_name, pdcid_t cont_create_prop ATTRIB // Only one rand sends the request, others wait for MPI broadcast perr_t -PDC_Client_create_cont_id_mpi(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id) +PDC_Client_create_cont_id_coll(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id) { FUNC_ENTER(NULL); @@ -2631,7 +2631,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; @@ -2784,7 +2784,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++) { @@ -2812,7 +2812,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); @@ -2995,7 +2995,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; @@ -3024,7 +3024,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"); @@ -3093,7 +3093,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; @@ -3156,7 +3156,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; @@ -3222,7 +3222,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]; @@ -3292,7 +3292,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; @@ -3519,12 +3519,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; @@ -3906,11 +3906,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; @@ -3998,8 +3998,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; @@ -4123,8 +4123,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; @@ -4245,8 +4245,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; @@ -4343,9 +4343,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 @@ -4398,7 +4398,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); @@ -4608,7 +4608,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; if ((info = PDC_find_id(local_obj_id)) == NULL) @@ -4827,7 +4827,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; @@ -4858,7 +4858,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; @@ -4891,7 +4891,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; @@ -5010,7 +5010,7 @@ PDC_Client_query_container_name(const char *cont_name, uint64_t *cont_meta_id) } perr_t -PDC_Client_query_container_name_col(const char *cont_name, uint64_t *cont_meta_id) +PDC_Client_query_container_name_coll(const char *cont_name, uint64_t *cont_meta_id) { FUNC_ENTER(NULL); @@ -5131,12 +5131,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) @@ -5419,7 +5419,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); @@ -5446,7 +5446,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; @@ -5511,7 +5511,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"); @@ -5544,7 +5544,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; @@ -5653,8 +5653,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; @@ -5752,15 +5752,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); @@ -5882,7 +5882,7 @@ PDC_Client_query_multi_storage_info(int nobj, char **obj_names, region_storage_m #if defined(ENABLE_MPI) && defined(ENABLE_TIMING) perr_t -PDC_get_io_stats_mpi(double read_time, double query_time, int nfopen) +PDC_get_io_stats_coll(double read_time, double query_time, int nfopen) { FUNC_ENTER(NULL); @@ -5960,7 +5960,7 @@ PDC_Client_query_name_read_entire_obj_client(int nobj, char **obj_names, void ** read_time = PDC_get_elapsed_time_double(&pdc_timer2, &pdc_timer1); read_time_g += read_time; #ifdef ENABLE_MPI - PDC_get_io_stats_mpi(read_time, query_time, nfopen_g); + PDC_get_io_stats_coll(read_time, query_time, nfopen_g); #endif #endif @@ -5979,12 +5979,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; @@ -6082,7 +6082,7 @@ PDC_Client_query_name_read_entire_obj_client_agg(int my_nobj, char **my_obj_name read_time = PDC_get_elapsed_time_double(&pdc_timer2, &pdc_timer1); read_time_g += read_time; #ifdef ENABLE_MPI - PDC_get_io_stats_mpi(read_time, query_time, nfopen_g); + PDC_get_io_stats_coll(read_time, query_time, nfopen_g); #endif #endif @@ -6268,7 +6268,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) { @@ -6339,8 +6339,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) { @@ -6441,8 +6441,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); @@ -6501,12 +6501,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; @@ -6552,14 +6552,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; @@ -6729,8 +6729,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) { @@ -6795,7 +6795,7 @@ PDCcont_put(const char *cont_name, pdcid_t pdc) #ifdef ENABLE_MPI - ret_value = PDC_Client_create_cont_id_mpi(cont_name, cont_prop, &cont_id); + ret_value = PDC_Client_create_cont_id_coll(cont_name, cont_prop, &cont_id); #else ret_value = PDC_Client_create_cont_id(cont_name, cont_prop, &cont_id); #endif @@ -6956,7 +6956,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; if ((id_info = PDC_find_id(cont_id)) == NULL) @@ -7055,7 +7055,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) { @@ -7182,7 +7182,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); @@ -7209,10 +7209,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; @@ -7299,12 +7299,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; @@ -7383,7 +7383,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) @@ -7454,11 +7454,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; @@ -7528,9 +7528,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); @@ -7620,7 +7620,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; @@ -7629,8 +7629,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; @@ -7785,7 +7785,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; @@ -7849,9 +7849,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); @@ -8070,7 +8070,7 @@ PDC_assign_server(int32_t *my_server_start, int32_t *my_server_end, int32_t *my_ // All clients collectively query all servers, each client gets partial results perr_t -PDC_Client_query_kvtag_col(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, int *query_sent) +PDC_Client_query_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, int *query_sent) { FUNC_ENTER(NULL); @@ -8229,7 +8229,7 @@ _customized_all_gather_result(int query_sent, int *n_res, uint64_t **pdc_ids, MP // All clients collectively query all servers, all clients get all results perr_t -PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, MPI_Comm world_comm) +PDC_Client_query_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, MPI_Comm world_comm) { FUNC_ENTER(NULL); @@ -8242,7 +8242,7 @@ PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ MPI_Barrier(world_comm); stime = MPI_Wtime(); - ret_value = PDC_Client_query_kvtag_col(kvtag, n_res, pdc_ids, &query_sent); + ret_value = PDC_Client_query_kvtag_coll(kvtag, n_res, pdc_ids, &query_sent); MPI_Barrier(world_comm); duration = MPI_Wtime() - stime; @@ -8388,9 +8388,9 @@ _customized_bcast_result(int first_sender_global_rank, int num_groups, int sende } perr_t -PDC_Client_search_obj_ref_through_dart_mpi(dart_hash_algo_t hash_algo, char *query_string, - dart_object_ref_type_t ref_type, int *n_res, uint64_t **out, - MPI_Comm world_comm) +PDC_Client_search_obj_ref_through_dart_coll(dart_hash_algo_t hash_algo, char *query_string, + dart_object_ref_type_t ref_type, int *n_res, uint64_t **out, + MPI_Comm world_comm) { FUNC_ENTER(NULL); diff --git a/src/api/pdc_meta/pdc_metadata_client.c b/src/api/pdc_meta/pdc_metadata_client.c index 4a65de931..5fde6f3bd 100644 --- a/src/api/pdc_meta/pdc_metadata_client.c +++ b/src/api/pdc_meta/pdc_metadata_client.c @@ -42,7 +42,7 @@ splitExpression(const char *expression, char conditions[][CONDITION_LENGTH], int FUNC_ENTER(NULL); char tempExpr[1024]; - char * token; + char *token; const char delimiters[] = "AND OR"; int index = 0; @@ -93,8 +93,8 @@ send_query_condition_get_separate_result(char conditions[][CONDITION_LENGTH], in // if this is collective mode, each client will send a different condition to a different server perr_t rst; if (world_comm != NULL) { - rst = PDC_Client_search_obj_ref_through_dart_mpi(DART_HASH, condition, REF_PRIMARY_ID, &n_res, - &out, world_comm); + rst = PDC_Client_search_obj_ref_through_dart_coll(DART_HASH, condition, REF_PRIMARY_ID, &n_res, + &out, world_comm); } int n_res; uint64_t *out; diff --git a/src/api/pdc_obj/include/pdc_cont.h b/src/api/pdc_obj/include/pdc_cont.h index 9bdb22149..dfc6ed905 100644 --- a/src/api/pdc_obj/include/pdc_cont.h +++ b/src/api/pdc_obj/include/pdc_cont.h @@ -33,7 +33,7 @@ typedef struct _pdc_id_info cont_handle; /* Library Public Struct */ /**************************/ struct pdc_cont_info { - char * name; + char *name; pdcid_t local_id; uint64_t meta_id; }; @@ -62,7 +62,7 @@ pdcid_t PDCcont_create(const char *cont_name, pdcid_t cont_create_prop); * * \return Container id on success/Zero on failure */ -pdcid_t PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id); +pdcid_t PDCcont_create_coll(const char *cont_name, pdcid_t cont_prop_id); /** * Open a container @@ -82,7 +82,7 @@ pdcid_t PDCcont_open(const char *cont_name, pdcid_t pdc_id); * * \return Container id on success/Zero on failure */ -pdcid_t PDCcont_open_col(const char *cont_name, pdcid_t pdc_id); +pdcid_t PDCcont_open_coll(const char *cont_name, pdcid_t pdc_id); /** * Close a container diff --git a/src/api/pdc_obj/include/pdc_mpi.h b/src/api/pdc_obj/include/pdc_mpi.h index 5a4341c90..7207c7842 100644 --- a/src/api/pdc_obj/include/pdc_mpi.h +++ b/src/api/pdc_obj/include/pdc_mpi.h @@ -41,7 +41,7 @@ * * \return Object ID on success/Zero on failure */ -pdcid_t PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_create_prop, int rank_id, - MPI_Comm comm); +pdcid_t PDCobj_create_coll(pdcid_t cont_id, const char *obj_name, pdcid_t obj_create_prop, int rank_id, + MPI_Comm comm); #endif /* PDC_MPI_H */ diff --git a/src/api/pdc_obj/include/pdc_obj.h b/src/api/pdc_obj/include/pdc_obj.h index af334a46d..a4158a32c 100644 --- a/src/api/pdc_obj/include/pdc_obj.h +++ b/src/api/pdc_obj/include/pdc_obj.h @@ -99,7 +99,7 @@ pdcid_t PDCobj_open(const char *obj_name, pdcid_t pdc_id); * * \return Object id on success/Zero on failure */ -pdcid_t PDCobj_open_col(const char *obj_name, pdcid_t pdc_id); +pdcid_t PDCobj_open_coll(const char *obj_name, pdcid_t pdc_id); /** diff --git a/src/api/pdc_obj/pdc_cont.c b/src/api/pdc_obj/pdc_cont.c index 18c4396cf..155707103 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) @@ -99,7 +99,7 @@ PDCcont_create(const char *cont_name, pdcid_t cont_prop_id) } pdcid_t -PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id) +PDCcont_create_coll(const char *cont_name, pdcid_t cont_prop_id) { FUNC_ENTER(NULL); @@ -107,7 +107,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); @@ -136,7 +136,7 @@ PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id) p->cont_pt->pdc->name = strdup(cont_prop->pdc->name); p->cont_pt->pdc->local_id = cont_prop->pdc->local_id; - ret = PDC_Client_create_cont_id_mpi(cont_name, cont_prop_id, &(p->cont_info_pub->meta_id)); + ret = PDC_Client_create_cont_id_coll(cont_name, cont_prop_id, &(p->cont_info_pub->meta_id)); if (ret == FAIL) PGOTO_ERROR(0, "Unable to create container object on server"); @@ -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)); @@ -284,7 +284,7 @@ PDCcont_open(const char *cont_name, pdcid_t pdc) } pdcid_t -PDCcont_open_col(const char *cont_name, pdcid_t pdc) +PDCcont_open_coll(const char *cont_name, pdcid_t pdc) { FUNC_ENTER(NULL); @@ -293,7 +293,7 @@ PDCcont_open_col(const char *cont_name, pdcid_t pdc) pdcid_t cont_id; pdcid_t cont_meta_id; - ret = PDC_Client_query_container_name_col(cont_name, &cont_meta_id); + ret = PDC_Client_query_container_name_coll(cont_name, &cont_meta_id); if (ret == FAIL) PGOTO_ERROR(0, "Query container name failed"); cont_id = PDC_cont_create_local(pdc, cont_name, cont_meta_id); @@ -310,7 +310,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; if ((id_info = PDC_find_id(cont_id)) == NULL) PGOTO_ERROR(NULL, "Failed to find PDC ID: %d", cont_id); @@ -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_mpi.c b/src/api/pdc_obj/pdc_mpi.c index 1e5fa38f1..f36189a33 100644 --- a/src/api/pdc_obj/pdc_mpi.c +++ b/src/api/pdc_obj/pdc_mpi.c @@ -30,12 +30,12 @@ #include "pdc_mpi.h" pdcid_t -PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm) +PDCobj_create_coll(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm) { FUNC_ENTER(NULL); struct _pdc_obj_info *p = NULL; - struct _pdc_id_info * id_info = NULL; + struct _pdc_id_info *id_info = NULL; int rank; pdcid_t ret_value; @@ -68,7 +68,7 @@ PDCobj_encode(pdcid_t obj_id, pdcid_t *meta_id) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info * objinfo; + struct _pdc_id_info *objinfo; struct _pdc_obj_info *obj; int client_rank, client_size; @@ -97,7 +97,7 @@ PDCobj_decode(pdcid_t obj_id, pdcid_t meta_id) FUNC_ENTER(NULL); pdcid_t ret_value = 0; - struct _pdc_id_info * objinfo; + struct _pdc_id_info *objinfo; struct _pdc_obj_info *obj; int client_rank, client_size; diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index c32e9272a..2d73bdd8c 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 @@ -531,7 +531,7 @@ PDCobj_open(const char *obj_name, pdcid_t pdc) } pdcid_t -PDCobj_open_col(const char *obj_name, pdcid_t pdc) +PDCobj_open_coll(const char *obj_name, pdcid_t pdc) { FUNC_ENTER(NULL); @@ -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; @@ -731,7 +731,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) @@ -758,7 +758,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -776,7 +776,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -794,7 +794,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -812,7 +812,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -830,7 +830,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; @@ -866,7 +866,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; if ((info = PDC_find_id(obj_id)) == NULL) @@ -885,10 +885,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; if ((info = PDC_find_id(obj_id)) == NULL) PGOTO_ERROR(NULL, "Failed to find PDC ID: %d", obj_id); @@ -907,7 +907,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; if ((obj = PDC_find_id(obj_id)) == NULL) @@ -1087,7 +1087,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_region/include/pdc_region.h b/src/api/pdc_region/include/pdc_region.h index 1a273a9f4..4a71be23b 100644 --- a/src/api/pdc_region/include/pdc_region.h +++ b/src/api/pdc_region/include/pdc_region.h @@ -41,11 +41,11 @@ struct pdc_region_info { pdcid_t local_id; struct _pdc_obj_info *obj; size_t ndim; - uint64_t * offset; - uint64_t * size; + uint64_t *offset; + uint64_t *size; bool mapping; int registered_op; - void * buf; + void *buf; size_t unit; }; @@ -152,7 +152,7 @@ perr_t PDCregion_transfer_start_all(pdcid_t *transfer_request_id, int size); * * \return Non-negative on success/Negative on failure */ -perr_t PDCregion_transfer_start_mpi(pdcid_t transfer_request_id, MPI_Comm comm); +perr_t PDCregion_transfer_start_coll(pdcid_t transfer_request_id, MPI_Comm comm); /** * Start several region transfer requests (asynchronously), MPI collective version for better performance at @@ -164,7 +164,7 @@ perr_t PDCregion_transfer_start_mpi(pdcid_t transfer_request_id, MPI_Comm comm); * * \return Non-negative on success/Negative on failure */ -perr_t PDCregion_transfer_start_all_mpi(pdcid_t *transfer_request_id, int size, MPI_Comm comm); +perr_t PDCregion_transfer_start_all_coll(pdcid_t *transfer_request_id, int size, MPI_Comm comm); #endif /** @@ -288,7 +288,7 @@ pbool_t PDC_region_info_transfer_t_is_equal(const region_info_transfer_t *reg1, * @return Non-negative on success, negative on failure. */ perr_t PDC_copy_region_info_transfer_t(const region_info_transfer_t *src_reg, - region_info_transfer_t * dest_reg); + region_info_transfer_t *dest_reg); /** * @brief Calculate the size of a region descriptor in bytes. diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 539ed1d52..88f001f2a 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 @@ -136,7 +136,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; @@ -150,7 +150,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; @@ -286,12 +286,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; @@ -370,7 +370,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; @@ -618,7 +618,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; @@ -686,7 +686,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; @@ -734,13 +734,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; @@ -834,10 +834,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; hg_bulk_t bulk_handle; transfer_request_output = NULL; @@ -976,7 +976,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; int ret_value = SUCCEED; @@ -1180,7 +1180,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; @@ -1287,10 +1287,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; hg_bulk_t bulk_handle; if (size == 0) @@ -1369,10 +1369,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; @@ -1469,7 +1469,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) { @@ -1530,7 +1530,7 @@ PDCregion_transfer_start_all(pdcid_t *transfer_request_id, int size) #ifdef ENABLE_MPI perr_t -PDCregion_transfer_start_all_mpi(pdcid_t *transfer_request_id, int size, MPI_Comm comm) +PDCregion_transfer_start_all_coll(pdcid_t *transfer_request_id, int size, MPI_Comm comm) { FUNC_ENTER(NULL); @@ -1552,7 +1552,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; @@ -1572,7 +1572,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, if (transfer_request->region_partition == PDC_REGION_DYNAMIC || transfer_request->region_partition == PDC_REGION_LOCAL) { #ifdef ENABLE_MPI - PDCregion_transfer_start_all_mpi(&transfer_request_id, 1, comm); + PDCregion_transfer_start_all_coll(&transfer_request_id, 1, comm); #else PDCregion_transfer_start_all(&transfer_request_id, 1); #endif @@ -1668,7 +1668,7 @@ PDCregion_transfer_start(pdcid_t transfer_request_id) #ifdef ENABLE_MPI perr_t -PDCregion_transfer_start_mpi(pdcid_t transfer_request_id, MPI_Comm comm) +PDCregion_transfer_start_coll(pdcid_t transfer_request_id, MPI_Comm comm) { FUNC_ENTER(NULL); @@ -1690,7 +1690,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; @@ -1729,7 +1729,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; @@ -1816,15 +1816,15 @@ 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; hg_bulk_t bulk_handle; struct _pdc_id_info **transferinfos; - struct _pdc_id_info * transfer_info; + struct _pdc_id_info *transfer_info; 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; @@ -2061,7 +2061,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_server_region/include/pdc_server_data.h b/src/server/pdc_server_region/include/pdc_server_data.h index a204aa437..8056769b2 100644 --- a/src/server/pdc_server_region/include/pdc_server_data.h +++ b/src/server/pdc_server_region/include/pdc_server_data.h @@ -47,11 +47,11 @@ struct buf_map_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char * ret_string; - void * void_buf; - char * server_addr; - pdc_metadata_t * meta; - region_list_t ** region_lists; + char *ret_string; + void *void_buf; + char *server_addr; + pdc_metadata_t *meta; + region_list_t **region_lists; uint32_t n_loc; struct transfer_buf_map *buf_map_args; } buf_map_server_lookup_args_t; @@ -60,11 +60,11 @@ struct obj_map_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char * ret_string; - void * void_buf; - char * server_addr; - pdc_metadata_t * meta; - region_list_t ** region_lists; + char *ret_string; + void *void_buf; + char *server_addr; + pdc_metadata_t *meta; + region_list_t **region_lists; uint32_t n_loc; struct transfer_obj_map *obj_map_args; } obj_map_server_lookup_args_t; @@ -78,11 +78,11 @@ struct buf_unmap_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char * ret_string; - void * void_buf; - char * server_addr; - pdc_metadata_t * meta; - region_list_t ** region_lists; + char *ret_string; + void *void_buf; + char *server_addr; + pdc_metadata_t *meta; + region_list_t **region_lists; uint32_t n_loc; struct transfer_buf_unmap *buf_unmap_args; } buf_unmap_server_lookup_args_t; @@ -91,11 +91,11 @@ struct obj_unmap_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char * ret_string; - void * void_buf; - char * server_addr; - pdc_metadata_t * meta; - region_list_t ** region_lists; + char *ret_string; + void *void_buf; + char *server_addr; + pdc_metadata_t *meta; + region_list_t **region_lists; uint32_t n_loc; struct transfer_obj_unmap *obj_unmap_args; } obj_unmap_server_lookup_args_t; @@ -138,13 +138,13 @@ struct transfer_buf_unmap_args { /****************************/ typedef struct notify_multi_io_args_t { hg_bulk_t bulk_handle; - void * buf_sizes; - void * buf_ptrs; + void *buf_sizes; + void *buf_ptrs; region_list_t *region_list; } notify_multi_io_args_t; typedef struct bulk_xfer_data_t { - void ** buf_ptrs; + void **buf_ptrs; hg_size_t *buf_sizes; int n_alloc; int idx; @@ -173,13 +173,13 @@ typedef struct accumulate_storage_meta_t { } accumulate_storage_meta_t; typedef struct storage_meta_query_one_name_args_t { - char * name; + char *name; int n_res; int seq_id; region_list_t *req_region; region_list_t *overlap_storage_region_list; perr_t (*cb)(); - void * cb_args; + void *cb_args; accumulate_storage_meta_t *accu_meta; } storage_meta_query_one_name_args_t; @@ -187,24 +187,24 @@ typedef struct server_read_check_out_t { int ret; int is_cache_to_bb; region_list_t *region; - char * shm_addr; + char *shm_addr; } server_read_check_out_t; // Data query typedef struct query_task_t { - pdc_query_t * query; + pdc_query_t *query; int query_id; int manager; int client_id; int n_sent_server; int n_unique_obj; - uint64_t * obj_ids; + uint64_t *obj_ids; int n_recv_obj; int ndim; pdc_query_get_op_t get_op; - region_list_t * region_constraint; + region_list_t *region_constraint; uint64_t total_elem; - int * invalid_region_ids; + int *invalid_region_ids; int ninvalid_region; int prev_server_id; int next_server_id; @@ -213,17 +213,17 @@ typedef struct query_task_t { int is_done; int n_recv; uint64_t nhits; - uint64_t * coords; + uint64_t *coords; uint64_t **coords_arr; - uint64_t * n_hits_from_server; + uint64_t *n_hits_from_server; // Data read int n_read_data_region; - void ** data_arr; + void **data_arr; uint64_t *my_read_coords; uint64_t my_nread_coords; uint64_t my_read_obj_id; - void * my_data; + void *my_data; int client_seq_id; struct query_task_t *prev; @@ -272,21 +272,21 @@ extern int buffer_write_request_total_g; extern int buffer_write_request_num_g; extern int buffer_read_request_num_g; extern int is_server_direct_io_g; -extern pdc_task_list_t * pdc_server_agg_task_head_g; -extern pdc_task_list_t * pdc_server_s2s_task_head_g; +extern pdc_task_list_t *pdc_server_agg_task_head_g; +extern pdc_task_list_t *pdc_server_s2s_task_head_g; extern int pdc_server_task_id_g; -extern hg_class_t * hg_class_g; -extern hg_context_t * hg_context_g; +extern hg_class_t *hg_class_g; +extern hg_context_t *hg_context_g; extern pdc_remote_server_info_t *pdc_remote_server_info_g; extern int is_debug_g; extern int n_read_from_bb_g; extern int read_from_bb_size_g; extern int gen_hist_g; -extern pdc_data_server_io_list_t * pdc_data_server_read_list_head_g; -extern pdc_data_server_io_list_t * pdc_data_server_write_list_head_g; +extern pdc_data_server_io_list_t *pdc_data_server_read_list_head_g; +extern pdc_data_server_io_list_t *pdc_data_server_write_list_head_g; extern update_storage_meta_list_t *pdc_update_storage_meta_list_head_g; -extern pdc_client_info_t * pdc_client_info_g; +extern pdc_client_info_t *pdc_client_info_g; extern int pdc_client_num_g; extern double total_mem_usage_g; extern int lustre_stripe_size_mb_g; @@ -309,7 +309,7 @@ extern hg_id_t send_data_query_region_register_id_g; extern hg_id_t send_read_sel_obj_id_rpc_register_id_g; extern hg_id_t send_nhits_register_id_g; extern hg_id_t send_bulk_rpc_register_id_g; -extern char * gBinningOption; +extern char *gBinningOption; extern int gen_fastbit_idx_g; extern int use_fastbit_idx_g; @@ -638,7 +638,7 @@ hg_return_t PDC_Server_query_read_names_cb(const struct hg_cb_info *callback_inf * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data); +perr_t PDC_Server_update_region_storage_meta_bulk_coll(bulk_xfer_data_t *bulk_data); /** * Close the shared memory @@ -663,7 +663,7 @@ perr_t PDC_Server_close_shm(region_list_t *region, int is_remove); */ perr_t 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); /** * ********** diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 53fdf1e84..562832f49 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; @@ -2230,24 +2230,24 @@ PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *cal // Note: one request region can spread across multiple regions in storage // Need to allocate **overlap_region_loc with PDC_MAX_OVERLAP_REGION_NUM before calling this static perr_t -PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) +PDC_Server_get_storage_location_of_region_coll(region_list_t *regions_head) { FUNC_ENTER(NULL); 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; @@ -3158,7 +3158,7 @@ update_storage_meta_bulk_rpc_cb(const struct hg_cb_info *callback_info) } perr_t -PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) +PDC_Server_update_region_storage_meta_bulk_coll(bulk_xfer_data_t *bulk_data) { FUNC_ENTER(NULL); @@ -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 @@ -3650,7 +3650,7 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) if (region_elt->is_io_done == 1) continue; - ret_value = PDC_Server_get_storage_location_of_region_mpi(region_elt); + ret_value = PDC_Server_get_storage_location_of_region_coll(region_elt); if (ret_value != SUCCEED) { PGOTO_ERROR(FAIL, "Error with PDC_Server_get_storage_location_of_region"); } @@ -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/cont/cont_getid.c b/src/tests/cont/cont_getid.c index 8c9240568..b097bcc4b 100644 --- a/src/tests/cont/cont_getid.c +++ b/src/tests/cont/cont_getid.c @@ -55,8 +55,8 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont_id = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont_id = PDCcont_create_coll("c1", cont_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); diff --git a/src/tests/cont/create_cont_coll.c b/src/tests/cont/create_cont_coll.c index 6dd48327c..0daa1d381 100644 --- a/src/tests/cont/create_cont_coll.c +++ b/src/tests/cont/create_cont_coll.c @@ -49,8 +49,8 @@ main(int argc, char **argv) TASSERT((create_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", create_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll("c1", create_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); // close a container TASSERT(PDCcont_close(cont) >= 0, "Call to PDCcont_close succeeded", "Call to PDCcont_close failed"); // close a container property diff --git a/src/tests/cont/open_cont.c b/src/tests/cont/open_cont.c index 7fdcd0a72..737c890e4 100644 --- a/src/tests/cont/open_cont.c +++ b/src/tests/cont/open_cont.c @@ -51,8 +51,8 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont_id = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont_id = PDCcont_create_coll("c1", cont_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif diff --git a/src/tests/deprecated/blocked_lock.c b/src/tests/deprecated/blocked_lock.c index 3d1381471..330f790b8 100644 --- a/src/tests/deprecated/blocked_lock.c +++ b/src/tests/deprecated/blocked_lock.c @@ -47,7 +47,7 @@ main(int argc, char **argv) pdcid_t obj2; pdcid_t r1, r2; perr_t ret; - float * x; + float *x; int x_dim = 64; long numparticles = 8388608; // const int my_data_size = 992; @@ -89,7 +89,7 @@ main(int argc, char **argv) PDCprop_set_obj_app_name(obj_prop2, "VPICIO"); PDCprop_set_obj_tags(obj_prop2, "tag0=1"); - obj2 = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop2, 0); + obj2 = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop2, 0); if (obj2 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); diff --git a/src/tests/deprecated/buf_map_mpi_v2.c b/src/tests/deprecated/buf_map_mpi_v2.c index db965755c..d67ee9c22 100644 --- a/src/tests/deprecated/buf_map_mpi_v2.c +++ b/src/tests/deprecated/buf_map_mpi_v2.c @@ -52,7 +52,7 @@ main(int argc, char **argv) #else int comm = 1; #endif - float * x; + float *x; long numparticles = 4; uint64_t dims[1] = {numparticles}; // {8388608}; int ndim = 1; @@ -105,7 +105,7 @@ main(int argc, char **argv) obj2 = PDCobj_open("obj-var-xx", pdc_id); if (obj2 == 0) { #ifdef ENABLE_MPI - obj2 = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop2, 0, comm); + obj2 = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop2, 0, comm); #else obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); #endif diff --git a/src/tests/deprecated/buf_obj_map_mpi.c b/src/tests/deprecated/buf_obj_map_mpi.c index 8e71b6401..bf21ac7dc 100644 --- a/src/tests/deprecated/buf_obj_map_mpi.c +++ b/src/tests/deprecated/buf_obj_map_mpi.c @@ -52,7 +52,7 @@ main(int argc, char **argv) #else int comm = 1; #endif - float * x; + float *x; int x_dim = 64; long numparticles = 4; uint64_t dims[1] = {numparticles}; // {8388608}; @@ -94,9 +94,9 @@ main(int argc, char **argv) PDCprop_set_obj_tags(obj_prop2, "tag0=1"); #ifdef ENABLE_MPI - obj2 = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop2, 0, comm); + obj2 = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop2, 0, comm); #else - obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); + obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); #endif if (obj2 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); diff --git a/src/tests/deprecated/obj_transformation.c b/src/tests/deprecated/obj_transformation.c index ebba0f16d..da7574cce 100644 --- a/src/tests/deprecated/obj_transformation.c +++ b/src/tests/deprecated/obj_transformation.c @@ -62,18 +62,18 @@ main(int argc, char **argv) struct timeval ht_total_end; long long ht_total_elapsed; double ht_total_sec; - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; uint64_t numparticles, i; uint64_t dims[1]; int ndim = 1; - uint64_t * offset; - uint64_t * offset_remote; - uint64_t * mysize; + uint64_t *offset; + uint64_t *offset_remote; + uint64_t *mysize; #ifdef ENABLE_MPI MPI_Init(&argc, &argv); @@ -140,43 +140,43 @@ main(int argc, char **argv) PDCprop_set_obj_type(obj_prop_id22, PDC_INT); #ifdef ENABLE_MPI - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, MPI_COMM_WORLD); + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, MPI_COMM_WORLD); if (obj_xx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } - obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, MPI_COMM_WORLD); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, MPI_COMM_WORLD); if (obj_yy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); exit(-1); } - obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, MPI_COMM_WORLD); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, MPI_COMM_WORLD); if (obj_zz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); exit(-1); } - obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, MPI_COMM_WORLD); + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, MPI_COMM_WORLD); if (obj_pxx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); exit(-1); } - obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, MPI_COMM_WORLD); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, MPI_COMM_WORLD); if (obj_pyy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); exit(-1); } - obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, MPI_COMM_WORLD); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, MPI_COMM_WORLD); if (obj_pzz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } - obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, MPI_COMM_WORLD); + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, MPI_COMM_WORLD); if (obj_id11 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } - obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, MPI_COMM_WORLD); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, MPI_COMM_WORLD); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/src/tests/deprecated/vpicio_old.c b/src/tests/deprecated/vpicio_old.c index fe2786b52..53785cb92 100644 --- a/src/tests/deprecated/vpicio_old.c +++ b/src/tests/deprecated/vpicio_old.c @@ -63,9 +63,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; @@ -113,7 +113,7 @@ main(int argc, char **argv) return 1; } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -149,44 +149,44 @@ main(int argc, char **argv) obj_prop_id22 = PDCprop_obj_dup(obj_prop_xx); PDCprop_set_obj_type(obj_prop_id22, PDC_INT); - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } - obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); if (obj_yy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); exit(-1); } - obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); if (obj_zz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); exit(-1); } - obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); if (obj_pxx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); exit(-1); } - obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); if (obj_pyy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); exit(-1); } - obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); if (obj_pzz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } - obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, comm); + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm); if (obj_id11 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } - obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, comm); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/src/tests/deprecated/vpicio_v2.c b/src/tests/deprecated/vpicio_v2.c index d540a881f..41a602a35 100644 --- a/src/tests/deprecated/vpicio_v2.c +++ b/src/tests/deprecated/vpicio_v2.c @@ -65,18 +65,18 @@ main(int argc, char **argv) struct timeval ht_total_end; long long ht_total_elapsed; double ht_total_sec; - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; uint64_t numparticles, i; uint64_t dims[1]; int ndim = 1; - uint64_t * offset; - uint64_t * offset_remote; - uint64_t * mysize; + uint64_t *offset; + uint64_t *offset_remote; + uint64_t *mysize; #ifdef ENABLE_MPI MPI_Init(&argc, &argv); @@ -108,7 +108,7 @@ main(int argc, char **argv) LOG_ERROR("Failed to create container property"); // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); if (cont_id <= 0) LOG_ERROR("Failed to create container"); @@ -144,44 +144,44 @@ main(int argc, char **argv) PDCprop_set_obj_type(obj_prop_id22, PDC_INT); #ifdef ENABLE_MPI - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } - obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); if (obj_yy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); exit(-1); } - obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); if (obj_zz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); exit(-1); } - obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); if (obj_pxx == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); exit(-1); } - obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); if (obj_pyy == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); exit(-1); } - obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); if (obj_pzz == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } - obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, comm); + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm); if (obj_id11 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } - obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, comm); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/src/tests/misc/llsm_idioms_bench.c b/src/tests/misc/llsm_idioms_bench.c index 8fb8dff18..a163f80f5 100644 --- a/src/tests/misc/llsm_idioms_bench.c +++ b/src/tests/misc/llsm_idioms_bench.c @@ -370,8 +370,8 @@ perform_search(int is_using_dart, int query_type, int comm_type, int iter_round) ret_value = (comm_type == 0) ? PDC_Client_search_obj_ref_through_dart(DART_HASH, query_string, REF_PRIMARY_ID, &nres, &pdc_ids) - : PDC_Client_search_obj_ref_through_dart_mpi(DART_HASH, query_string, REF_PRIMARY_ID, - &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_search_obj_ref_through_dart_coll(DART_HASH, query_string, REF_PRIMARY_ID, + &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_search_obj_ref_through_dart(DART_HASH, query_string, REF_PRIMARY_ID, &nres, &pdc_ids); @@ -383,7 +383,7 @@ perform_search(int is_using_dart, int query_type, int comm_type, int iter_round) #ifdef ENABLE_MPI ret_value = (comm_type == 0) ? PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) - : PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids); #endif @@ -396,15 +396,15 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t * obj_ids; + pdcid_t *obj_ids; int n_obj, my_csv_rows, num_columns; int proc_num, my_rank, i, v, iter, round, csv_expand_factor, is_using_dart, query_type, comm_type; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t * pdc_ids; + uint64_t *pdc_ids; int nres, ntotal; - int * my_cnt_round; - int * total_cnt_round; + int *my_cnt_round; + int *total_cnt_round; int ret_value = SUCCEED; #ifdef ENABLE_MPI @@ -435,7 +435,7 @@ main(int argc, char *argv[]) PGOTO_ERROR(FAIL, "Failed to prepare container"); // ********************** Read and Broadcast first few rows of CSV file ********************** - char * data = NULL; + char *data = NULL; size_t data_size = 0; if (my_rank == 0) { @@ -464,7 +464,7 @@ main(int argc, char *argv[]) // ********************** Parse these rows of CSV file ********************** // read the CSV file and parse into data - char ** csv_header = (char **)calloc(MAX_COLUMNS, sizeof(char *)); + char **csv_header = (char **)calloc(MAX_COLUMNS, sizeof(char *)); char ***csv_data = NULL; my_csv_rows = read_csv_from_buffer(data, &csv_header, &csv_data, &num_columns, rows_to_read, my_rank, proc_num); @@ -485,7 +485,7 @@ main(int argc, char *argv[]) LOG_INFO("[Object Creation] Rank %d/%d: Created %d objects, time: %.5f ms\n", my_rank, proc_num, obj_created, total_time * 1000.0); - // ********************** Add tags to objects ********************** + // ********************** Add tags to objects ********************** #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); stime = MPI_Wtime(); @@ -551,7 +551,7 @@ main(int argc, char *argv[]) } #endif } // end query type - } // end comm type + } // end comm type if (my_rank == 0) { LOG_INFO("Rank %d: All queries are done\n", my_rank); diff --git a/src/tests/misc/producer_waitall.c b/src/tests/misc/producer_waitall.c index 6315bc4f9..adbc74800 100644 --- a/src/tests/misc/producer_waitall.c +++ b/src/tests/misc/producer_waitall.c @@ -155,7 +155,7 @@ main(int argc, char **argv) LOG_ERROR("Failed to create container property"); } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); } diff --git a/src/tests/misc/read_write_col_perf.c b/src/tests/misc/read_write_col_perf.c index cec102f72..6ddd2d605 100644 --- a/src/tests/misc/read_write_col_perf.c +++ b/src/tests/misc/read_write_col_perf.c @@ -175,7 +175,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); #ifdef ENABLE_MPI - obj1 = PDCobj_create_mpi(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD); + obj1 = PDCobj_create_coll(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD); #else obj1 = PDCobj_create(cont, obj_name1, obj_prop); #endif diff --git a/src/tests/misc/vpicio.c b/src/tests/misc/vpicio.c index 130cdc8bf..35aecf02f 100644 --- a/src/tests/misc/vpicio.c +++ b/src/tests/misc/vpicio.c @@ -64,9 +64,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float * x, *y, *z; - float * px, *py, *pz; - int * id1, *id2; + float *x, *y, *z; + float *px, *py, *pz; + int *id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; @@ -114,8 +114,8 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont_id = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont_id = PDCcont_create_coll("c1", cont_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); // create an object property TASSERT((obj_prop_xx = PDCprop_create(PDC_OBJ_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); @@ -229,22 +229,22 @@ main(int argc, char **argv) t0 = MPI_Wtime(); #endif - TASSERT((obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); + TASSERT((obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); diff --git a/src/tests/misc/vpicio_mts.c b/src/tests/misc/vpicio_mts.c index dff272985..3ce4af46c 100644 --- a/src/tests/misc/vpicio_mts.c +++ b/src/tests/misc/vpicio_mts.c @@ -60,8 +60,8 @@ main(int argc, char **argv) #else int comm = 1; #endif - float * x, *y, *z, *px, *py, *pz; - int * id1, *id2; + float *x, *y, *z, *px, *py, *pz; + int *id1, *id2; int x_dim = 64, y_dim = 64, z_dim = 64, ndim = 1, steps = 1, sleeptime = 0; uint64_t numparticles, dims[1], offset_local[1], offset_remote[1], mysize[1]; double t0, t1; @@ -112,7 +112,7 @@ main(int argc, char **argv) return FAIL; } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return FAIL; @@ -161,44 +161,44 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop_float, iter); PDCprop_set_obj_time_step(obj_prop_int, iter); - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_float, 0, comm); + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_float, 0, comm); if (obj_xx == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "x"); return FAIL; } - obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_float, 0, comm); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_float, 0, comm); if (obj_yy == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "y"); return FAIL; } - obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_float, 0, comm); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_float, 0, comm); if (obj_zz == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "z"); return FAIL; } - obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_float, 0, comm); + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_float, 0, comm); if (obj_pxx == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "px"); return FAIL; } - obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_float, 0, comm); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_float, 0, comm); if (obj_pyy == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "py"); return FAIL; } - obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_float, 0, comm); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_float, 0, comm); if (obj_pzz == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "pz"); return FAIL; } - obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_int, 0, comm); + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_int, 0, comm); if (obj_id11 == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "id1"); return FAIL; } - obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_int, 0, comm); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_int, 0, comm); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "id2"); return FAIL; @@ -270,7 +270,7 @@ main(int argc, char **argv) #endif #ifdef ENABLE_MPI - if (PDCregion_transfer_start_all_mpi(transfer_requests, 8, MPI_COMM_WORLD) != SUCCEED) { + if (PDCregion_transfer_start_all_coll(transfer_requests, 8, MPI_COMM_WORLD) != SUCCEED) { #else if (PDCregion_transfer_start_all(transfer_requests, 8) != SUCCEED) { #endif diff --git a/src/tests/obj/create_obj_coll.c b/src/tests/obj/create_obj_coll.c index cdcf8cbb4..32117a7cb 100644 --- a/src/tests/obj/create_obj_coll.c +++ b/src/tests/obj/create_obj_coll.c @@ -58,7 +58,7 @@ main(int argc, char **argv) // create first object sprintf(obj_name1, "o1"); #ifdef ENABLE_MPI - TASSERT((obj1 = PDCobj_create_mpi(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD)) != 0, + TASSERT((obj1 = PDCobj_create_coll(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD)) != 0, "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); #else TASSERT((obj1 = PDCobj_create(cont, obj_name1, obj_prop)) != 0, "Call to PDCobj_create succeeded", @@ -68,7 +68,7 @@ main(int argc, char **argv) // create second object sprintf(obj_name2, "o2"); #ifdef ENABLE_MPI - TASSERT((obj2 = PDCobj_create_mpi(cont, obj_name2, obj_prop, 0, MPI_COMM_WORLD)) != 0, + TASSERT((obj2 = PDCobj_create_coll(cont, obj_name2, obj_prop, 0, MPI_COMM_WORLD)) != 0, "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); #else TASSERT((obj2 = PDCobj_create(cont, obj_name2, obj_prop)) != 0, "Call to PDCobj_create succeeded", diff --git a/src/tests/obj/create_obj_scale.c b/src/tests/obj/create_obj_scale.c index 131d84a94..fb570c416 100644 --- a/src/tests/obj/create_obj_scale.c +++ b/src/tests/obj/create_obj_scale.c @@ -79,7 +79,7 @@ main(int argc, char **argv) char obj_prefix[4][10] = {"x", "y", "z", "energy"}; char tmp_str[128]; char name_mode[6][32] = {"Random Obj Names", "INVALID!", "One Obj Name", - "INVALID!", "INVALID!", "Four Obj Names"}; + "INVALID!", "INVALID!", "Four Obj Names"}; #ifdef ENABLE_MPI MPI_Init(&argc, &argv); @@ -123,8 +123,8 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll("c1", cont_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); char *cont_tags = "cont_tags0=123"; if (rank == 0) { diff --git a/src/tests/obj/obj_life.c b/src/tests/obj/obj_life.c index b2b4e125a..38c423b82 100644 --- a/src/tests/obj/obj_life.c +++ b/src/tests/obj/obj_life.c @@ -46,8 +46,8 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll("c1", cont_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); // close a container TASSERT(PDCcont_close(cont) >= 0, "Call to PDCcont_close succeeded", "Call to PDCcont_close failed"); // close a container property diff --git a/src/tests/obj/obj_round_robin_io.c b/src/tests/obj/obj_round_robin_io.c index b6836fd98..0a8c4a1bb 100644 --- a/src/tests/obj/obj_round_robin_io.c +++ b/src/tests/obj/obj_round_robin_io.c @@ -122,8 +122,8 @@ main(int argc, char **argv) "Call to PDCprop_create failed"); // create a container sprintf(cont_name, "c"); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); diff --git a/src/tests/obj/obj_round_robin_io_all.c b/src/tests/obj/obj_round_robin_io_all.c index 418f685aa..9998acb56 100644 --- a/src/tests/obj/obj_round_robin_io_all.c +++ b/src/tests/obj/obj_round_robin_io_all.c @@ -127,8 +127,8 @@ main(int argc, char **argv) "Call to PDCprop_create failed"); // create a container sprintf(cont_name, "c"); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop)) != 0, "Call to PDCcont_create_coll succeeded", + "Call to PDCcont_create_coll failed"); // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); diff --git a/src/tests/obj/open_obj_round_robin.c b/src/tests/obj/open_obj_round_robin.c index 3a13d8d16..b0f8297c6 100644 --- a/src/tests/obj/open_obj_round_robin.c +++ b/src/tests/obj/open_obj_round_robin.c @@ -64,7 +64,7 @@ main(int argc, char **argv) } // create a container sprintf(cont_name, "c"); - cont = PDCcont_create_col(cont_name, cont_prop); + cont = PDCcont_create_coll(cont_name, cont_prop); // cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); diff --git a/src/tests/obj/read_obj.c b/src/tests/obj/read_obj.c index 1e751c29a..b26eca20e 100644 --- a/src/tests/obj/read_obj.c +++ b/src/tests/obj/read_obj.c @@ -26,7 +26,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI MPI_Comm comm; #else - int comm = 1; + int comm = 1; #endif struct timeval pdc_timer_start; struct timeval pdc_timer_end; @@ -38,7 +38,7 @@ main(int argc, char **argv) uint64_t *offset, *local_offset; uint64_t *mysize; int i, j; - char * mydata; + char *mydata; char obj_name[128], cont_name[128]; uint64_t my_data_size; @@ -117,7 +117,7 @@ main(int argc, char **argv) "Call to PDCprop_create failed"); // create a container sprintf(cont_name, "c%d", rank); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", "Call to PDCcont_create_col failed"); // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", @@ -143,7 +143,7 @@ main(int argc, char **argv) // Create a object #ifdef ENABLE_MPI - global_obj = PDCobj_create_mpi(cont, obj_name, obj_prop, 0, comm); + global_obj = PDCobj_create_coll(cont, obj_name, obj_prop, 0, comm); #else global_obj = PDCobj_create(cont, obj_name, obj_prop); #endif diff --git a/src/tests/obj/read_obj_shared.c b/src/tests/obj/read_obj_shared.c index f617e12f9..21e472952 100644 --- a/src/tests/obj/read_obj_shared.c +++ b/src/tests/obj/read_obj_shared.c @@ -35,7 +35,7 @@ main(int argc, char **argv) uint64_t *offset, *local_offset; uint64_t *mysize; int i, j; - char * mydata; + char *mydata; char obj_name[128], cont_name[128]; uint64_t my_data_size; @@ -114,7 +114,7 @@ main(int argc, char **argv) // create a container /* sprintf(cont_name, "c%d", rank); */ sprintf(cont_name, "c"); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", "Call to PDCcont_create_col failed"); // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", @@ -140,7 +140,7 @@ main(int argc, char **argv) // Create a object #ifdef ENABLE_MPI - TASSERT((global_obj = PDCobj_create_mpi(cont, obj_name, obj_prop, 0, comm)) != 0, + TASSERT((global_obj = PDCobj_create_coll(cont, obj_name, obj_prop, 0, comm)) != 0, "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); #else TASSERT((global_obj = PDCobj_create(cont, obj_name, obj_prop)) != 0, "Call to PDCobj_create succeeded", diff --git a/src/tests/obj/write_obj_shared.c b/src/tests/obj/write_obj_shared.c index bc2fb18da..cca328348 100644 --- a/src/tests/obj/write_obj_shared.c +++ b/src/tests/obj/write_obj_shared.c @@ -39,7 +39,7 @@ main(int argc, char **argv) uint64_t *offset, *local_offset; uint64_t *mysize; int i, j; - char * mydata, *obj_data; + char *mydata, *obj_data; char obj_name[128], cont_name[128]; uint64_t my_data_size; @@ -148,7 +148,7 @@ main(int argc, char **argv) PDCprop_set_obj_tags(obj_prop, "tag0=1"); // Create a object - global_obj = PDCobj_create_mpi(cont, obj_name, obj_prop, 0, comm); + global_obj = PDCobj_create_coll(cont, obj_name, obj_prop, 0, comm); // global_obj = PDCobj_create(cont, obj_name, obj_prop); if (global_obj <= 0) { diff --git a/src/tests/tags/kvtag_affix_query_scale.c b/src/tests/tags/kvtag_affix_query_scale.c index c153650fb..8e4e1bc0e 100644 --- a/src/tests/tags/kvtag_affix_query_scale.c +++ b/src/tests/tags/kvtag_affix_query_scale.c @@ -129,15 +129,15 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t * obj_ids; + pdcid_t *obj_ids; int n_obj, my_obj, my_obj_s; int proc_num, my_rank, i, v, iter, round, selectivity, is_using_dart, query_type, comm_type; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t * pdc_ids; + uint64_t *pdc_ids; int nres, ntotal; - int * my_cnt_round; - int * total_cnt_round; + int *my_cnt_round; + int *total_cnt_round; int ret_value = SUCCEED; #ifdef ENABLE_MPI @@ -293,7 +293,7 @@ main(int argc, char *argv[]) ret_value = (comm_type == 0) ? PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, &nres, &pdc_ids) - : PDC_Client_search_obj_ref_through_dart_mpi( + : PDC_Client_search_obj_ref_through_dart_coll( hash_algo, query_string, ref_type, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, @@ -308,7 +308,7 @@ main(int argc, char *argv[]) #ifdef ENABLE_MPI ret_value = (comm_type == 0) ? PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) - : PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids); #endif @@ -342,7 +342,7 @@ main(int argc, char *argv[]) } #endif } // end query type - } // end comm type + } // end comm type if (my_rank == 0) { LOG_INFO("Rank %d: All queries are done\n", my_rank); diff --git a/src/tests/tags/kvtag_query.c b/src/tests/tags/kvtag_query.c index 8470d6f6d..0b6d8d4b2 100644 --- a/src/tests/tags/kvtag_query.c +++ b/src/tests/tags/kvtag_query.c @@ -80,13 +80,13 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t * obj_ids; + pdcid_t *obj_ids; int n_obj, n_add_tag, my_obj, my_obj_s, my_add_tag, my_add_tag_s; int proc_num = 1, rank = 0, i, v, iter, round, selectivity, is_using_dart; char obj_name[128]; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t * pdc_ids; + uint64_t *pdc_ids; int nres, ntotal; int ret_value = SUCCEED; @@ -113,7 +113,7 @@ main(int argc, char *argv[]) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", + TASSERT((cont = PDCcont_create_coll("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", "Call to PDCcont_create_col failed"); // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", @@ -183,8 +183,8 @@ main(int argc, char *argv[]) sprintf(value, "%ld", v); sprintf(exact_query, "%s=%s", kvtag.name, value); #ifdef ENABLE_MPI - if (PDC_Client_search_obj_ref_through_dart_mpi(hash_algo, exact_query, ref_type, &nres, &pdc_ids, - MPI_COMM_WORLD) < 0) { + if (PDC_Client_search_obj_ref_through_dart_coll(hash_algo, exact_query, ref_type, &nres, &pdc_ids, + MPI_COMM_WORLD) < 0) { #else if (PDC_Client_search_obj_ref_through_dart(hash_algo, exact_query, ref_type, &nres, &pdc_ids) < 0) { @@ -195,7 +195,7 @@ main(int argc, char *argv[]) } else { #ifdef ENABLE_MPI - if (PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD) < 0) { + if (PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD) < 0) { #else if (PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) < 0) { #endif diff --git a/src/tests/tags/kvtag_range_query_scale.c b/src/tests/tags/kvtag_range_query_scale.c index da9cec14d..71933863d 100644 --- a/src/tests/tags/kvtag_range_query_scale.c +++ b/src/tests/tags/kvtag_range_query_scale.c @@ -128,15 +128,15 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t * obj_ids; + pdcid_t *obj_ids; int n_obj, my_obj, my_obj_s; int proc_num, my_rank, i, v, iter, round, selectivity, is_using_dart, query_type, comm_type; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t * pdc_ids; + uint64_t *pdc_ids; int nres, ntotal; - int * my_cnt_round; - int * total_cnt_round; + int *my_cnt_round; + int *total_cnt_round; int ret_value = SUCCEED; #ifdef ENABLE_MPI @@ -277,7 +277,7 @@ main(int argc, char *argv[]) stime = MPI_Wtime(); } #endif - char * attr_name = (char *)calloc(64, sizeof(char)); + char *attr_name = (char *)calloc(64, sizeof(char)); int64_t *tag_value; snprintf(attr_name, 63, "attr_name"); tag_value = malloc(sizeof(int64_t)); @@ -306,7 +306,7 @@ main(int argc, char *argv[]) ret_value = (comm_type == 0) ? PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, &nres, &pdc_ids) - : PDC_Client_search_obj_ref_through_dart_mpi( + : PDC_Client_search_obj_ref_through_dart_coll( hash_algo, query_string, ref_type, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, @@ -319,7 +319,7 @@ main(int argc, char *argv[]) #ifdef ENABLE_MPI ret_value = (comm_type == 0) ? PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) - : PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids); #endif @@ -356,7 +356,7 @@ main(int argc, char *argv[]) } #endif } // end query type - } // end comm type + } // end comm type if (my_rank == 0) { LOG_JUST_PRINT("Rank %d: All queries are done\n", my_rank); diff --git a/src/tools/pdc_access_eqsim.c b/src/tools/pdc_access_eqsim.c index 902a46fce..ae6bd95fb 100644 --- a/src/tools/pdc_access_eqsim.c +++ b/src/tools/pdc_access_eqsim.c @@ -20,9 +20,9 @@ main(int argc, char **argv) uint64_t pdc_dims[3], pdc_offset[3], pdc_size[3], pdc_local_offset[3], pdc_local_size[3]; psize_t value_size; // 12x, 32x, 32x - char * fname, tag_name[128]; + char *fname, tag_name[128]; uint64_t dims[4] = {4634, 19201, 12801, 1}, chunk_size[4] = {400, 600, 400, 1}; - double * data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, + double *data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, *opensees_data = NULL, *tag_value = NULL; pdc_var_type_t value_type; @@ -47,7 +47,7 @@ main(int argc, char **argv) pdc = PDCinit("pdc"); - obj = PDCobj_open_col("run1", pdc); + obj = PDCobj_open_coll("run1", pdc); if (obj <= 0) LOG_ERROR("Failed to open object"); diff --git a/src/tools/pdc_import_eqsim.c b/src/tools/pdc_import_eqsim.c index a2ddae19c..7d3abba4d 100644 --- a/src/tools/pdc_import_eqsim.c +++ b/src/tools/pdc_import_eqsim.c @@ -26,7 +26,7 @@ main(int argc, char **argv) uint64_t pdc_dims[3], pdc_offset[3], pdc_size[3], pdc_local_offset[3], pdc_local_size[3]; uint32_t value_size; // 12x, 32x, 32x - char * fname, *dname = "vel_0 ijk layout", tag_name[128]; + char *fname, *dname = "vel_0 ijk layout", tag_name[128]; double *data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, *opensees_data = NULL, tag_value[4]; @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCprop_set_obj_app_name(obj_prop, "EQSIM"); PDCprop_set_obj_transfer_region_type(obj_prop, PDC_REGION_LOCAL); - obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); + obj = PDCobj_create_coll(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); if (obj <= 0) LOG_ERROR("Failed to create object"); diff --git a/src/tools/pdc_query_eqsim.c b/src/tools/pdc_query_eqsim.c index 233249255..222f46549 100644 --- a/src/tools/pdc_query_eqsim.c +++ b/src/tools/pdc_query_eqsim.c @@ -27,7 +27,7 @@ main(int argc, char **argv) uint64_t pdc_dims[3], pdc_offset[3], pdc_size[3], pdc_local_offset[3], pdc_local_size[3]; uint32_t value_size; // 12x, 32x, 32x - char * fname, *dname = "vel_0 ijk layout", tag_name[128]; + char *fname, *dname = "vel_0 ijk layout", tag_name[128]; double *data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, *opensees_data = NULL, tag_value[4]; @@ -139,7 +139,7 @@ main(int argc, char **argv) PDCprop_set_obj_app_name(obj_prop, "EQSIM"); /* PDCprop_set_obj_transfer_region_type(obj_prop, PDC_REGION_LOCAL); */ - obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); + obj = PDCobj_create_coll(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); /* obj = PDCobj_create(cont, "run1", obj_prop); */ if (obj <= 0) LOG_ERROR("Failed to create object\n"); From 487e7cffb40b305a0bdb2e6c5a65f23b02b01adc Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 16 Sep 2025 15:30:14 -0400 Subject: [PATCH 2/5] function rename --- docs/source/developer-notes.rst | 2 +- src/api/pdc_client_connect.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/developer-notes.rst b/docs/source/developer-notes.rst index a5bace3ae..283fc915a 100644 --- a/docs/source/developer-notes.rst +++ b/docs/source/developer-notes.rst @@ -162,7 +162,7 @@ No-index Approach For No-index approach, here are the APIs you can call for different communication models: * PDC_Client_query_kvtag (point-to-point) - * PDC_Client_query_kvtag_mpi (collective) + * PDC_Client_query_kvtag_coll (collective) The default PDC kvtags are stored within each object's metadata as a linked list, and any query involves traversing the list in memory. diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index 55b41d36b..5d2496476 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -8069,8 +8069,8 @@ PDC_assign_server(int32_t *my_server_start, int32_t *my_server_end, int32_t *my_ } // All clients collectively query all servers, each client gets partial results -perr_t -PDC_Client_query_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, int *query_sent) +static perr_t +PDC_Client_query_partial_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, int *query_sent) { FUNC_ENTER(NULL); @@ -8177,7 +8177,7 @@ _customized_all_gather_result(int query_sent, int *n_res, uint64_t **pdc_ids, MP int sub_n_obj_len = n_sent_ranks + 1; // the last element is the first rank who sent the query. int *sub_n_obj_arr = (int *)PDC_calloc(sub_n_obj_len, sizeof(int)); // FIXME: how to get the global rank number of the first rank who sent the query? - // currently, we use 0, since each time when PDC_Client_query_kvtag_col runs, it is always using the + // currently, we use 0, since each time when PDC_Client_query_kvtag_coll runs, it is always using the // first N ranks to send the query, where N is the number of servers. sub_n_obj_arr[sub_n_obj_len - 1] = 0; @@ -8242,7 +8242,7 @@ PDC_Client_query_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc MPI_Barrier(world_comm); stime = MPI_Wtime(); - ret_value = PDC_Client_query_kvtag_coll(kvtag, n_res, pdc_ids, &query_sent); + ret_value = PDC_Client_query_partial_kvtag_coll(kvtag, n_res, pdc_ids, &query_sent); MPI_Barrier(world_comm); duration = MPI_Wtime() - stime; From 0076c65928bc87ed7fb8628879c5403b098bb62d Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 16 Sep 2025 19:30:49 +0000 Subject: [PATCH 3/5] Committing clang-format changes --- examples/bdcats.c | 20 +- examples/bdcats_batch.c | 14 +- examples/haccio.c | 4 +- examples/haccio_v2.c | 4 +- examples/tileio.c | 2 +- examples/vpicio.c | 6 +- examples/vpicio_batch.c | 8 +- examples/vpicio_old.c | 6 +- src/api/include/pdc_client_connect.h | 22 +- src/api/pdc_client_connect.c | 214 +++++++-------- src/api/pdc_meta/pdc_metadata_client.c | 2 +- src/api/pdc_obj/include/pdc_cont.h | 2 +- src/api/pdc_obj/pdc_cont.c | 16 +- src/api/pdc_obj/pdc_mpi.c | 6 +- src/api/pdc_obj/pdc_obj.c | 44 ++-- src/api/pdc_region/include/pdc_region.h | 8 +- src/api/pdc_region/pdc_region_transfer.c | 62 ++--- .../include/pdc_server_data.h | 86 +++--- .../pdc_server_region/pdc_server_data.c | 248 +++++++++--------- src/tests/deprecated/blocked_lock.c | 2 +- src/tests/deprecated/buf_map_mpi_v2.c | 2 +- src/tests/deprecated/buf_obj_map_mpi.c | 4 +- src/tests/deprecated/obj_transformation.c | 12 +- src/tests/deprecated/vpicio_old.c | 6 +- src/tests/deprecated/vpicio_v2.c | 12 +- src/tests/misc/llsm_idioms_bench.c | 16 +- src/tests/misc/vpicio.c | 6 +- src/tests/misc/vpicio_mts.c | 4 +- src/tests/obj/create_obj_scale.c | 2 +- src/tests/obj/read_obj.c | 4 +- src/tests/obj/read_obj_shared.c | 2 +- src/tests/obj/write_obj_shared.c | 2 +- src/tests/tags/kvtag_affix_query_scale.c | 10 +- src/tests/tags/kvtag_query.c | 4 +- src/tests/tags/kvtag_range_query_scale.c | 12 +- src/tools/pdc_access_eqsim.c | 4 +- src/tools/pdc_import_eqsim.c | 2 +- src/tools/pdc_query_eqsim.c | 2 +- 38 files changed, 441 insertions(+), 441 deletions(-) diff --git a/examples/bdcats.c b/examples/bdcats.c index 5106bb1ea..d0b554eba 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -57,9 +57,9 @@ main(int argc, char **argv) pdcid_t region_xx, region_yy, region_zz, region_pxx, region_pyy, region_pzz, region_id11, region_id22; perr_t ret; - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; uint64_t numparticles; int ndim = 1; uint64_t *offset; @@ -101,11 +101,11 @@ main(int argc, char **argv) if (cont_id == 0) LOG_ERROR("Failed to create container"); - // open objects + // open objects #ifdef ENABLE_MPI obj_xx = PDCobj_open_coll("obj-var-xx", pdc_id); #else - obj_xx = PDCobj_open("obj-var-xx", pdc_id); + obj_xx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_xx == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-xx"); @@ -114,7 +114,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_yy = PDCobj_open_coll("obj-var-yy", pdc_id); #else - obj_yy = PDCobj_open("obj-var-xx", pdc_id); + obj_yy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_yy == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-yy"); @@ -123,7 +123,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_zz = PDCobj_open_coll("obj-var-zz", pdc_id); #else - obj_zz = PDCobj_open("obj-var-xx", pdc_id); + obj_zz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_zz == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-zz"); @@ -132,7 +132,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_pxx = PDCobj_open_coll("obj-var-pxx", pdc_id); #else - obj_pxx = PDCobj_open("obj-var-xx", pdc_id); + obj_pxx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pxx == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-pxx"); @@ -141,7 +141,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_pyy = PDCobj_open_coll("obj-var-pyy", pdc_id); #else - obj_pyy = PDCobj_open("obj-var-xx", pdc_id); + obj_pyy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pyy == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-pyy"); @@ -150,7 +150,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_pzz = PDCobj_open_coll("obj-var-pzz", pdc_id); #else - obj_pzz = PDCobj_open("obj-var-xx", pdc_id); + obj_pzz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pzz == 0) { LOG_ERROR("Error when open object %s\n", "obj-var-pzz"); diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index bdd772950..c73e75434 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -66,7 +66,7 @@ main(int argc, char **argv) char obj_name[128]; float *x, *y, *z; float *px, *py, *pz; - int *id1, *id2; + int * id1, *id2; // int x_dim = 64; // int y_dim = 64; // int z_dim = 64; @@ -177,7 +177,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_xx[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_xx[i] = PDCobj_open(obj_name, pdc_id); + obj_xx[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_xx[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); @@ -187,7 +187,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_yy[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_yy[i] = PDCobj_open(obj_name, pdc_id); + obj_yy[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_yy[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); @@ -197,7 +197,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_zz[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_zz[i] = PDCobj_open(obj_name, pdc_id); + obj_zz[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_zz[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); @@ -207,7 +207,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_pxx[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_pxx[i] = PDCobj_open(obj_name, pdc_id); + obj_pxx[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pxx[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); @@ -217,7 +217,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_pyy[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_pyy[i] = PDCobj_open(obj_name, pdc_id); + obj_pyy[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pyy[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); @@ -227,7 +227,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_pzz[i] = PDCobj_open_coll(obj_name, pdc_id); #else - obj_pzz[i] = PDCobj_open(obj_name, pdc_id); + obj_pzz[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pzz[i] == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); diff --git a/examples/haccio.c b/examples/haccio.c index 94468611a..55e0a5033 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -26,11 +26,11 @@ mask | int16 | 2 bytes * ------------------ */ -static char *VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; +static char * VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; static pdc_var_type_t VAR_TYPES[NUM_VARS] = {PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_INT64, PDC_INT16}; static int NUM_PARTICLES = (1 * 1024 * 1024); -void *buffers[NUM_VARS]; +void * buffers[NUM_VARS]; MPI_Comm comm; diff --git a/examples/haccio_v2.c b/examples/haccio_v2.c index 21d1ec341..10157df3a 100644 --- a/examples/haccio_v2.c +++ b/examples/haccio_v2.c @@ -26,11 +26,11 @@ mask | int16 | 2 bytes * ------------------ */ -static char *VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; +static char * VAR_NAMES[NUM_VARS] = {"xx", "yy", "zz", "vx", "vy", "vz", "phi", "phd", "mask"}; static pdc_var_type_t VAR_TYPES[NUM_VARS] = {PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_FLOAT, PDC_INT64, PDC_INT16}; static int NUM_PARTICLES = (1 * 1024 * 1024); -void *buffers[NUM_VARS]; +void * buffers[NUM_VARS]; MPI_Comm comm; diff --git a/examples/tileio.c b/examples/tileio.c index e7ec95db6..5ebda4497 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -99,7 +99,7 @@ main(int argc, char **argv) pdcid_t obj_id, obj_prop; pdcid_t local_region_id, global_region_id; - double *local_buffer = (double *)malloc(g_x_ept * g_y_ept * sizeof(double)); + double * local_buffer = (double *)malloc(g_x_ept * g_y_ept * sizeof(double)); uint64_t dims[NUM_DIMS] = {g_x_ept, g_y_ept}; uint64_t local_offsets[NUM_DIMS], global_offsets[NUM_DIMS]; local_offsets[0] = 0; diff --git a/examples/vpicio.c b/examples/vpicio.c index 702c17aaf..9bf6b9b95 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -63,9 +63,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index 1eee6ff8d..9b5df3d84 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -67,9 +67,9 @@ main(int argc, char **argv) int comm = 1; #endif char obj_name[128]; - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; @@ -82,7 +82,7 @@ main(int argc, char **argv) unsigned sleep_time = 0; int test_method = 2; int do_flush = 0; - pdcid_t *transfer_request_x, *transfer_request_y, *transfer_request_z, *transfer_request_px, + pdcid_t * transfer_request_x, *transfer_request_y, *transfer_request_z, *transfer_request_px, *transfer_request_py, *transfer_request_pz, *transfer_request_id1, *transfer_request_id2, *ptr, *temp_requests; diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index e7e2496cd..5e3b2a9b2 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -63,9 +63,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; diff --git a/src/api/include/pdc_client_connect.h b/src/api/include/pdc_client_connect.h index 452b987fd..8b476519e 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 5d2496476..9a519ee8e 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); @@ -2631,7 +2631,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; @@ -2784,7 +2784,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++) { @@ -2812,7 +2812,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); @@ -2995,7 +2995,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; @@ -3024,7 +3024,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"); @@ -3093,7 +3093,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; @@ -3156,7 +3156,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; @@ -3222,7 +3222,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]; @@ -3292,7 +3292,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; @@ -3519,12 +3519,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; @@ -3906,11 +3906,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; @@ -3998,8 +3998,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; @@ -4123,8 +4123,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; @@ -4245,8 +4245,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; @@ -4343,9 +4343,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 @@ -4398,7 +4398,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); @@ -4608,7 +4608,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; if ((info = PDC_find_id(local_obj_id)) == NULL) @@ -4827,7 +4827,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; @@ -4858,7 +4858,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; @@ -4891,7 +4891,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; @@ -5131,12 +5131,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) @@ -5419,7 +5419,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); @@ -5446,7 +5446,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; @@ -5511,7 +5511,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"); @@ -5544,7 +5544,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; @@ -5653,8 +5653,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; @@ -5752,15 +5752,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); @@ -5979,12 +5979,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; @@ -6268,7 +6268,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) { @@ -6339,8 +6339,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) { @@ -6441,8 +6441,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); @@ -6501,12 +6501,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; @@ -6552,14 +6552,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; @@ -6729,8 +6729,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) { @@ -6956,7 +6956,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; if ((id_info = PDC_find_id(cont_id)) == NULL) @@ -7055,7 +7055,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) { @@ -7182,7 +7182,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); @@ -7209,10 +7209,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; @@ -7299,12 +7299,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; @@ -7383,7 +7383,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) @@ -7454,11 +7454,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; @@ -7528,9 +7528,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); @@ -7620,7 +7620,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; @@ -7629,8 +7629,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; @@ -7785,7 +7785,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; @@ -7849,9 +7849,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_meta/pdc_metadata_client.c b/src/api/pdc_meta/pdc_metadata_client.c index 5fde6f3bd..0c71df4ce 100644 --- a/src/api/pdc_meta/pdc_metadata_client.c +++ b/src/api/pdc_meta/pdc_metadata_client.c @@ -42,7 +42,7 @@ splitExpression(const char *expression, char conditions[][CONDITION_LENGTH], int FUNC_ENTER(NULL); char tempExpr[1024]; - char *token; + char * token; const char delimiters[] = "AND OR"; int index = 0; diff --git a/src/api/pdc_obj/include/pdc_cont.h b/src/api/pdc_obj/include/pdc_cont.h index dfc6ed905..039327b1d 100644 --- a/src/api/pdc_obj/include/pdc_cont.h +++ b/src/api/pdc_obj/include/pdc_cont.h @@ -33,7 +33,7 @@ typedef struct _pdc_id_info cont_handle; /* Library Public Struct */ /**************************/ struct pdc_cont_info { - char *name; + char * name; pdcid_t local_id; uint64_t meta_id; }; diff --git a/src/api/pdc_obj/pdc_cont.c b/src/api/pdc_obj/pdc_cont.c index 155707103..6e421c6f1 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) @@ -107,7 +107,7 @@ PDCcont_create_coll(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)); @@ -310,7 +310,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; if ((id_info = PDC_find_id(cont_id)) == NULL) PGOTO_ERROR(NULL, "Failed to find PDC ID: %d", cont_id); @@ -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_mpi.c b/src/api/pdc_obj/pdc_mpi.c index f36189a33..1628a81a8 100644 --- a/src/api/pdc_obj/pdc_mpi.c +++ b/src/api/pdc_obj/pdc_mpi.c @@ -35,7 +35,7 @@ PDCobj_create_coll(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, i FUNC_ENTER(NULL); struct _pdc_obj_info *p = NULL; - struct _pdc_id_info *id_info = NULL; + struct _pdc_id_info * id_info = NULL; int rank; pdcid_t ret_value; @@ -68,7 +68,7 @@ PDCobj_encode(pdcid_t obj_id, pdcid_t *meta_id) FUNC_ENTER(NULL); perr_t ret_value = SUCCEED; - struct _pdc_id_info *objinfo; + struct _pdc_id_info * objinfo; struct _pdc_obj_info *obj; int client_rank, client_size; @@ -97,7 +97,7 @@ PDCobj_decode(pdcid_t obj_id, pdcid_t meta_id) FUNC_ENTER(NULL); pdcid_t ret_value = 0; - struct _pdc_id_info *objinfo; + struct _pdc_id_info * objinfo; struct _pdc_obj_info *obj; int client_rank, client_size; diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 2d73bdd8c..82af7e6fc 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; @@ -731,7 +731,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) @@ -758,7 +758,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -776,7 +776,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -794,7 +794,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -812,7 +812,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; if ((info = PDC_find_id(obj_prop)) == NULL) @@ -830,7 +830,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; @@ -866,7 +866,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; if ((info = PDC_find_id(obj_id)) == NULL) @@ -885,10 +885,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; if ((info = PDC_find_id(obj_id)) == NULL) PGOTO_ERROR(NULL, "Failed to find PDC ID: %d", obj_id); @@ -907,7 +907,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; if ((obj = PDC_find_id(obj_id)) == NULL) @@ -1087,7 +1087,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_region/include/pdc_region.h b/src/api/pdc_region/include/pdc_region.h index 4a71be23b..fa5c6aaa1 100644 --- a/src/api/pdc_region/include/pdc_region.h +++ b/src/api/pdc_region/include/pdc_region.h @@ -41,11 +41,11 @@ struct pdc_region_info { pdcid_t local_id; struct _pdc_obj_info *obj; size_t ndim; - uint64_t *offset; - uint64_t *size; + uint64_t * offset; + uint64_t * size; bool mapping; int registered_op; - void *buf; + void * buf; size_t unit; }; @@ -288,7 +288,7 @@ pbool_t PDC_region_info_transfer_t_is_equal(const region_info_transfer_t *reg1, * @return Non-negative on success, negative on failure. */ perr_t PDC_copy_region_info_transfer_t(const region_info_transfer_t *src_reg, - region_info_transfer_t *dest_reg); + region_info_transfer_t * dest_reg); /** * @brief Calculate the size of a region descriptor in bytes. diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 88f001f2a..91e0ffcd0 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 @@ -136,7 +136,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; @@ -150,7 +150,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; @@ -286,12 +286,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; @@ -370,7 +370,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; @@ -618,7 +618,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; @@ -686,7 +686,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; @@ -734,13 +734,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; @@ -834,10 +834,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; hg_bulk_t bulk_handle; transfer_request_output = NULL; @@ -976,7 +976,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; int ret_value = SUCCEED; @@ -1180,7 +1180,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; @@ -1287,10 +1287,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; hg_bulk_t bulk_handle; if (size == 0) @@ -1369,10 +1369,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; @@ -1469,7 +1469,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) { @@ -1552,7 +1552,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; @@ -1690,7 +1690,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; @@ -1729,7 +1729,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; @@ -1816,15 +1816,15 @@ 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; hg_bulk_t bulk_handle; struct _pdc_id_info **transferinfos; - struct _pdc_id_info *transfer_info; + struct _pdc_id_info * transfer_info; 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; @@ -2061,7 +2061,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_server_region/include/pdc_server_data.h b/src/server/pdc_server_region/include/pdc_server_data.h index 8056769b2..cd1c95f4d 100644 --- a/src/server/pdc_server_region/include/pdc_server_data.h +++ b/src/server/pdc_server_region/include/pdc_server_data.h @@ -47,11 +47,11 @@ struct buf_map_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char *ret_string; - void *void_buf; - char *server_addr; - pdc_metadata_t *meta; - region_list_t **region_lists; + char * ret_string; + void * void_buf; + char * server_addr; + pdc_metadata_t * meta; + region_list_t ** region_lists; uint32_t n_loc; struct transfer_buf_map *buf_map_args; } buf_map_server_lookup_args_t; @@ -60,11 +60,11 @@ struct obj_map_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char *ret_string; - void *void_buf; - char *server_addr; - pdc_metadata_t *meta; - region_list_t **region_lists; + char * ret_string; + void * void_buf; + char * server_addr; + pdc_metadata_t * meta; + region_list_t ** region_lists; uint32_t n_loc; struct transfer_obj_map *obj_map_args; } obj_map_server_lookup_args_t; @@ -78,11 +78,11 @@ struct buf_unmap_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char *ret_string; - void *void_buf; - char *server_addr; - pdc_metadata_t *meta; - region_list_t **region_lists; + char * ret_string; + void * void_buf; + char * server_addr; + pdc_metadata_t * meta; + region_list_t ** region_lists; uint32_t n_loc; struct transfer_buf_unmap *buf_unmap_args; } buf_unmap_server_lookup_args_t; @@ -91,11 +91,11 @@ struct obj_unmap_server_lookup_args_t { int server_id; uint32_t client_id; int ret_int; - char *ret_string; - void *void_buf; - char *server_addr; - pdc_metadata_t *meta; - region_list_t **region_lists; + char * ret_string; + void * void_buf; + char * server_addr; + pdc_metadata_t * meta; + region_list_t ** region_lists; uint32_t n_loc; struct transfer_obj_unmap *obj_unmap_args; } obj_unmap_server_lookup_args_t; @@ -138,13 +138,13 @@ struct transfer_buf_unmap_args { /****************************/ typedef struct notify_multi_io_args_t { hg_bulk_t bulk_handle; - void *buf_sizes; - void *buf_ptrs; + void * buf_sizes; + void * buf_ptrs; region_list_t *region_list; } notify_multi_io_args_t; typedef struct bulk_xfer_data_t { - void **buf_ptrs; + void ** buf_ptrs; hg_size_t *buf_sizes; int n_alloc; int idx; @@ -173,13 +173,13 @@ typedef struct accumulate_storage_meta_t { } accumulate_storage_meta_t; typedef struct storage_meta_query_one_name_args_t { - char *name; + char * name; int n_res; int seq_id; region_list_t *req_region; region_list_t *overlap_storage_region_list; perr_t (*cb)(); - void *cb_args; + void * cb_args; accumulate_storage_meta_t *accu_meta; } storage_meta_query_one_name_args_t; @@ -187,24 +187,24 @@ typedef struct server_read_check_out_t { int ret; int is_cache_to_bb; region_list_t *region; - char *shm_addr; + char * shm_addr; } server_read_check_out_t; // Data query typedef struct query_task_t { - pdc_query_t *query; + pdc_query_t * query; int query_id; int manager; int client_id; int n_sent_server; int n_unique_obj; - uint64_t *obj_ids; + uint64_t * obj_ids; int n_recv_obj; int ndim; pdc_query_get_op_t get_op; - region_list_t *region_constraint; + region_list_t * region_constraint; uint64_t total_elem; - int *invalid_region_ids; + int * invalid_region_ids; int ninvalid_region; int prev_server_id; int next_server_id; @@ -213,17 +213,17 @@ typedef struct query_task_t { int is_done; int n_recv; uint64_t nhits; - uint64_t *coords; + uint64_t * coords; uint64_t **coords_arr; - uint64_t *n_hits_from_server; + uint64_t * n_hits_from_server; // Data read int n_read_data_region; - void **data_arr; + void ** data_arr; uint64_t *my_read_coords; uint64_t my_nread_coords; uint64_t my_read_obj_id; - void *my_data; + void * my_data; int client_seq_id; struct query_task_t *prev; @@ -272,21 +272,21 @@ extern int buffer_write_request_total_g; extern int buffer_write_request_num_g; extern int buffer_read_request_num_g; extern int is_server_direct_io_g; -extern pdc_task_list_t *pdc_server_agg_task_head_g; -extern pdc_task_list_t *pdc_server_s2s_task_head_g; +extern pdc_task_list_t * pdc_server_agg_task_head_g; +extern pdc_task_list_t * pdc_server_s2s_task_head_g; extern int pdc_server_task_id_g; -extern hg_class_t *hg_class_g; -extern hg_context_t *hg_context_g; +extern hg_class_t * hg_class_g; +extern hg_context_t * hg_context_g; extern pdc_remote_server_info_t *pdc_remote_server_info_g; extern int is_debug_g; extern int n_read_from_bb_g; extern int read_from_bb_size_g; extern int gen_hist_g; -extern pdc_data_server_io_list_t *pdc_data_server_read_list_head_g; -extern pdc_data_server_io_list_t *pdc_data_server_write_list_head_g; +extern pdc_data_server_io_list_t * pdc_data_server_read_list_head_g; +extern pdc_data_server_io_list_t * pdc_data_server_write_list_head_g; extern update_storage_meta_list_t *pdc_update_storage_meta_list_head_g; -extern pdc_client_info_t *pdc_client_info_g; +extern pdc_client_info_t * pdc_client_info_g; extern int pdc_client_num_g; extern double total_mem_usage_g; extern int lustre_stripe_size_mb_g; @@ -309,7 +309,7 @@ extern hg_id_t send_data_query_region_register_id_g; extern hg_id_t send_read_sel_obj_id_rpc_register_id_g; extern hg_id_t send_nhits_register_id_g; extern hg_id_t send_bulk_rpc_register_id_g; -extern char *gBinningOption; +extern char * gBinningOption; extern int gen_fastbit_idx_g; extern int use_fastbit_idx_g; @@ -663,7 +663,7 @@ perr_t PDC_Server_close_shm(region_list_t *region, int is_remove); */ perr_t 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); /** * ********** diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 562832f49..58a611866 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_coll(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_coll(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_coll(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/deprecated/blocked_lock.c b/src/tests/deprecated/blocked_lock.c index 330f790b8..6435b66a3 100644 --- a/src/tests/deprecated/blocked_lock.c +++ b/src/tests/deprecated/blocked_lock.c @@ -47,7 +47,7 @@ main(int argc, char **argv) pdcid_t obj2; pdcid_t r1, r2; perr_t ret; - float *x; + float * x; int x_dim = 64; long numparticles = 8388608; // const int my_data_size = 992; diff --git a/src/tests/deprecated/buf_map_mpi_v2.c b/src/tests/deprecated/buf_map_mpi_v2.c index d67ee9c22..c7b5690ec 100644 --- a/src/tests/deprecated/buf_map_mpi_v2.c +++ b/src/tests/deprecated/buf_map_mpi_v2.c @@ -52,7 +52,7 @@ main(int argc, char **argv) #else int comm = 1; #endif - float *x; + float * x; long numparticles = 4; uint64_t dims[1] = {numparticles}; // {8388608}; int ndim = 1; diff --git a/src/tests/deprecated/buf_obj_map_mpi.c b/src/tests/deprecated/buf_obj_map_mpi.c index bf21ac7dc..a101f0cd1 100644 --- a/src/tests/deprecated/buf_obj_map_mpi.c +++ b/src/tests/deprecated/buf_obj_map_mpi.c @@ -52,7 +52,7 @@ main(int argc, char **argv) #else int comm = 1; #endif - float *x; + float * x; int x_dim = 64; long numparticles = 4; uint64_t dims[1] = {numparticles}; // {8388608}; @@ -96,7 +96,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj2 = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop2, 0, comm); #else - obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); + obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); #endif if (obj2 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); diff --git a/src/tests/deprecated/obj_transformation.c b/src/tests/deprecated/obj_transformation.c index da7574cce..61fac94b1 100644 --- a/src/tests/deprecated/obj_transformation.c +++ b/src/tests/deprecated/obj_transformation.c @@ -62,18 +62,18 @@ main(int argc, char **argv) struct timeval ht_total_end; long long ht_total_elapsed; double ht_total_sec; - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; uint64_t numparticles, i; uint64_t dims[1]; int ndim = 1; - uint64_t *offset; - uint64_t *offset_remote; - uint64_t *mysize; + uint64_t * offset; + uint64_t * offset_remote; + uint64_t * mysize; #ifdef ENABLE_MPI MPI_Init(&argc, &argv); diff --git a/src/tests/deprecated/vpicio_old.c b/src/tests/deprecated/vpicio_old.c index 53785cb92..47057d655 100644 --- a/src/tests/deprecated/vpicio_old.c +++ b/src/tests/deprecated/vpicio_old.c @@ -63,9 +63,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; diff --git a/src/tests/deprecated/vpicio_v2.c b/src/tests/deprecated/vpicio_v2.c index 41a602a35..f6cfcdae9 100644 --- a/src/tests/deprecated/vpicio_v2.c +++ b/src/tests/deprecated/vpicio_v2.c @@ -65,18 +65,18 @@ main(int argc, char **argv) struct timeval ht_total_end; long long ht_total_elapsed; double ht_total_sec; - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; uint64_t numparticles, i; uint64_t dims[1]; int ndim = 1; - uint64_t *offset; - uint64_t *offset_remote; - uint64_t *mysize; + uint64_t * offset; + uint64_t * offset_remote; + uint64_t * mysize; #ifdef ENABLE_MPI MPI_Init(&argc, &argv); diff --git a/src/tests/misc/llsm_idioms_bench.c b/src/tests/misc/llsm_idioms_bench.c index a163f80f5..86a6d6d50 100644 --- a/src/tests/misc/llsm_idioms_bench.c +++ b/src/tests/misc/llsm_idioms_bench.c @@ -396,15 +396,15 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t *obj_ids; + pdcid_t * obj_ids; int n_obj, my_csv_rows, num_columns; int proc_num, my_rank, i, v, iter, round, csv_expand_factor, is_using_dart, query_type, comm_type; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t *pdc_ids; + uint64_t * pdc_ids; int nres, ntotal; - int *my_cnt_round; - int *total_cnt_round; + int * my_cnt_round; + int * total_cnt_round; int ret_value = SUCCEED; #ifdef ENABLE_MPI @@ -435,7 +435,7 @@ main(int argc, char *argv[]) PGOTO_ERROR(FAIL, "Failed to prepare container"); // ********************** Read and Broadcast first few rows of CSV file ********************** - char *data = NULL; + char * data = NULL; size_t data_size = 0; if (my_rank == 0) { @@ -464,7 +464,7 @@ main(int argc, char *argv[]) // ********************** Parse these rows of CSV file ********************** // read the CSV file and parse into data - char **csv_header = (char **)calloc(MAX_COLUMNS, sizeof(char *)); + char ** csv_header = (char **)calloc(MAX_COLUMNS, sizeof(char *)); char ***csv_data = NULL; my_csv_rows = read_csv_from_buffer(data, &csv_header, &csv_data, &num_columns, rows_to_read, my_rank, proc_num); @@ -485,7 +485,7 @@ main(int argc, char *argv[]) LOG_INFO("[Object Creation] Rank %d/%d: Created %d objects, time: %.5f ms\n", my_rank, proc_num, obj_created, total_time * 1000.0); - // ********************** Add tags to objects ********************** + // ********************** Add tags to objects ********************** #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); stime = MPI_Wtime(); @@ -551,7 +551,7 @@ main(int argc, char *argv[]) } #endif } // end query type - } // end comm type + } // end comm type if (my_rank == 0) { LOG_INFO("Rank %d: All queries are done\n", my_rank); diff --git a/src/tests/misc/vpicio.c b/src/tests/misc/vpicio.c index 35aecf02f..1f60e5908 100644 --- a/src/tests/misc/vpicio.c +++ b/src/tests/misc/vpicio.c @@ -64,9 +64,9 @@ main(int argc, char **argv) #else int comm = 1; #endif - float *x, *y, *z; - float *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z; + float * px, *py, *pz; + int * id1, *id2; int x_dim = 64; int y_dim = 64; int z_dim = 64; diff --git a/src/tests/misc/vpicio_mts.c b/src/tests/misc/vpicio_mts.c index 3ce4af46c..be775a7a3 100644 --- a/src/tests/misc/vpicio_mts.c +++ b/src/tests/misc/vpicio_mts.c @@ -60,8 +60,8 @@ main(int argc, char **argv) #else int comm = 1; #endif - float *x, *y, *z, *px, *py, *pz; - int *id1, *id2; + float * x, *y, *z, *px, *py, *pz; + int * id1, *id2; int x_dim = 64, y_dim = 64, z_dim = 64, ndim = 1, steps = 1, sleeptime = 0; uint64_t numparticles, dims[1], offset_local[1], offset_remote[1], mysize[1]; double t0, t1; diff --git a/src/tests/obj/create_obj_scale.c b/src/tests/obj/create_obj_scale.c index fb570c416..17b00ce07 100644 --- a/src/tests/obj/create_obj_scale.c +++ b/src/tests/obj/create_obj_scale.c @@ -79,7 +79,7 @@ main(int argc, char **argv) char obj_prefix[4][10] = {"x", "y", "z", "energy"}; char tmp_str[128]; char name_mode[6][32] = {"Random Obj Names", "INVALID!", "One Obj Name", - "INVALID!", "INVALID!", "Four Obj Names"}; + "INVALID!", "INVALID!", "Four Obj Names"}; #ifdef ENABLE_MPI MPI_Init(&argc, &argv); diff --git a/src/tests/obj/read_obj.c b/src/tests/obj/read_obj.c index b26eca20e..074aa0c38 100644 --- a/src/tests/obj/read_obj.c +++ b/src/tests/obj/read_obj.c @@ -26,7 +26,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI MPI_Comm comm; #else - int comm = 1; + int comm = 1; #endif struct timeval pdc_timer_start; struct timeval pdc_timer_end; @@ -38,7 +38,7 @@ main(int argc, char **argv) uint64_t *offset, *local_offset; uint64_t *mysize; int i, j; - char *mydata; + char * mydata; char obj_name[128], cont_name[128]; uint64_t my_data_size; diff --git a/src/tests/obj/read_obj_shared.c b/src/tests/obj/read_obj_shared.c index 21e472952..57bb65c48 100644 --- a/src/tests/obj/read_obj_shared.c +++ b/src/tests/obj/read_obj_shared.c @@ -35,7 +35,7 @@ main(int argc, char **argv) uint64_t *offset, *local_offset; uint64_t *mysize; int i, j; - char *mydata; + char * mydata; char obj_name[128], cont_name[128]; uint64_t my_data_size; diff --git a/src/tests/obj/write_obj_shared.c b/src/tests/obj/write_obj_shared.c index cca328348..bf533c6fe 100644 --- a/src/tests/obj/write_obj_shared.c +++ b/src/tests/obj/write_obj_shared.c @@ -39,7 +39,7 @@ main(int argc, char **argv) uint64_t *offset, *local_offset; uint64_t *mysize; int i, j; - char *mydata, *obj_data; + char * mydata, *obj_data; char obj_name[128], cont_name[128]; uint64_t my_data_size; diff --git a/src/tests/tags/kvtag_affix_query_scale.c b/src/tests/tags/kvtag_affix_query_scale.c index 8e4e1bc0e..755aa19a6 100644 --- a/src/tests/tags/kvtag_affix_query_scale.c +++ b/src/tests/tags/kvtag_affix_query_scale.c @@ -129,15 +129,15 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t *obj_ids; + pdcid_t * obj_ids; int n_obj, my_obj, my_obj_s; int proc_num, my_rank, i, v, iter, round, selectivity, is_using_dart, query_type, comm_type; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t *pdc_ids; + uint64_t * pdc_ids; int nres, ntotal; - int *my_cnt_round; - int *total_cnt_round; + int * my_cnt_round; + int * total_cnt_round; int ret_value = SUCCEED; #ifdef ENABLE_MPI @@ -342,7 +342,7 @@ main(int argc, char *argv[]) } #endif } // end query type - } // end comm type + } // end comm type if (my_rank == 0) { LOG_INFO("Rank %d: All queries are done\n", my_rank); diff --git a/src/tests/tags/kvtag_query.c b/src/tests/tags/kvtag_query.c index 0b6d8d4b2..c8b367849 100644 --- a/src/tests/tags/kvtag_query.c +++ b/src/tests/tags/kvtag_query.c @@ -80,13 +80,13 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t *obj_ids; + pdcid_t * obj_ids; int n_obj, n_add_tag, my_obj, my_obj_s, my_add_tag, my_add_tag_s; int proc_num = 1, rank = 0, i, v, iter, round, selectivity, is_using_dart; char obj_name[128]; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t *pdc_ids; + uint64_t * pdc_ids; int nres, ntotal; int ret_value = SUCCEED; diff --git a/src/tests/tags/kvtag_range_query_scale.c b/src/tests/tags/kvtag_range_query_scale.c index 71933863d..cee0fa6d8 100644 --- a/src/tests/tags/kvtag_range_query_scale.c +++ b/src/tests/tags/kvtag_range_query_scale.c @@ -128,15 +128,15 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t *obj_ids; + pdcid_t * obj_ids; int n_obj, my_obj, my_obj_s; int proc_num, my_rank, i, v, iter, round, selectivity, is_using_dart, query_type, comm_type; double stime, total_time; pdc_kvtag_t kvtag; - uint64_t *pdc_ids; + uint64_t * pdc_ids; int nres, ntotal; - int *my_cnt_round; - int *total_cnt_round; + int * my_cnt_round; + int * total_cnt_round; int ret_value = SUCCEED; #ifdef ENABLE_MPI @@ -277,7 +277,7 @@ main(int argc, char *argv[]) stime = MPI_Wtime(); } #endif - char *attr_name = (char *)calloc(64, sizeof(char)); + char * attr_name = (char *)calloc(64, sizeof(char)); int64_t *tag_value; snprintf(attr_name, 63, "attr_name"); tag_value = malloc(sizeof(int64_t)); @@ -356,7 +356,7 @@ main(int argc, char *argv[]) } #endif } // end query type - } // end comm type + } // end comm type if (my_rank == 0) { LOG_JUST_PRINT("Rank %d: All queries are done\n", my_rank); diff --git a/src/tools/pdc_access_eqsim.c b/src/tools/pdc_access_eqsim.c index ae6bd95fb..ab3ea00dc 100644 --- a/src/tools/pdc_access_eqsim.c +++ b/src/tools/pdc_access_eqsim.c @@ -20,9 +20,9 @@ main(int argc, char **argv) uint64_t pdc_dims[3], pdc_offset[3], pdc_size[3], pdc_local_offset[3], pdc_local_size[3]; psize_t value_size; // 12x, 32x, 32x - char *fname, tag_name[128]; + char * fname, tag_name[128]; uint64_t dims[4] = {4634, 19201, 12801, 1}, chunk_size[4] = {400, 600, 400, 1}; - double *data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, + double * data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, *opensees_data = NULL, *tag_value = NULL; pdc_var_type_t value_type; diff --git a/src/tools/pdc_import_eqsim.c b/src/tools/pdc_import_eqsim.c index 7d3abba4d..e612f50ef 100644 --- a/src/tools/pdc_import_eqsim.c +++ b/src/tools/pdc_import_eqsim.c @@ -26,7 +26,7 @@ main(int argc, char **argv) uint64_t pdc_dims[3], pdc_offset[3], pdc_size[3], pdc_local_offset[3], pdc_local_size[3]; uint32_t value_size; // 12x, 32x, 32x - char *fname, *dname = "vel_0 ijk layout", tag_name[128]; + char * fname, *dname = "vel_0 ijk layout", tag_name[128]; double *data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, *opensees_data = NULL, tag_value[4]; diff --git a/src/tools/pdc_query_eqsim.c b/src/tools/pdc_query_eqsim.c index 222f46549..ee442c0ff 100644 --- a/src/tools/pdc_query_eqsim.c +++ b/src/tools/pdc_query_eqsim.c @@ -27,7 +27,7 @@ main(int argc, char **argv) uint64_t pdc_dims[3], pdc_offset[3], pdc_size[3], pdc_local_offset[3], pdc_local_size[3]; uint32_t value_size; // 12x, 32x, 32x - char *fname, *dname = "vel_0 ijk layout", tag_name[128]; + char * fname, *dname = "vel_0 ijk layout", tag_name[128]; double *data = NULL, t0, t1, t2, data_max, data_min, *ssi_data = NULL, *rec_data = NULL, *opensees_data = NULL, tag_value[4]; From f406528b33f654c2ee8d46f91562a84cbcdf08aa Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 16 Sep 2025 15:32:59 -0400 Subject: [PATCH 4/5] formatting --- src/tests/tags/kvtag_add_get_benchmark.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/tags/kvtag_add_get_benchmark.c b/src/tests/tags/kvtag_add_get_benchmark.c index 11e888403..6b80595b5 100644 --- a/src/tests/tags/kvtag_add_get_benchmark.c +++ b/src/tests/tags/kvtag_add_get_benchmark.c @@ -34,7 +34,7 @@ uint64_t atoui64(char *arg) { - char * endptr; + char *endptr; uint64_t num = strtoull(arg, &endptr, 10); if (*endptr != '\0') { @@ -326,7 +326,7 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t * obj_ids; + pdcid_t *obj_ids; uint64_t n_obj, n_obj_incr, my_obj, my_obj_s; uint64_t n_attr, n_attr_len, n_query, my_query, my_query_s; uint64_t n_servers, n_clients; @@ -335,7 +335,7 @@ main(int argc, char *argv[]) double stime = 0.0, step_elapse = 0.0; double total_object_time = 0.0, total_tag_time = 0.0, total_query_time = 0.0; uint64_t total_object_count = 0, total_tag_count = 0, total_query_count = 0; - void ** query_rst_cache; + void **query_rst_cache; uint64_t *value_size; int ret_value = SUCCEED; From 7c4c09b4d99a3067afd127d3407e8640802be8dc Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 16 Sep 2025 19:33:19 +0000 Subject: [PATCH 5/5] Committing clang-format changes --- src/tests/tags/kvtag_add_get_benchmark.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/tags/kvtag_add_get_benchmark.c b/src/tests/tags/kvtag_add_get_benchmark.c index 6b80595b5..11e888403 100644 --- a/src/tests/tags/kvtag_add_get_benchmark.c +++ b/src/tests/tags/kvtag_add_get_benchmark.c @@ -34,7 +34,7 @@ uint64_t atoui64(char *arg) { - char *endptr; + char * endptr; uint64_t num = strtoull(arg, &endptr, 10); if (*endptr != '\0') { @@ -326,7 +326,7 @@ int main(int argc, char *argv[]) { pdcid_t pdc, cont_prop, cont, obj_prop; - pdcid_t *obj_ids; + pdcid_t * obj_ids; uint64_t n_obj, n_obj_incr, my_obj, my_obj_s; uint64_t n_attr, n_attr_len, n_query, my_query, my_query_s; uint64_t n_servers, n_clients; @@ -335,7 +335,7 @@ main(int argc, char *argv[]) double stime = 0.0, step_elapse = 0.0; double total_object_time = 0.0, total_tag_time = 0.0, total_query_time = 0.0; uint64_t total_object_count = 0, total_tag_count = 0, total_query_count = 0; - void **query_rst_cache; + void ** query_rst_cache; uint64_t *value_size; int ret_value = SUCCEED;