diff --git a/src/api/include/pdc.h b/src/api/include/pdc.h index ae790d42b..714120dab 100644 --- a/src/api/include/pdc.h +++ b/src/api/include/pdc.h @@ -30,7 +30,6 @@ #include "pdc_prop.h" #include "pdc_cont.h" #include "pdc_logger.h" -#include "pdc_client_connect.h" #ifdef ENABLE_MPI #include "pdc_mpi.h" diff --git a/src/tests/misc/idioms_ci_test.c b/src/tests/misc/idioms_ci_test.c index 1826d3f7c..c7991c245 100644 --- a/src/tests/misc/idioms_ci_test.c +++ b/src/tests/misc/idioms_ci_test.c @@ -29,7 +29,9 @@ #include #include #include + #include "pdc.h" +#include "pdc_client_connect.h" #include "test_helper.h" dart_object_ref_type_t ref_type = REF_PRIMARY_ID; @@ -334,7 +336,7 @@ main(int argc, char *argv[]) // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, world_rank) < 0) - PGOTO_ERROR(FAIL, "Failed to prepare container"); + TGOTO_ERROR(FAIL, "Failed to prepare container"); if (world_rank == 0) LOG_INFO("Initialization Done\n"); @@ -365,7 +367,7 @@ main(int argc, char *argv[]) // we are performing 1000 insertion operations for string value and 1000 times for numerical values. ret_value = insert_index_records(world_rank, world_size); if (ret_value == FAIL) - PGOTO_ERROR(FAIL, "CLIENT %d failed to insert index records\n", world_rank); + TGOTO_ERROR(FAIL, "CLIENT %d failed to insert index records\n", world_rank); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); diff --git a/src/tests/obj/obj_tags.c b/src/tests/obj/obj_tags.c index 1675f05a3..0100a6196 100644 --- a/src/tests/obj/obj_tags.c +++ b/src/tests/obj/obj_tags.c @@ -100,13 +100,13 @@ main(int argc, char **argv) "Call to PDCobj_get_tag succeeded for obj1", "Call to PDCobj_get_tag failed for obj1"); if (strcmp(tag_value, tag_value_ret) != 0) { LOG_ERROR("Wrong tag value at object 1, expected = %s, get %s\n", tag_value, tag_value_ret); - PGOTO_DONE(TFAIL); + TGOTO_DONE(TFAIL); } TASSERT(PDCobj_get_tag(obj1, "some tag 2", (void **)&tag_value_ret, &value_type, &value_size) >= 0, "Call to PDCobj_get_tag succeeded for obj1", "Call to PDCobj_get_tag failed for obj1"); if (strcmp(tag_value2, tag_value_ret) != 0) { LOG_ERROR("Wrong tag value 2 at object 1, expected = %s, get %s\n", tag_value2, tag_value_ret); - PGOTO_DONE(TFAIL); + TGOTO_DONE(TFAIL); } // get tags in obj2 @@ -114,13 +114,13 @@ main(int argc, char **argv) "Call to PDCobj_get_tag succeeded for obj2", "Call to PDCobj_get_tag failed for obj2"); if (strcmp(tag_value, tag_value_ret) != 0) { LOG_ERROR("Wrong tag value at object 2, expected = %s, get %s\n", tag_value, tag_value_ret); - PGOTO_DONE(TFAIL); + TGOTO_DONE(TFAIL); } TASSERT(PDCobj_get_tag(obj2, "some tag 2", (void **)&tag_value_ret, &value_type, &value_size) >= 0, "Call to PDCobj_get_tag succeeded for obj2", "Call to PDCobj_get_tag failed for obj2"); if (strcmp(tag_value2, tag_value_ret) != 0) { LOG_ERROR("Wrong tag value 2 at object 2, expected = %s, get %s\n", tag_value2, tag_value_ret); - PGOTO_DONE(TFAIL); + TGOTO_DONE(TFAIL); } // close objects diff --git a/src/tests/obj/read_obj.c b/src/tests/obj/read_obj.c index 1e751c29a..7f818de31 100644 --- a/src/tests/obj/read_obj.c +++ b/src/tests/obj/read_obj.c @@ -7,6 +7,7 @@ #include #include #include "pdc.h" +#include "pdc_client_server_common.h" #include "test_helper.h" void diff --git a/src/tests/region/region_transfer.c b/src/tests/region/region_transfer.c index 2e8d25ac6..ca5578f2d 100644 --- a/src/tests/region/region_transfer.c +++ b/src/tests/region/region_transfer.c @@ -31,6 +31,7 @@ #include #include #include "pdc.h" +#include "pdc_private.h" #include "test_helper.h" #define BUF_LEN 128 diff --git a/src/tests/tags/kvtag_query.c b/src/tests/tags/kvtag_query.c index 8470d6f6d..719788aff 100644 --- a/src/tests/tags/kvtag_query.c +++ b/src/tests/tags/kvtag_query.c @@ -28,6 +28,9 @@ #include #include #include "pdc.h" +#include "pdc_client_connect.h" +#include "dart_core.h" +#include "string_utils.h" #include "test_helper.h" int @@ -99,7 +102,7 @@ main(int argc, char *argv[]) if (argc < 5) { if (rank == 0) print_usage(argv[0]); - PGOTO_DONE(ret_value); + TGOTO_DONE(ret_value); } n_obj = atoi(argv[1]); round = atoi(argv[2]); @@ -155,9 +158,9 @@ main(int argc, char *argv[]) if (is_using_dart && PDC_Client_insert_obj_ref_into_dart(hash_algo, kvtag.name, value, strlen(value), PDC_STRING, ref_type, (uint64_t)obj_ids[i]) < 0) - PGOTO_ERROR(FAIL, "Failed to add a kvtag to o%d\n", i + my_obj_s); + TGOTO_ERROR(FAIL, "Failed to add a kvtag to o%d\n", i + my_obj_s); else if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) - PGOTO_ERROR(FAIL, "Failed to add a kvtag to o%d\n", i + my_obj_s); + TGOTO_ERROR(FAIL, "Failed to add a kvtag to o%d\n", i + my_obj_s); } if (rank == 0) LOG_JUST_PRINT("Rank %d: Added %d kvtag to the %d th object\n", rank, round, i); @@ -189,7 +192,7 @@ main(int argc, char *argv[]) if (PDC_Client_search_obj_ref_through_dart(hash_algo, exact_query, ref_type, &nres, &pdc_ids) < 0) { #endif - PGOTO_ERROR(TFAIL, "Failed to PDC_Client_search_obj_ref_through_dart_mpi\n", kvtag.name, + TGOTO_ERROR(TFAIL, "Failed to PDC_Client_search_obj_ref_through_dart_mpi\n", kvtag.name, rank); } } @@ -199,7 +202,7 @@ main(int argc, char *argv[]) #else if (PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) < 0) { #endif - PGOTO_ERROR(TFAIL, "Failed to query kvtag [%s] with rank %d\n", kvtag.name, rank); + TGOTO_ERROR(TFAIL, "Failed to query kvtag [%s] with rank %d\n", kvtag.name, rank); } } }