From 1e0534ca3321b657f2188cff6147a1e377ebe10e Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 19 Mar 2025 17:09:49 -0700 Subject: [PATCH 1/7] Changed all printf to use pdc logger Also removed large blocks of comments and chanegd the pdc logger to print the file name, function, and line number. --- examples/C_plus_plus_example/H5Timing.cc | 10 +- .../multidataset_plugin.cc | 6 +- .../region_transfer_1D_append.cc | 4 +- examples/bdcats.c | 138 +- examples/bdcats_batch.c | 182 +- examples/bdcats_old.c | 138 +- examples/haccio.c | 14 +- examples/haccio_v2.c | 8 +- examples/llsm/llsm_aux/csvReader.c | 22 +- examples/llsm/llsm_aux/parallelReadTiff.c | 41 +- examples/llsm/llsm_importer.c | 32 +- examples/obj_get_data.c | 44 +- examples/pdc_init.c | 4 +- examples/read_write_col_perf.c | 70 +- examples/read_write_perf.c | 70 +- examples/region_transfer_2D.c | 64 +- examples/region_transfer_3D.c | 64 +- examples/tileio.c | 16 +- examples/tileio_v2.c | 10 +- examples/vpicio.c | 158 +- examples/vpicio_batch.c | 208 +-- examples/vpicio_old.c | 158 +- src/api/close_server.c | 5 +- src/api/include/pdc.h | 1 + src/api/pdc_analysis/pdc_analysis_common.c | 9 +- src/api/pdc_analysis/pdc_hist_pkg.c | 10 +- src/api/pdc_client_connect.c | 498 +++--- src/api/pdc_meta/pdc_metadata_client.c | 4 +- src/api/pdc_obj/pdc_mpi.c | 4 +- src/api/pdc_obj/pdc_obj.c | 12 +- src/api/pdc_region/pdc_region_transfer.c | 243 +-- src/api/pdc_transform/pdc_transform.c | 22 +- src/api/pdc_transform/pdc_transforms_common.c | 3 +- src/commons/collections/libhl/linklist.c | 14 - src/commons/collections/libhl/rbtree.c | 7 +- src/commons/collections/pdc_deque.c | 3 +- src/commons/collections/pdc_set_test.c | 9 +- src/commons/collections/pdc_stack.c | 5 +- src/commons/file/common_io.c | 33 +- src/commons/index/dart/dart_core.c | 151 -- src/commons/index/dart/dart_core_test.c | 33 +- .../dart/index/hashtable/hashtable_impl.c | 174 -- .../index/hashtable/include/hashtable_impl.h | 25 - .../dart/index/idioms/idioms_local_index.c | 60 +- .../index/idioms/idioms_local_index_test.c | 78 +- .../dart/index/idioms/idioms_persistence.c | 1 - src/commons/logging/include/pdc_logger.h | 43 +- src/commons/logging/pdc_logger.c | 73 +- src/commons/profiling/pdc_hashtab.c | 3 +- src/commons/profiling/pdc_stack_ops.c | 5 +- src/commons/query/qc_parser.c | 25 +- src/commons/serde/bulki/bulki.c | 99 +- src/commons/serde/bulki/bulki_serde.c | 35 +- src/commons/serde/bulki/bulki_serde_test.c | 54 +- src/commons/utils/include/pdc_private.h | 24 +- src/commons/utils/pdc_timing.c | 78 +- src/commons/utils/query_utils.c | 13 +- src/commons/utils/string_utils.c | 5 +- src/commons/utils/thpool.c | 5 +- src/server/dablooms/pdc_dablooms.c | 13 +- src/server/include/pdc_client_server_common.h | 671 ++++---- src/server/pdc_client_server_common.c | 284 ++-- src/server/pdc_server.c | 278 ++-- .../pdc_server_analysis/pdc_server_analysis.c | 45 +- src/server/pdc_server_metadata.c | 297 ++-- src/server/pdc_server_metadata_index.c | 14 +- src/server/pdc_server_metadata_index_test.c | 4 +- .../pdc_server_region/pdc_server_data.c | 1466 ++++++----------- .../pdc_server_region_cache.c | 61 +- .../pdc_server_region_request_handler.h | 118 +- .../pdc_server_region_transfer.c | 61 +- ...dc_server_region_transfer_metadata_query.c | 27 +- src/tests/bdcats.c | 138 +- src/tests/bdcats_old.c | 138 +- src/tests/bdcats_v2.c | 144 +- src/tests/blocked_lock.c | 38 +- src/tests/buf_map_mpi_v2.c | 22 +- src/tests/buf_obj_map.c | 22 +- src/tests/buf_obj_map_mpi.c | 22 +- src/tests/client_server.c | 29 +- src/tests/consistency_semantics.c | 64 +- src/tests/cont_add_del.c | 34 +- src/tests/cont_del.c | 26 +- src/tests/cont_getid.c | 16 +- src/tests/cont_info.c | 16 +- src/tests/cont_iter.c | 38 +- src/tests/cont_iter_mt.c | 36 +- src/tests/cont_life.c | 20 +- src/tests/cont_life_mt.c | 44 +- src/tests/cont_tags.c | 62 +- src/tests/create_cont.c | 20 +- src/tests/create_cont_coll.c | 20 +- src/tests/create_obj.c | 40 +- src/tests/create_obj_coll.c | 72 +- src/tests/create_obj_scale.c | 34 +- src/tests/create_prop.c | 24 +- src/tests/create_region.c | 4 +- src/tests/dart_algo_sim.c | 3 +- src/tests/dart_attr_dist_test.c | 52 +- src/tests/dart_func_test.c | 12 +- src/tests/dart_test.c | 18 +- src/tests/data_rw_test.c | 78 +- src/tests/data_server_meta.c | 22 +- src/tests/data_server_meta_test.c | 26 +- src/tests/data_server_read.c | 14 +- src/tests/data_server_read_multi.c | 51 +- src/tests/data_server_read_vpic.c | 38 +- src/tests/data_server_read_vpic_multits.c | 53 +- src/tests/data_server_read_vpic_spatial.c | 27 +- .../data_server_read_vpic_spatial_multits.c | 50 +- src/tests/data_server_write.c | 22 +- src/tests/data_server_write_multi.c | 57 +- src/tests/data_server_write_vpic.c | 36 +- src/tests/data_server_write_vpic_multits.c | 56 +- src/tests/delete_obj.c | 32 +- src/tests/delete_obj_scale.c | 32 +- src/tests/dt_conv.c | 8 +- src/tests/dup_prop.c | 18 +- src/tests/gen_fastbit_idx.c | 8 +- src/tests/hash_table.c | 43 +- src/tests/helper/julia_helper_loader.c | 13 +- src/tests/idioms_ci_test.c | 117 +- src/tests/import_vpic.c | 27 +- src/tests/init_only.c | 14 +- src/tests/kvtag_add_get.c | 88 +- src/tests/kvtag_add_get_benchmark.c | 122 +- src/tests/kvtag_add_get_scale.c | 74 +- src/tests/kvtag_affix_query_scale.c | 70 +- src/tests/kvtag_get.c | 70 +- src/tests/kvtag_query.c | 58 +- src/tests/kvtag_range_query_scale.c | 80 +- src/tests/list_all.c | 42 +- src/tests/llsm_idioms_bench.c | 66 +- src/tests/obj_buf.c | 38 +- src/tests/obj_del.c | 44 +- src/tests/obj_dim.c | 34 +- src/tests/obj_get_data.c | 44 +- src/tests/obj_info.c | 72 +- src/tests/obj_iter.c | 66 +- src/tests/obj_life.c | 18 +- src/tests/obj_lock.c | 38 +- src/tests/obj_map.c | 24 +- src/tests/obj_put_data.c | 36 +- src/tests/obj_round_robin_io.c | 104 +- src/tests/obj_round_robin_io_all.c | 114 +- src/tests/obj_tags.c | 72 +- src/tests/obj_transformation.c | 166 +- src/tests/open_cont.c | 14 +- src/tests/open_existing_obj.c | 28 +- src/tests/open_obj.c | 68 +- src/tests/open_obj_round_robin.c | 92 +- src/tests/pdc_analysis_lib.c | 12 +- src/tests/pdc_init.c | 4 +- src/tests/pdc_transforms_lib.c | 26 +- src/tests/producer_waitall.c | 60 +- src/tests/query_data.c | 24 +- src/tests/query_metadata_agg.c | 24 +- src/tests/query_vpic.c | 16 +- src/tests/query_vpic_bin_sds1_nopreload.c | 18 +- src/tests/query_vpic_bin_sds1_preload.c | 22 +- src/tests/query_vpic_bin_sds_nopreload.c | 28 +- src/tests/query_vpic_bin_sds_preload.c | 22 +- src/tests/query_vpic_create_data.c | 30 +- src/tests/query_vpic_exyz_nopreload.c | 38 +- src/tests/query_vpic_exyz_preload.c | 22 +- src/tests/query_vpic_multi.c | 16 +- src/tests/query_vpic_multi_nopreload.c | 16 +- src/tests/query_vpic_multi_nopreload1.c | 16 +- src/tests/query_vpic_multi_preload.c | 16 +- src/tests/read_obj.c | 51 +- src/tests/read_obj_shared.c | 59 +- src/tests/read_write_col_perf.c | 70 +- src/tests/read_write_perf.c | 72 +- src/tests/region_obj_map.c | 80 +- src/tests/region_obj_map_2D.c | 80 +- src/tests/region_obj_map_2D_partial.c | 80 +- src/tests/region_obj_map_3D.c | 80 +- src/tests/region_obj_map_3D_partial.c | 80 +- src/tests/region_obj_map_merge.c | 92 +- src/tests/region_obj_map_overlap.c | 126 +- src/tests/region_obj_map_overlap_2D.c | 131 +- src/tests/region_obj_map_overlap_3D.c | 86 +- src/tests/region_obj_map_partial.c | 80 +- src/tests/region_transfer.c | 84 +- src/tests/region_transfer_2D.c | 64 +- src/tests/region_transfer_2D_partial.c | 64 +- src/tests/region_transfer_2D_skewed.c | 82 +- src/tests/region_transfer_3D.c | 64 +- src/tests/region_transfer_3D_partial.c | 64 +- src/tests/region_transfer_3D_skewed.c | 82 +- src/tests/region_transfer_all.c | 92 +- src/tests/region_transfer_all_2D.c | 88 +- src/tests/region_transfer_all_3D.c | 88 +- src/tests/region_transfer_all_append.c | 190 +-- src/tests/region_transfer_all_append_2D.c | 214 ++- src/tests/region_transfer_all_append_3D.c | 219 ++- src/tests/region_transfer_all_fold.c | 24 +- src/tests/region_transfer_all_split_wait.c | 88 +- src/tests/region_transfer_all_test.c | 68 +- src/tests/region_transfer_merge.c | 68 +- src/tests/region_transfer_overlap.c | 86 +- src/tests/region_transfer_overlap_2D.c | 91 +- src/tests/region_transfer_overlap_3D.c | 86 +- src/tests/region_transfer_partial.c | 64 +- src/tests/region_transfer_query.c | 67 +- src/tests/region_transfer_read_only.c | 100 +- src/tests/region_transfer_set_dims.c | 173 +- src/tests/region_transfer_set_dims_2D.c | 173 +- src/tests/region_transfer_set_dims_3D.c | 173 +- src/tests/region_transfer_skewed.c | 64 +- src/tests/region_transfer_status.c | 80 +- src/tests/region_transfer_write_only.c | 142 +- src/tests/region_transfer_write_read.c | 222 +-- src/tests/search_obj.c | 52 +- src/tests/search_obj_scale.c | 34 +- src/tests/set_prop.c | 30 +- src/tests/stat_obj.c | 40 +- src/tests/update_obj.c | 38 +- src/tests/vpicio.c | 168 +- src/tests/vpicio_mts.c | 96 +- src/tests/vpicio_old.c | 158 +- src/tests/vpicio_v2.c | 178 +- src/tests/write_obj_shared.c | 40 +- src/tools/hdf5_access_eqsim.c | 31 +- src/tools/meta_json/metadata_json_importer.c | 26 +- src/tools/meta_json/metadata_json_printer.c | 24 +- src/tools/metadata_json_loader.c | 15 +- src/tools/pdc_access_eqsim.c | 67 +- src/tools/pdc_export.c | 77 +- src/tools/pdc_import.c | 134 +- src/tools/pdc_import_eqsim.c | 26 +- src/tools/pdc_ls.c | 83 +- src/tools/pdc_query_eqsim.c | 28 +- src/utils/pdc_region_utils.c | 3 +- 234 files changed, 7324 insertions(+), 9223 deletions(-) delete mode 100644 src/commons/index/dart/index/hashtable/hashtable_impl.c delete mode 100644 src/commons/index/dart/index/hashtable/include/hashtable_impl.h diff --git a/examples/C_plus_plus_example/H5Timing.cc b/examples/C_plus_plus_example/H5Timing.cc index 80082e98e..ab31da53f 100644 --- a/examples/C_plus_plus_example/H5Timing.cc +++ b/examples/C_plus_plus_example/H5Timing.cc @@ -185,9 +185,9 @@ static int record_timer(std::vector *timer, const char* filename) { static int output_results() { #ifdef PDC_PATCH - printf("total PDCwrite calls = %d, PDCread calls = %d\n", timer_class->PDCwrite_count, timer_class->PDCread_count); + LOG_INFO("total PDCwrite calls = %d, PDCread calls = %d\n", timer_class->PDCwrite_count, timer_class->PDCread_count); #else - printf("total H5Dwrite calls = %d, H5Dread calls = %d\n", timer_class->H5Dwrite_count, timer_class->H5Dread_count); + LOG_INFO("total H5Dwrite calls = %d, H5Dread calls = %d\n", timer_class->H5Dwrite_count, timer_class->H5Dread_count); #endif if ( timer_class->dataset_timers->size() ) { record_timer(timer_class->dataset_timers, "dataset_write_record.csv"); @@ -211,10 +211,10 @@ int finalize_timers() { gettimeofday(&temp_time, NULL); timer_class->total_end_time = (temp_time.tv_usec + temp_time.tv_sec * 1000000) + .0; #ifdef PDC_PATCH - printf("total program time is %lf, PDCstart time = %lf, PDCwait time = %lf\n", (timer_class->total_end_time - timer_class->total_start_time) / 1000000.0, timer_class->PDCstart_time / 1000000.0, timer_class->PDCwait_time / 1000000.0); + LOG_INFO("total program time is %lf, PDCstart time = %lf, PDCwait time = %lf\n", (timer_class->total_end_time - timer_class->total_start_time) / 1000000.0, timer_class->PDCstart_time / 1000000.0, timer_class->PDCwait_time / 1000000.0); #else - printf("total program time is %lf, H5Dwrite time = %lf, H5Dread time = %lf\n", (timer_class->total_end_time - timer_class->total_start_time) / 1000000.0, timer_class->H5Dwrite_time / 1000000.0, timer_class->H5Dread_time / 1000000.0); - printf("merge requests time = %lf, wrap requests time = %lf, H5Dclose = %lf\n", timer_class->merge_requests_time / 1000000.0, timer_class->wrap_requests_time / 1000000.0, timer_class->H5Dclose_time / 1000000.0); + LOG_INFO("total program time is %lf, H5Dwrite time = %lf, H5Dread time = %lf\n", (timer_class->total_end_time - timer_class->total_start_time) / 1000000.0, timer_class->H5Dwrite_time / 1000000.0, timer_class->H5Dread_time / 1000000.0); + LOG_INFO("merge requests time = %lf, wrap requests time = %lf, H5Dclose = %lf\n", timer_class->merge_requests_time / 1000000.0, timer_class->wrap_requests_time / 1000000.0, timer_class->H5Dclose_time / 1000000.0); #endif free(timer_class); diff --git a/examples/C_plus_plus_example/multidataset_plugin.cc b/examples/C_plus_plus_example/multidataset_plugin.cc index 151eb5142..3c1d71848 100644 --- a/examples/C_plus_plus_example/multidataset_plugin.cc +++ b/examples/C_plus_plus_example/multidataset_plugin.cc @@ -276,7 +276,7 @@ int flush_multidatasets() { double start_time; #endif i = 0; - //printf("Rank %d number of datasets to be written %d\n", rank, dataset_size); + LOG_DEBUG("Rank %d number of datasets to be written %d\n", rank, dataset_size); #if ENABLE_MULTIDATASET==1 #ifdef H5_TIMING_ENABLE increment_H5Dwrite(); @@ -319,7 +319,7 @@ int flush_multidatasets() { free(multi_datasets_temp); #else - //printf("rank %d has dataset_size %lld\n", rank, (long long int) dataset_size); + LOG_DEBUG("rank %d has dataset_size %lld\n", rank, (long long int) dataset_size); #ifdef PDC_PATCH if (cached_objs.size()) { @@ -362,7 +362,7 @@ int flush_multidatasets() { offset_length = new_end[j] - new_start[j]; pdcid_t reg = PDCregion_create(1, &offset, &offset_length); pdcid_t transfer_request_id = PDCregion_transfer_create(ptr, PDC_WRITE, it->second->did, reg, reg); - //printf("did = %lu, starting request offset = %lu, size = %lu, j = %d\n", it->second->did, offset, offset_length, j); + LOG_DEBUG("did = %lu, starting request offset = %lu, size = %lu, j = %d\n", it->second->did, offset, offset_length, j); PDCregion_transfer_start(transfer_request_id); PDCregion_transfer_wait(transfer_request_id); diff --git a/examples/C_plus_plus_example/region_transfer_1D_append.cc b/examples/C_plus_plus_example/region_transfer_1D_append.cc index 3ab5d03f1..cce884945 100644 --- a/examples/C_plus_plus_example/region_transfer_1D_append.cc +++ b/examples/C_plus_plus_example/region_transfer_1D_append.cc @@ -58,14 +58,14 @@ main(int argc, char **argv) } sprintf(data_name, "data0_%d", rank); - printf("rank %d C++ example for writing %d lists of arrays with size %d\n", rank, ARRAY_SIZE, DATA_SIZE); + LOG_INFO("rank %d C++ example for writing %d lists of arrays with size %d\n", rank, ARRAY_SIZE, DATA_SIZE); for ( i = 0; i < ARRAY_SIZE; ++i ) { register_multidataset_request_append(data_name, 0, data, sizeof(int) * DATA_SIZE, H5T_NATIVE_CHAR); } sprintf(data_name, "data1_%d", rank); - printf("rank %d C++ example for writing %d lists of arrays with size %d\n", rank, ARRAY_SIZE, DATA_SIZE); + LOG_INFO("rank %d C++ example for writing %d lists of arrays with size %d\n", rank, ARRAY_SIZE, DATA_SIZE); for ( i = 0; i < ARRAY_SIZE; ++i ) { register_multidataset_request_append(data_name, 0, data, sizeof(int) * DATA_SIZE, H5T_NATIVE_CHAR); } diff --git a/examples/bdcats.c b/examples/bdcats.c index b9c3102cb..3c5e4df41 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./bdcats #particles\n"); + LOG_INFO("Usage: srun -n ./bdcats #particles\n"); } int @@ -79,7 +79,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } x = (float *)malloc(numparticles * sizeof(float)); @@ -99,7 +99,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); // open objects #ifdef ENABLE_MPI @@ -108,7 +108,7 @@ main(int argc, char **argv) obj_xx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_xx == 0) { - printf("Error when open object %s\n", "obj-var-xx"); + LOG_INFO("Error when open object %s\n", "obj-var-xx"); exit(-1); } #ifdef ENABLE_MPI @@ -117,7 +117,7 @@ main(int argc, char **argv) obj_yy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_yy == 0) { - printf("Error when open object %s\n", "obj-var-yy"); + LOG_INFO("Error when open object %s\n", "obj-var-yy"); exit(-1); } #ifdef ENABLE_MPI @@ -126,7 +126,7 @@ main(int argc, char **argv) obj_zz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_zz == 0) { - printf("Error when open object %s\n", "obj-var-zz"); + LOG_INFO("Error when open object %s\n", "obj-var-zz"); exit(-1); } #ifdef ENABLE_MPI @@ -135,7 +135,7 @@ main(int argc, char **argv) obj_pxx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pxx == 0) { - printf("Error when open object %s\n", "obj-var-pxx"); + LOG_INFO("Error when open object %s\n", "obj-var-pxx"); exit(-1); } #ifdef ENABLE_MPI @@ -144,7 +144,7 @@ main(int argc, char **argv) obj_pyy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pyy == 0) { - printf("Error when open object %s\n", "obj-var-pyy"); + LOG_INFO("Error when open object %s\n", "obj-var-pyy"); exit(-1); } #ifdef ENABLE_MPI @@ -153,7 +153,7 @@ main(int argc, char **argv) obj_pzz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pzz == 0) { - printf("Error when open object %s\n", "obj-var-pzz"); + LOG_INFO("Error when open object %s\n", "obj-var-pzz"); exit(-1); } #ifdef ENABLE_MPI @@ -162,7 +162,7 @@ main(int argc, char **argv) obj_id11 = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_id11 == 0) { - printf("Error when open object %s\n", "id11"); + LOG_INFO("Error when open object %s\n", "id11"); exit(-1); } #ifdef ENABLE_MPI @@ -171,7 +171,7 @@ main(int argc, char **argv) obj_id22 = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_id22 == 0) { - printf("Error when open object %s\n", "id22"); + LOG_INFO("Error when open object %s\n", "id22"); exit(-1); } @@ -207,249 +207,249 @@ main(int argc, char **argv) transfer_request_x = PDCregion_transfer_create(&x[0], PDC_READ, obj_xx, region_x, region_xx); if (transfer_request_x == 0) { - printf("Array x transfer request creation failed\n"); + LOG_INFO("Array x transfer request creation failed\n"); return 1; } transfer_request_y = PDCregion_transfer_create(&y[0], PDC_READ, obj_yy, region_y, region_yy); if (transfer_request_y == 0) { - printf("Array y transfer request creation failed\n"); + LOG_INFO("Array y transfer request creation failed\n"); return 1; } transfer_request_z = PDCregion_transfer_create(&z[0], PDC_READ, obj_zz, region_z, region_zz); if (transfer_request_z == 0) { - printf("Array z transfer request creation failed\n"); + LOG_INFO("Array z transfer request creation failed\n"); return 1; } transfer_request_px = PDCregion_transfer_create(&px[0], PDC_READ, obj_pxx, region_px, region_pxx); if (transfer_request_px == 0) { - printf("Array px transfer request creation failed\n"); + LOG_INFO("Array px transfer request creation failed\n"); return 1; } transfer_request_py = PDCregion_transfer_create(&py[0], PDC_READ, obj_pyy, region_py, region_pyy); if (transfer_request_py == 0) { - printf("Array py transfer request creation failed\n"); + LOG_INFO("Array py transfer request creation failed\n"); return 1; } transfer_request_pz = PDCregion_transfer_create(&pz[0], PDC_READ, obj_pzz, region_pz, region_pzz); if (transfer_request_pz == 0) { - printf("Array pz transfer request creation failed\n"); + LOG_INFO("Array pz transfer request creation failed\n"); return 1; } transfer_request_id1 = PDCregion_transfer_create(&id1[0], PDC_READ, obj_id11, region_id1, region_id11); if (transfer_request_id1 == 0) { - printf("Array id1 transfer request creation failed\n"); + LOG_INFO("Array id1 transfer request creation failed\n"); return 1; } transfer_request_id2 = PDCregion_transfer_create(&id2[0], PDC_READ, obj_id22, region_id2, region_id22); if (transfer_request_id2 == 0) { - printf("Array id2 transfer request creation failed\n"); + LOG_INFO("Array id2 transfer request creation failed\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to start transfer for region_xx\n"); + LOG_INFO("Failed to start transfer for region_xx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to start transfer for region_yy\n"); + LOG_INFO("Failed to start transfer for region_yy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to start transfer for region_zz\n"); + LOG_INFO("Failed to start transfer for region_zz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pxx\n"); + LOG_INFO("Failed to start transfer for region_pxx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pyy\n"); + LOG_INFO("Failed to start transfer for region_pyy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pzz\n"); + LOG_INFO("Failed to start transfer for region_pzz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id11\n"); + LOG_INFO("Failed to start transfer for region_id11\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id22\n"); + LOG_INFO("Failed to start transfer for region_id22\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_xx\n"); + LOG_INFO("Failed to transfer wait for region_xx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_yy\n"); + LOG_INFO("Failed to transfer wait for region_yy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_zz\n"); + LOG_INFO("Failed to transfer wait for region_zz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pxx\n"); + LOG_INFO("Failed to transfer wait for region_pxx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pyy\n"); + LOG_INFO("Failed to transfer wait for region_pyy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pzz\n"); + LOG_INFO("Failed to transfer wait for region_pzz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id11\n"); + LOG_INFO("Failed to transfer wait for region_id11\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id22\n"); + LOG_INFO("Failed to transfer wait for region_id22\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_x); if (ret != SUCCEED) { - printf("region xx transfer close failed\n"); + LOG_INFO("region xx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_y); if (ret != SUCCEED) { - printf("region yy transfer close failed\n"); + LOG_INFO("region yy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_z); if (ret != SUCCEED) { - printf("region zz transfer close failed\n"); + LOG_INFO("region zz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_px); if (ret != SUCCEED) { - printf("region pxx transfer close failed\n"); + LOG_INFO("region pxx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_py); if (ret != SUCCEED) { - printf("region pyy transfer close failed\n"); + LOG_INFO("region pyy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_pz); if (ret != SUCCEED) { - printf("region pzz transfer close failed\n"); + LOG_INFO("region pzz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id1); if (ret != SUCCEED) { - printf("region id11 transfer close failed\n"); + LOG_INFO("region id11 transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id2); if (ret != SUCCEED) { - printf("region id22 transfer close failed\n"); + LOG_INFO("region id22 transfer close failed\n"); return 1; } PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - printf("fail to close obj_xx\n"); + LOG_INFO("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - printf("fail to close object obj_yy\n"); + LOG_INFO("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - printf("fail to close object obj_zz\n"); + LOG_INFO("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - printf("fail to close object obj_pxx\n"); + LOG_INFO("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - printf("fail to close object obj_pyy\n"); + LOG_INFO("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - printf("fail to close object obj_pzz\n"); + LOG_INFO("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - printf("fail to close object obj_id11\n"); + LOG_INFO("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - printf("fail to close object obj_id22\n"); + LOG_INFO("Fail to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - printf("fail to close region region_x\n"); + LOG_INFO("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - printf("fail to close region region_y\n"); + LOG_INFO("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - printf("fail to close region region_z\n"); + LOG_INFO("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - printf("fail to close region region_px\n"); + LOG_INFO("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - printf("fail to close region region_py\n"); + LOG_INFO("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - printf("fail to close region region_pz\n"); + LOG_INFO("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - printf("fail to close region region_id1\n"); + LOG_INFO("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - printf("fail to close region region_id2\n"); + LOG_INFO("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - printf("fail to close region region_xx\n"); + LOG_INFO("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - printf("fail to close region region_yy\n"); + LOG_INFO("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - printf("fail to close region region_zz\n"); + LOG_INFO("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - printf("fail to close region region_pxx\n"); + LOG_INFO("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - printf("fail to close region region_pyy\n"); + LOG_INFO("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - printf("fail to close region region_pzz\n"); + LOG_INFO("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - printf("fail to close region region_id11\n"); + LOG_INFO("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - printf("fail to close region region_id22\n"); + LOG_INFO("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_INFO("Fail to close container c1\n"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_INFO("Fail to close PDC\n"); free(x); free(y); diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index fab0f507a..ce830402a 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -45,7 +45,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n bdcats_batch sleep_time timestep #particles test_method(0:old API, 1:wait, " + LOG_DEBUG("Usage: srun -n bdcats_batch sleep_time timestep #particles test_method(0:old API, 1:wait, " "default 2:wait all)\n"); } @@ -105,13 +105,13 @@ main(int argc, char **argv) if (argc >= 4) { numparticles = atoll(argv[3]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } if (argc >= 5) { test_method = atoi(argv[4]); } if (!rank) { - printf("sleep time = %u, timestep = %" PRIu64 ", numparticles = %" PRIu64 ", test_method = %d\n", + LOG_INFO("sleep time = %u, timestep = %" PRIu64 ", numparticles = %" PRIu64 ", test_method = %d\n", sleep_time, timestep, numparticles, test_method); } @@ -180,7 +180,7 @@ main(int argc, char **argv) obj_xx[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_xx[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); @@ -190,7 +190,7 @@ main(int argc, char **argv) obj_yy[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_yy[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); @@ -200,7 +200,7 @@ main(int argc, char **argv) obj_zz[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_zz[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); @@ -210,7 +210,7 @@ main(int argc, char **argv) obj_pxx[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pxx[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); @@ -220,7 +220,7 @@ main(int argc, char **argv) obj_pyy[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pyy[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); @@ -230,7 +230,7 @@ main(int argc, char **argv) obj_pzz[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_pzz[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } sprintf(obj_name, "id11 %" PRIu64 "", i); @@ -240,7 +240,7 @@ main(int argc, char **argv) obj_id11[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_id11[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } sprintf(obj_name, "id22 %" PRIu64 "", i); @@ -250,7 +250,7 @@ main(int argc, char **argv) obj_id22[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_id22[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } } @@ -279,84 +279,84 @@ main(int argc, char **argv) transfer_request_x[i] = PDCregion_transfer_create(&x[0], PDC_READ, obj_xx[i], region_x, region_xx); if (transfer_request_x[i] == 0) { - printf("Array x transfer request creation failed\n"); + LOG_ERROR("Array x transfer request creation failed\n"); return 1; } transfer_request_y[i] = PDCregion_transfer_create(&y[0], PDC_READ, obj_yy[i], region_y, region_yy); if (transfer_request_y[i] == 0) { - printf("Array y transfer request creation failed\n"); + LOG_ERROR("Array y transfer request creation failed\n"); return 1; } transfer_request_z[i] = PDCregion_transfer_create(&z[0], PDC_READ, obj_zz[i], region_z, region_zz); if (transfer_request_z[i] == 0) { - printf("Array z transfer request creation failed\n"); + LOG_ERROR("Array z transfer request creation failed\n"); return 1; } transfer_request_px[i] = PDCregion_transfer_create(&px[0], PDC_READ, obj_pxx[i], region_px, region_pxx); if (transfer_request_px[i] == 0) { - printf("Array px transfer request creation failed\n"); + LOG_ERROR("Array px transfer request creation failed\n"); return 1; } transfer_request_py[i] = PDCregion_transfer_create(&py[0], PDC_READ, obj_pyy[i], region_py, region_pyy); if (transfer_request_py[i] == 0) { - printf("Array py transfer request creation failed\n"); + LOG_ERROR("Array py transfer request creation failed\n"); return 1; } transfer_request_pz[i] = PDCregion_transfer_create(&pz[0], PDC_READ, obj_pzz[i], region_pz, region_pzz); if (transfer_request_pz[i] == 0) { - printf("Array pz transfer request creation failed\n"); + LOG_ERROR("Array pz transfer request creation failed\n"); return 1; } transfer_request_id1[i] = PDCregion_transfer_create(&id1[0], PDC_READ, obj_id11[i], region_id1, region_id11); if (transfer_request_id1[i] == 0) { - printf("Array id1 transfer request creation failed\n"); + LOG_ERROR("Array id1 transfer request creation failed\n"); return 1; } transfer_request_id2[i] = PDCregion_transfer_create(&id2[0], PDC_READ, obj_id22[i], region_id2, region_id22); if (transfer_request_id2[i] == 0) { - printf("Array id2 transfer request creation failed\n"); + LOG_ERROR("Array id2 transfer request creation failed\n"); return 1; } } else { ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx[i], region_xx); if (ret < 0) - printf("Array x PDCbuf_obj_map failed\n"); + LOG_ERROR("Array x PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy[i], region_yy); if (ret < 0) - printf("Array y PDCbuf_obj_map failed\n"); + LOG_ERROR("Array y PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz[i], region_zz); if (ret < 0) - printf("Array z PDCbuf_obj_map failed\n"); + LOG_ERROR("Array z PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx[i], region_pxx); if (ret < 0) - printf("Array px PDCbuf_obj_map failed\n"); + LOG_ERROR("Array px PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy[i], region_pyy); if (ret < 0) - printf("Array py PDCbuf_obj_map failed\n"); + LOG_ERROR("Array py PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz[i], region_pzz); if (ret < 0) - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_ERROR("Array pz PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11[i], region_id11); if (ret < 0) - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id1 PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22[i], region_id22); if (ret < 0) - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id2 PDCbuf_obj_map failed\n"); } #ifdef ENABLE_MPI transfer_create += MPI_Wtime() - start; @@ -378,7 +378,7 @@ main(int argc, char **argv) if (test_method == 2) { ret = PDCregion_transfer_start_all(temp_requests, 8); if (ret != SUCCEED) { - printf("Failed to start transfer for all regions\n"); + LOG_ERROR("Failed to start transfer for all regions\n"); return 1; } } @@ -390,28 +390,28 @@ main(int argc, char **argv) else { ret = PDCreg_obtain_lock(obj_xx[i], region_xx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy[i], region_yy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz[i], region_zz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_zz\n"); + LOG_ERROR("failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx[i], region_pxx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy[i], region_pyy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz[i], region_pzz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11[i], region_id11, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id11\n"); + LOG_ERROR("failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22[i], region_id22, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id22\n"); + LOG_ERROR("failed to obtain lock for region_id22\n"); } #ifdef ENABLE_MPI transfer_start += MPI_Wtime() - start; @@ -425,7 +425,7 @@ main(int argc, char **argv) if (test_method == 2) { ret = PDCregion_transfer_wait_all(temp_requests, 8); if (ret != SUCCEED) { - printf("Failed to start transfer for all regions\n"); + LOG_ERROR("failed to start transfer for all regions\n"); return 1; } } @@ -437,28 +437,28 @@ main(int argc, char **argv) else { ret = PDCreg_release_lock(obj_xx[i], region_xx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_xx\n"); + LOG_ERROR("failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy[i], region_yy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_yy\n"); + LOG_ERROR("failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz[i], region_zz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_zz\n"); + LOG_ERROR("failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx[i], region_pxx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pxx\n"); + LOG_ERROR("failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy[i], region_pyy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pyy\n"); + LOG_ERROR("failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz[i], region_pzz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pzz\n"); + LOG_ERROR("failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11[i], region_id11, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id11\n"); + LOG_ERROR("failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22[i], region_id22, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id22\n"); + LOG_ERROR("failed to release lock for region_id22\n"); } #ifdef ENABLE_MPI end = MPI_Wtime(); @@ -468,111 +468,111 @@ main(int argc, char **argv) if (test_method) { ret = PDCregion_transfer_close(transfer_request_x[i]); if (ret != SUCCEED) { - printf("region xx transfer close failed\n"); + LOG_ERROR("region xx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_y[i]); if (ret != SUCCEED) { - printf("region yy transfer close failed\n"); + LOG_ERROR("region yy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_z[i]); if (ret != SUCCEED) { - printf("region zz transfer close failed\n"); + LOG_ERROR("region zz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_px[i]); if (ret != SUCCEED) { - printf("region pxx transfer close failed\n"); + LOG_ERROR("region pxx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_py[i]); if (ret != SUCCEED) { - printf("region pyy transfer close failed\n"); + LOG_ERROR("region pyy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_pz[i]); if (ret != SUCCEED) { - printf("region pzz transfer close failed\n"); + LOG_ERROR("region pzz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id1[i]); if (ret != SUCCEED) { - printf("region id11 transfer close failed\n"); + LOG_ERROR("region id11 transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id2[i]); if (ret != SUCCEED) { - printf("region id22 transfer close failed\n"); + LOG_ERROR("region id22 transfer close failed\n"); return 1; } } else { ret = PDCbuf_obj_unmap(obj_xx[i], region_xx); if (ret != SUCCEED) - printf("region xx unmap failed\n"); + LOG_ERROR("region xx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_yy[i], region_yy); if (ret != SUCCEED) - printf("region yy unmap failed\n"); + LOG_ERROR("region yy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_zz[i], region_zz); if (ret != SUCCEED) - printf("region zz unmap failed\n"); + LOG_ERROR("region zz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pxx[i], region_pxx); if (ret != SUCCEED) - printf("region pxx unmap failed\n"); + LOG_ERROR("region pxx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pyy[i], region_pyy); if (ret != SUCCEED) - printf("region pyy unmap failed\n"); + LOG_ERROR("region pyy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pzz[i], region_pzz); if (ret != SUCCEED) - printf("region pzz unmap failed\n"); + LOG_ERROR("region pzz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id11[i], region_id11); if (ret != SUCCEED) - printf("region id11 unmap failed\n"); + LOG_ERROR("region id11 unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id22[i], region_id22); if (ret != SUCCEED) - printf("region id22 unmap failed\n"); + LOG_ERROR("region id22 unmap failed\n"); } #ifdef ENABLE_MPI transfer_close += MPI_Wtime() - start; #endif if (PDCregion_close(region_xx) < 0) { - printf("fail to close region region_xx\n"); + LOG_ERROR("fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - printf("fail to close region region_yy\n"); + LOG_ERROR("fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - printf("fail to close region region_zz\n"); + LOG_ERROR("fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - printf("fail to close region region_pxx\n"); + LOG_ERROR("fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - printf("fail to close region region_pyy\n"); + LOG_ERROR("fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - printf("fail to close region region_pzz\n"); + LOG_ERROR("fail to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - printf("fail to close region region_id11\n"); + LOG_ERROR("fail to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - printf("fail to close region region_id22\n"); + LOG_ERROR("fail to close region region_id22\n"); return 1; } } @@ -584,35 +584,35 @@ main(int argc, char **argv) for (i = 0; i < timestep; ++i) { if (PDCobj_close(obj_xx[i]) < 0) { - printf("fail to close obj_xx\n"); + LOG_ERROR("fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy[i]) < 0) { - printf("fail to close object obj_yy\n"); + LOG_ERROR("fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz[i]) < 0) { - printf("fail to close object obj_zz\n"); + LOG_ERROR("fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx[i]) < 0) { - printf("fail to close object obj_pxx\n"); + LOG_ERROR("fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy[i]) < 0) { - printf("fail to close object obj_pyy\n"); + LOG_ERROR("fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz[i]) < 0) { - printf("fail to close object obj_pzz\n"); + LOG_ERROR("fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11[i]) < 0) { - printf("fail to close object obj_id11\n"); + LOG_ERROR("fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22[i]) < 0) { - printf("fail to close object obj_id22\n"); + LOG_ERROR("fail to close object obj_id22\n"); return 1; } } @@ -624,31 +624,31 @@ main(int argc, char **argv) MPI_Reduce(&transfer_create, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_create, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer create: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer create: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&transfer_start, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_start, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_start, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer start: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer start: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&transfer_wait, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_wait, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_wait, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer wait: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer wait: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&transfer_close, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_close, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_close, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer close: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer close: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&total_time, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&total_time, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&total_time, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("total: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("total: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } #endif PDC_timing_report("read"); @@ -663,40 +663,40 @@ main(int argc, char **argv) free(obj_id22); if (PDCregion_close(region_x) < 0) { - printf("fail to close region region_x\n"); + LOG_ERROR("fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - printf("fail to close region region_y\n"); + LOG_ERROR("fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - printf("fail to close region region_z\n"); + LOG_ERROR("fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - printf("fail to close region region_px\n"); + LOG_ERROR("fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - printf("fail to close region region_py\n"); + LOG_ERROR("fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - printf("fail to close region region_pz\n"); + LOG_ERROR("fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - printf("fail to close region region_id1\n"); + LOG_ERROR("fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - printf("fail to close region region_id2\n"); + LOG_ERROR("fail to close region region_id2\n"); return 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); return 1; } free(offset); diff --git a/examples/bdcats_old.c b/examples/bdcats_old.c index b4cdc347b..d8371758f 100644 --- a/examples/bdcats_old.c +++ b/examples/bdcats_old.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_INFO("Usage: srun -n ./vpicio #particles\n"); } int @@ -75,7 +75,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } x = (float *)malloc(numparticles * sizeof(float)); @@ -95,47 +95,47 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); if (obj_xx == 0) { - printf("Error when open object %s\n", "obj-var-xx"); + LOG_INFO("Error when open object %s\n", "obj-var-xx"); exit(-1); } obj_yy = PDCobj_open("obj-var-yy", pdc_id); if (obj_yy == 0) { - printf("Error when open object %s\n", "obj-var-yy"); + LOG_INFO("Error when open object %s\n", "obj-var-yy"); exit(-1); } obj_zz = PDCobj_open("obj-var-zz", pdc_id); if (obj_zz == 0) { - printf("Error when open object %s\n", "obj-var-zz"); + LOG_INFO("Error when open object %s\n", "obj-var-zz"); exit(-1); } obj_pxx = PDCobj_open("obj-var-pxx", pdc_id); if (obj_pxx == 0) { - printf("Error when open object %s\n", "obj-var-pxx"); + LOG_INFO("Error when open object %s\n", "obj-var-pxx"); exit(-1); } obj_pyy = PDCobj_open("obj-var-pyy", pdc_id); if (obj_pyy == 0) { - printf("Error when open object %s\n", "obj-var-pyy"); + LOG_INFO("Error when open object %s\n", "obj-var-pyy"); exit(-1); } obj_pzz = PDCobj_open("obj-var-pzz", pdc_id); if (obj_pzz == 0) { - printf("Error when open object %s\n", "obj-var-pzz"); + LOG_INFO("Error when open object %s\n", "obj-var-pzz"); exit(-1); } obj_id11 = PDCobj_open("id11", pdc_id); if (obj_id11 == 0) { - printf("Error when open object %s\n", "id11"); + LOG_INFO("Error when open object %s\n", "id11"); exit(-1); } obj_id22 = PDCobj_open("id22", pdc_id); if (obj_id22 == 0) { - printf("Error when open object %s\n", "id22"); + LOG_INFO("Error when open object %s\n", "id22"); exit(-1); } @@ -171,212 +171,212 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx, region_xx); if (ret < 0) - printf("Array x PDCbuf_obj_map failed\n"); + LOG_INFO("Array x PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy, region_yy); if (ret < 0) - printf("Array y PDCbuf_obj_map failed\n"); + LOG_INFO("Array y PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz, region_zz); if (ret < 0) - printf("Array z PDCbuf_obj_map failed\n"); + LOG_INFO("Array z PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx, region_pxx); if (ret < 0) - printf("Array px PDCbuf_obj_map failed\n"); + LOG_INFO("Array px PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy, region_pyy); if (ret < 0) - printf("Array py PDCbuf_obj_map failed\n"); + LOG_INFO("Array py PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz, region_pzz); if (ret < 0) - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_INFO("Array pz PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11, region_id11); if (ret < 0) - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_INFO("Array id1 PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22, region_id22); if (ret < 0) - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_INFO("Array id2 PDCbuf_obj_map failed\n"); ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_xx\n"); + LOG_INFO("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_yy\n"); + LOG_INFO("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_zz\n"); + LOG_INFO("Failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pxx\n"); + LOG_INFO("Failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pyy\n"); + LOG_INFO("Failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pzz\n"); + LOG_INFO("Failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id11\n"); + LOG_INFO("Failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id22\n"); + LOG_INFO("Failed to obtain lock for region_id22\n"); ret = PDCreg_release_lock(obj_xx, region_xx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_xx\n"); + LOG_INFO("Failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy, region_yy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_yy\n"); + LOG_INFO("Failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz, region_zz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_zz\n"); + LOG_INFO("Failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pxx\n"); + LOG_INFO("Failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pyy\n"); + LOG_INFO("Failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pzz\n"); + LOG_INFO("Failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11, region_id11, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id11\n"); + LOG_INFO("Failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22, region_id22, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id22\n"); + LOG_INFO("Failed to release lock for region_id22\n"); ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) - printf("region xx unmap failed\n"); + LOG_INFO("region xx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_yy, region_yy); if (ret != SUCCEED) - printf("region yy unmap failed\n"); + LOG_INFO("region yy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_zz, region_zz); if (ret != SUCCEED) - printf("region zz unmap failed\n"); + LOG_INFO("region zz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pxx, region_pxx); if (ret != SUCCEED) - printf("region pxx unmap failed\n"); + LOG_INFO("region pxx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pyy, region_pyy); if (ret != SUCCEED) - printf("region pyy unmap failed\n"); + LOG_INFO("region pyy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pzz, region_pzz); if (ret != SUCCEED) - printf("region pzz unmap failed\n"); + LOG_INFO("region pzz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id11, region_id11); if (ret != SUCCEED) - printf("region id11 unmap failed\n"); + LOG_INFO("region id11 unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id22, region_id22); if (ret != SUCCEED) - printf("region id22 unmap failed\n"); + LOG_INFO("region id22 unmap failed\n"); PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - printf("fail to close obj_xx\n"); + LOG_INFO("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - printf("fail to close object obj_yy\n"); + LOG_INFO("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - printf("fail to close object obj_zz\n"); + LOG_INFO("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - printf("fail to close object obj_pxx\n"); + LOG_INFO("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - printf("fail to close object obj_pyy\n"); + LOG_INFO("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - printf("fail to close object obj_pzz\n"); + LOG_INFO("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - printf("fail to close object obj_id11\n"); + LOG_INFO("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - printf("fail to close object obj_id22\n"); + LOG_INFO("Fail to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - printf("fail to close region region_x\n"); + LOG_INFO("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - printf("fail to close region region_y\n"); + LOG_INFO("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - printf("fail to close region region_z\n"); + LOG_INFO("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - printf("fail to close region region_px\n"); + LOG_INFO("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - printf("fail to close region region_py\n"); + LOG_INFO("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - printf("fail to close region region_pz\n"); + LOG_INFO("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - printf("fail to close region region_id1\n"); + LOG_INFO("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - printf("fail to close region region_id2\n"); + LOG_INFO("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - printf("fail to close region region_xx\n"); + LOG_INFO("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - printf("fail to close region region_yy\n"); + LOG_INFO("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - printf("fail to close region region_zz\n"); + LOG_INFO("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - printf("fail to close region region_pxx\n"); + LOG_INFO("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - printf("fail to close region region_pyy\n"); + LOG_INFO("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - printf("fail to close region region_pzz\n"); + LOG_INFO("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - printf("fail to close region region_id11\n"); + LOG_INFO("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - printf("fail to close region region_id22\n"); + LOG_INFO("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_INFO("Fail to close container c1\n"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_INFO("Fail to close PDC\n"); free(x); free(y); diff --git a/examples/haccio.c b/examples/haccio.c index 1ad514e88..47043a1b4 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -43,7 +43,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n #procs ./haccio #particles (in 10e6)\n"); + LOG_INFO("Usage: srun -n #procs ./haccio #particles (in 10e6)\n"); } void @@ -77,7 +77,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm); if (obj_id == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } @@ -104,7 +104,7 @@ main(int argc, char **argv) if (mpi_rank == 0) { NUM_PARTICLES = atoi(argv[1]); - printf("particles: %d\n", NUM_PARTICLES); + LOG_INFO("particles: %d\n", NUM_PARTICLES); } MPI_Bcast(&NUM_PARTICLES, 1, MPI_INT, 0, MPI_COMM_WORLD); @@ -142,7 +142,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCreg_obtain_lock(obj_ids[i], region_remote_ids[i], PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Fail to obtain lock @ line %d!\n", __LINE__); + LOG_INFO("Fail to obtain lock"); } } MPI_Barrier(MPI_COMM_WORLD); @@ -174,7 +174,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCreg_release_lock(obj_ids[i], region_remote_ids[i], PDC_WRITE); if (ret != SUCCEED) { - printf("Fail to release lock @ line %d!\n", __LINE__); + LOG_INFO("Fail to release lock"); } } MPI_Barrier(MPI_COMM_WORLD); @@ -184,7 +184,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCbuf_obj_unmap(obj_ids[i], region_remote_ids[i]); if (ret != SUCCEED) { - printf("Fail to unmap @ line %d!\n", __LINE__); + LOG_INFO("Fail to unmap"); } } MPI_Barrier(MPI_COMM_WORLD); @@ -210,7 +210,7 @@ main(int argc, char **argv) if (mpi_rank == 0) { double per_particle = sizeof(float) * 7 + sizeof(int64_t) + sizeof(int16_t); double bandwidth = per_particle * NUM_PARTICLES / 1024.0 / 1024.0 / time_total * mpi_size; - printf("Bandwidth: %.2fMB/s, total time: %.4f, lock: %.4f, io: %.4f, release: %.4f\n", bandwidth, + LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, lock: %.4f, io: %.4f, release: %.4f\n", bandwidth, time_total, time_lock, time_io, time_release); } MPI_Finalize(); diff --git a/examples/haccio_v2.c b/examples/haccio_v2.c index 116ad3a5c..07d2a5c94 100644 --- a/examples/haccio_v2.c +++ b/examples/haccio_v2.c @@ -43,7 +43,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n #procs ./haccio #particles\n"); + LOG_INFO("Usage: srun -n #procs ./haccio #particles\n"); } void @@ -78,7 +78,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm); if (obj_id == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } @@ -106,7 +106,7 @@ main(int argc, char **argv) if (mpi_rank == 0) { NUM_PARTICLES = atoi(argv[1]); - printf("particles: %d\n", NUM_PARTICLES); + LOG_INFO("particles: %d\n", NUM_PARTICLES); } MPI_Bcast(&NUM_PARTICLES, 1, MPI_INT, 0, MPI_COMM_WORLD); @@ -185,7 +185,7 @@ main(int argc, char **argv) if (mpi_rank == 0) { double per_particle = sizeof(float) * 7 + sizeof(int64_t) + sizeof(int16_t); double bandwidth = per_particle * NUM_PARTICLES / 1024.0 / 1024.0 / time_total * mpi_size; - printf("Bandwidth: %.2fMB/s, total time: %.4f, create transfer: %.4f, start transfer: %.4f, wait " + LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, create transfer: %.4f, start transfer: %.4f, wait " "transfer: %.4f\n", bandwidth, time_total, time_create, time_start, time_wait); } diff --git a/examples/llsm/llsm_aux/csvReader.c b/examples/llsm/llsm_aux/csvReader.c index c6623a287..fa917e739 100644 --- a/examples/llsm/llsm_aux/csvReader.c +++ b/examples/llsm/llsm_aux/csvReader.c @@ -308,13 +308,13 @@ csv_print_header(csv_header_t *header) { csv_header_t *current_header = header; while (current_header != NULL) { - printf("%s", current_header->field_name); + LOG_JUST_PRINT("%s", current_header->field_name); if (current_header->next != NULL) { - printf(", "); + LOG_JUST_PRINT(","); } current_header = current_header->next; } - printf("\n"); + LOG_JUST_PRINT("\n"); } void @@ -324,37 +324,37 @@ csv_print_row(csv_row_t *row, int with_key) while (current_cell != NULL) { csv_print_cell(current_cell, with_key); if (current_cell->next != NULL) { - printf(", "); + LOG_JUST_PRINT(","); } if (with_key) { - printf("\n"); + LOG_JUST_PRINT("\n"); } current_cell = current_cell->next; } - printf("\n"); + LOG_JUST_PRINT("\n"); } void csv_print_cell(csv_cell_t *cell, int with_key) { if (with_key) { - printf("%s: ", cell->header->field_name); + LOG_JUST_PRINT("%s: ", cell->header->field_name); } switch (cell->header->field_type) { case 'i': - printf("%ld", strtol(cell->field_value, NULL, 10)); + LOG_JUST_PRINT("%ld", strtol(cell->field_value, NULL, 10)); break; case 'f': - printf("%f", strtod(cell->field_value, NULL)); + LOG_JUST_PRINT("%f", strtod(cell->field_value, NULL)); break; case 's': - printf("%s", cell->field_value); + LOG_JUST_PRINT("%s", cell->field_value); break; default: - printf("%s", cell->field_value); + LOG_JUST_PRINT("%s", cell->field_value); break; } } diff --git a/examples/llsm/llsm_aux/parallelReadTiff.c b/examples/llsm/llsm_aux/parallelReadTiff.c index 063c86f39..da2702e86 100644 --- a/examples/llsm/llsm_aux/parallelReadTiff.c +++ b/examples/llsm/llsm_aux/parallelReadTiff.c @@ -1,6 +1,7 @@ #include "parallelReadTiff.h" #include "tiffio.h" #include "inttypes.h" +#include "pdc_logger.h" // #define ENABLE_OPENMP @@ -32,7 +33,7 @@ readTiffParallelBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, vo int32_t batchSize = (z - 1) / numWorkers + 1; uint64_t bytes = bits / 8; - printf("numWorkers %d\n", numWorkers); + LOG_INFO("numWorkers %d\n", numWorkers); int32_t w; #ifdef ENABLE_OPENMP @@ -42,7 +43,7 @@ readTiffParallelBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, vo TIFF *tif = TIFFOpen(fileName, "r"); if (!tif) - printf("tiff:threadError | Thread %d: File \"%s\" cannot be opened\n", w, fileName); + LOG_ERROR("tiff:threadError | Thread %d: File \"%s\" cannot be opened\n", w, fileName); void *buffer = malloc(x * bytes); for (int64_t dir = startSlice + (w * batchSize); dir < startSlice + ((w + 1) * batchSize); dir++) { @@ -51,7 +52,7 @@ readTiffParallelBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, vo int counter = 0; while (!TIFFSetDirectory(tif, (uint64_t)dir) && counter < 3) { - printf("Thread %d: File \"%s\" Directory \"%" PRId64 "\" failed to open. Try %d\n", w, + LOG_ERROR("Thread %d: File \"%s\" Directory \"%" PRId64 "\" failed to open. Try %d\n", w, fileName, dir, counter + 1); counter++; } @@ -108,7 +109,7 @@ readTiffParallel(uint64_t x, uint64_t y, uint64_t z, const char *fileName, void int32_t batchSize = (z - 1) / numWorkers + 1; uint64_t bytes = bits / 8; - printf("numWorkers %d\n", numWorkers); + LOG_INFO("numWorkers %d\n", numWorkers); uint16_t compressed = 1; TIFF * tif = TIFFOpen(fileName, "r"); @@ -246,17 +247,17 @@ readTiffParallel(uint64_t x, uint64_t y, uint64_t z, const char *fileName, void int fd = open(fileName, O_RDONLY); #endif if (fd == -1) - printf("disk:threadError | File \"%s\" cannot be opened from Disk\n", fileName); + LOG_ERROR("disk:threadError | File \"%s\" cannot be opened from Disk\n", fileName); if (!tif) - printf("tiff:threadError | File \"%s\" cannot be opened\n", fileName); + LGO_ERROR("tiff:threadError | File \"%s\" cannot be opened\n", fileName); uint64_t offset = 0; uint64_t *offsets = NULL; TIFFGetField(tif, TIFFTAG_STRIPOFFSETS, &offsets); uint64_t *byteCounts = NULL; TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &byteCounts); if (!offsets || !byteCounts) - printf("tiff:threadError | Could not get offsets or byte counts from the tiff file\n"); + LOG_ERROR("tiff:threadError | Could not get offsets or byte counts from the tiff file\n"); offset = offsets[0]; uint64_t fOffset = offsets[stripsPerDir - 1] + byteCounts[stripsPerDir - 1]; uint64_t zSize = fOffset - offset; @@ -313,7 +314,7 @@ readTiffParallel(uint64_t x, uint64_t y, uint64_t z, const char *fileName, void if (errBak) readTiffParallelBak(x, y, z, fileName, tiff, bits, startSlice, flipXY); else - printf("tiff:threadError %s\n", errString); + LOG_ERROR("tiff:threadError %s\n", errString); } } @@ -326,7 +327,7 @@ readTiffParallel2DBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, int32_t batchSize = (y - 1) / numWorkers + 1; uint64_t bytes = bits / 8; - printf("numWorkers %d\n", numWorkers); + LOG_INFO("numWorkers %d\n", numWorkers); int32_t w; #ifdef ENABLE_OPENMP @@ -336,7 +337,7 @@ readTiffParallel2DBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, TIFF *tif = TIFFOpen(fileName, "r"); if (!tif) - printf("tiff:threadError | Thread %d: File \"%s\" cannot be opened\n", w, fileName); + LOG_ERROR("tiff:threadError | Thread %d: File \"%s\" cannot be opened\n", w, fileName); void *buffer = malloc(x * bytes); for (int64_t dir = startSlice + (w * batchSize); dir < startSlice + ((w + 1) * batchSize); dir++) { @@ -345,7 +346,7 @@ readTiffParallel2DBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, int counter = 0; while (!TIFFSetDirectory(tif, (uint64_t)0) && counter < 3) { - printf("Thread %d: File \"%s\" Directory \"%" PRId64 "\" failed to open. Try %d\n", w, + LOG_ERROR("Thread %d: File \"%s\" Directory \"%" PRId64 "\" failed to open. Try %d\n", w, fileName, dir, counter + 1); counter++; } @@ -410,7 +411,7 @@ readTiffParallel2D(uint64_t x, uint64_t y, uint64_t z, const char *fileName, voi uint8_t errBak = 0; char errString[10000]; - printf("numWorkers %d\n", numWorkers); + LOG_INFO("numWorkers %d\n", numWorkers); #ifdef ENABLE_OPENMP #pragma omp parallel for @@ -438,7 +439,7 @@ readTiffParallel2D(uint64_t x, uint64_t y, uint64_t z, const char *fileName, voi uint8_t counter = 0; while (!TIFFSetDirectory(tif, 0) && counter < 3) { - printf("Thread %d: File \"%s\" Directory \"%d\" failed to open. Try %d\n", w, fileName, 0, + LOG_ERROR("Thread %d: File \"%s\" Directory \"%d\" failed to open. Try %d\n", w, fileName, 0, counter + 1); counter++; if (counter == 3) { @@ -526,7 +527,7 @@ readTiffParallel2D(uint64_t x, uint64_t y, uint64_t z, const char *fileName, voi if (errBak) readTiffParallel2DBak(x, y, z, fileName, tiff, bits, startSlice, flipXY); else - printf("tiff:threadError %s\n", errString); + LOG_ERROR("tiff:threadError %s\n", errString); } } @@ -542,7 +543,7 @@ readTiffParallelImageJ(uint64_t x, uint64_t y, uint64_t z, const char *fileName, #endif TIFF *tif = TIFFOpen(fileName, "r"); if (!tif) - printf("tiff:threadError | File \"%s\" cannot be opened\n", fileName); + LOG_ERROR("tiff:threadError | File \"%s\" cannot be opened\n", fileName); uint64_t offset = 0; uint64_t *offsets = NULL; TIFFGetField(tif, TIFFTAG_STRIPOFFSETS, &offsets); @@ -691,7 +692,7 @@ get_tiff_info(char *fileName, parallel_tiff_range_t *strip_range, uint64_t *x, u TIFFSetWarningHandler(DummyHandler); TIFF *tif = TIFFOpen(fileName, "r"); if (!tif) - printf("tiff:inputError | File \"%s\" cannot be opened", fileName); + LOG_ERROR("tiff:inputError | File \"%s\" cannot be opened", fileName); TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, x); TIFFGetField(tif, TIFFTAG_IMAGELENGTH, y); @@ -703,7 +704,7 @@ get_tiff_info(char *fileName, parallel_tiff_range_t *strip_range, uint64_t *x, u t *= 8; if (s > t) { t = 65535; - printf("Number of slices > 32768\n"); + LOG_INFO("Number of slices > 32768\n"); break; } } @@ -723,13 +724,13 @@ get_tiff_info(char *fileName, parallel_tiff_range_t *strip_range, uint64_t *x, u } else { if (strip_range->length != 2) { - printf("tiff:inputError | Input range is not 2"); + LOG_ERROR("tiff:inputError | Input range is not 2"); } else { *startSlice = (uint64_t)(*(strip_range->range)) - 1; *z = (uint64_t)(*(strip_range->range + 1)) - startSlice[0]; if (!TIFFSetDirectory(tif, startSlice[0] + z[0] - 1) || !TIFFSetDirectory(tif, startSlice[0])) { - printf("tiff:rangeOutOfBound | Range is out of bounds"); + LOG_ERROR("tiff:rangeOutOfBound | Range is out of bounds"); } } } @@ -772,7 +773,7 @@ _TIFF_load(char *fileName, uint8_t isImageJIm, uint64_t x, uint64_t y, uint64_t uint64_t startSlice, uint64_t stripSize, uint8_t flipXY, int ndim, size_t *dims, void **tiff_ptr) { if (tiff_ptr == NULL) { - printf("tiff:dataTypeError, Data type not suppported\n"); + LOG_ERROR("tiff:dataTypeError, Data type not suppported\n"); } *tiff_ptr = _get_tiff_array(bits, ndim, dims); // Case for ImageJ diff --git a/examples/llsm/llsm_importer.c b/examples/llsm/llsm_importer.c index fef6c0e54..bd68c856c 100644 --- a/examples/llsm/llsm_importer.c +++ b/examples/llsm/llsm_importer.c @@ -51,7 +51,7 @@ parse_console_args(int argc, char *argv[], char **file_name, int *flag_m) parse_code = 0; break; default: - fprintf(stderr, "Usage: %s [-m] [-f filename]\n", argv[0]); + LOG_ERROR("Usage: %s [-m] [-f filename]\n", argv[0]); parse_code = -1; exit(EXIT_FAILURE); } @@ -95,7 +95,7 @@ import_to_pdc(image_info_t *image_info, csv_cell_t *fileName_cell) pdc_type = PDC_DOUBLE; break; default: - printf("Error: unsupported data type.\n"); + LOG_ERROR("Error: unsupported data type.\n"); exit(-1); } PDCprop_set_obj_type(obj_prop_g, pdc_type); @@ -125,7 +125,7 @@ import_to_pdc(image_info_t *image_info, csv_cell_t *fileName_cell) duration = getDoubleTimestamp() - start; // end timing the operation and calculate duration in nanoseconds - printf("[Rank %4d] Region_Transfer %s_[%ld_Bytes] Done! Time taken: %.4f seconds\n", rank, + LOG_INFO("[Rank %4d] Region_Transfer %s_[%ld_Bytes] Done! Time taken: %.4f seconds\n", rank, fileName_cell->field_value, image_info->tiff_size, duration); // add metadata tags based on the csv row @@ -168,7 +168,7 @@ import_to_pdc(image_info_t *image_info, csv_cell_t *fileName_cell) // get timing duration = getDoubleTimestamp() - start; // end timing the operation calculate duration in nanoseconds - printf("[Rank %4d] Create_object %s Done! Time taken: %.4f seconds\n", rank, fileName_cell->field_value, + LOG_INFO("[Rank %4d] Create_object %s Done! Time taken: %.4f seconds\n", rank, fileName_cell->field_value, duration); // free memory @@ -210,17 +210,17 @@ on_csv_row(csv_row_t *row, llsm_importer_args_t *llsm_args) duration = getDoubleTimestamp() - start; // end timing the operation and calculate duration in nanoseconds - printf("[Rank %4d] Read %s Done! Time taken: %.4f seconds\n", rank, filepath, duration); + LOG_INFO("[Rank %4d] Read %s Done! Time taken: %.4f seconds\n", rank, filepath, duration); if (image_info == NULL || image_info->tiff_ptr == NULL) { return; } - printf("first few bytes "); + LOG_INFO("first few bytes"); for (i = 0; i < 10; i++) { - printf("%d ", ((uint8_t *)image_info->tiff_ptr)[i]); + LOG_INFO("%d ", ((uint8_t *)image_info->tiff_ptr)[i]); } - printf("\n"); + LOG_INFO("\n"); // import the image to PDC import_to_pdc(image_info, fileName_cell); @@ -239,7 +239,7 @@ read_txt(char *txtFileName, PDC_LIST *list, int *max_row_length) int row_length = 0; if (file == NULL) { - printf("Error: could not open file %s\n", txtFileName); + LOG_ERROR("Error: could not open file %s\n", txtFileName); return; } char buffer[1024]; @@ -286,8 +286,8 @@ main(int argc, char *argv[]) char *directory_path = dirname(strdup(file_name)); // print file name for validating purpose - printf("Filename: %s\n", file_name ? file_name : "(none)"); - printf("Directory: %s\n", directory_path ? directory_path : "(none)"); + LOG_INFO("Filename: %s\n", file_name ? file_name : "(none)"); + LOG_INFO("Directory: %s\n", directory_path ? directory_path : "(none)"); // create a pdc pdc_id_g = PDCinit("pdc"); @@ -295,18 +295,18 @@ main(int argc, char *argv[]) // create a container property cont_prop_g = PDCprop_create(PDC_CONT_CREATE, pdc_id_g); if (cont_prop_g <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id_g = PDCcont_create("c1", cont_prop_g); if (cont_id_g <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // Rank 0 reads the filename list and distribute data to other ranks if (rank == 0) { read_txt(file_name, list, &bcast_count); // print bcast_count - printf("bcast_count: %d \n", bcast_count); + LOG_ERROR("bcast_count: %d \n", bcast_count); #ifdef ENABLE_MPI // broadcast the number of lines @@ -341,7 +341,7 @@ main(int argc, char *argv[]) // parse the csv csv_table_t *csv_table = csv_parse_list(list, csv_field_types); if (csv_table == NULL) { - printf("Fail to parse csv file @ line %d!\n", __LINE__); + LOG_ERROR("Fail to parse csv file"); return -1; } llsm_args = (llsm_importer_args_t *)malloc(sizeof(llsm_importer_args_t)); @@ -372,7 +372,7 @@ main(int argc, char *argv[]) #endif if (rank == 0) { - printf("[Completion Time] LLSM IMPORTER FINISHES! Time taken: %.4f seconds\n", duration); + LOG_INFO("[Completion Time] LLSM IMPORTER FINISHES! Time taken: %.4f seconds\n", duration); } // free memory for csv table csv_free_table(csv_table); diff --git a/examples/obj_get_data.c b/examples/obj_get_data.c index aef0e0095..38e56066d 100644 --- a/examples/obj_get_data.c +++ b/examples/obj_get_data.c @@ -48,25 +48,25 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container %s\n", rank, cont_name); + LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); ret_value = 1; } @@ -74,10 +74,10 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_put_data(obj_name1, (void *)data, 16 * sizeof(double), cont); if (obj1 > 0) { - printf("Rank %d Put data to %s\n", rank, obj_name1); + LOG_INFO("Rank %d Put data to %s\n", rank, obj_name1); } else { - printf("Fail to put data into object @ line %d!\n", __LINE__); + LOG_INFO("Fail to put data into object"); ret_value = 1; } @@ -85,22 +85,22 @@ main(int argc, char **argv) sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_put_data(obj_name2, (void *)data, 128 * sizeof(double), cont); if (obj2 > 0) { - printf("Rank %d Put data to %s\n", rank, obj_name2); + LOG_INFO("Rank %d Put data to %s\n", rank, obj_name2); } else { - printf("Fail to put data into object @ line %d!\n", __LINE__); + LOG_INFO("Fail to put data into object"); ret_value = 1; } memset(data, 0, 128 * sizeof(double)); error_code = PDCobj_get_data(obj1, (void *)(data), 16 * sizeof(double)); if (error_code != SUCCEED) { - printf("Fail to get obj 1 data\n"); + LOG_INFO("Fail to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < 16 * sizeof(double); ++i) { if (data[i] != 1) { - printf("wrong value at obj 1\n"); + LOG_INFO("wrong value at obj 1\n"); ret_value = 1; break; } @@ -108,12 +108,12 @@ main(int argc, char **argv) memset(data, 0, 128 * sizeof(double)); error_code = PDCobj_get_data(obj2, (void *)(data), 128 * sizeof(double)); if (error_code != SUCCEED) { - printf("Fail to get obj 1 data\n"); + LOG_INFO("Fail to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < 128 * sizeof(double); ++i) { if (data[i] != 2) { - printf("wrong value at obj 2\n"); + LOG_INFO("wrong value at obj 2\n"); ret_value = 1; break; } @@ -121,39 +121,39 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_INFO("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_INFO("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_INFO("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_INFO("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/pdc_init.c b/examples/pdc_init.c index 4ffb5092e..b06a2bc73 100644 --- a/examples/pdc_init.c +++ b/examples/pdc_init.c @@ -42,11 +42,11 @@ main(int argc, char **argv) #endif pdc = PDCinit("pdc"); - printf("generated new pdc\n"); + LOGI("generated new pdc\n"); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOGI("fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index 551e72eb0..68fda88cc 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -73,7 +73,7 @@ main(int argc, char **argv) ndim = 3; } else { - printf("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3 @ line %d\n", __LINE__); + LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); } local_offset[0] = 0; @@ -118,14 +118,14 @@ main(int argc, char **argv) char hostname[256]; gethostname(hostname, 256); if (rank == 0) { - printf("number of dimensions in this test is %d\n", ndim); - printf("data size = %llu\n", (long long unsigned)data_size); - printf("first dim has size %" PRIu64 "\n", dims[0]); + LOG_INFO("number of dimensions in this test is %d\n", ndim); + LOG_INFO("data size = %llu\n", (long long unsigned)data_size); + LOG_INFO("first dim has size %" PRIu64 "\n", dims[0]); if (ndim >= 2) { - printf("second dim has size %" PRIu64 "\n", dims[1]); + LOG_INFO("second dim has size %" PRIu64 "\n", dims[1]); } if (ndim == 3) { - printf("third dim has size %" PRIu64 "\n", dims[2]); + LOG_INFO("third dim has size %" PRIu64 "\n", dims[2]); } } @@ -135,26 +135,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_INFO("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -177,7 +177,7 @@ main(int argc, char **argv) #endif if (obj1 <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object"); ret_value = 1; } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -187,7 +187,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_create failed"); ret_value = 1; } @@ -195,7 +195,7 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_start failed"); ret_value = 1; } @@ -203,28 +203,28 @@ main(int argc, char **argv) ret = PDCregion_transfer_wait(transfer_request); write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_close failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close object o1"); ret_value = 1; } } @@ -235,7 +235,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - printf("Fail to open object @ line %d!\n", __LINE__); + LOG_INFO("Fail to open object"); ret_value = 1; } @@ -247,7 +247,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_create failed"); ret_value = 1; } @@ -256,7 +256,7 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_start failed"); exit(-1); } @@ -265,34 +265,34 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_close failed"); ret_value = 1; } if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d\n", __LINE__); + LOG_INFO("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close object o1"); ret_value = 1; } } @@ -301,47 +301,47 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_INFO("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_start_time = start; if (!rank) { - printf("write transfer start time: %lf\n", write_reg_transfer_start_time); + LOG_INFO("write transfer start time: %lf\n", write_reg_transfer_start_time); } MPI_Reduce(&write_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_wait_time = start; if (!rank) { - printf("write transfer wait time: %lf\n", write_reg_transfer_wait_time); + LOG_INFO("write transfer wait time: %lf\n", write_reg_transfer_wait_time); } MPI_Reduce(&read_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_start_time = start; if (!rank) { - printf("read transfer start time: %lf\n", read_reg_transfer_start_time); + LOG_INFO("read transfer start time: %lf\n", read_reg_transfer_start_time); } MPI_Reduce(&read_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_wait_time = start; if (!rank) { - printf("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); + LOG_INFO("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); } free(data); diff --git a/examples/read_write_perf.c b/examples/read_write_perf.c index 76c09a470..21bd718d2 100644 --- a/examples/read_write_perf.c +++ b/examples/read_write_perf.c @@ -67,7 +67,7 @@ main(int argc, char **argv) ndim = 3; } else { - printf("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3 @ line %d\n", __LINE__); + LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); } local_offset[0] = 0; @@ -112,14 +112,14 @@ main(int argc, char **argv) char hostname[256]; gethostname(hostname, 256); if (rank == 0) { - printf("number of dimensions in this test is %d\n", ndim); - printf("data size = %llu\n", (long long unsigned)data_size); - printf("first dim has size %d\n", data_size_array[0]); + LOG_INFO("number of dimensions in this test is %d\n", ndim); + LOG_INFO("data size = %llu\n", (long long unsigned)data_size); + LOG_INFO("first dim has size %d\n", data_size_array[0]); if (ndim >= 2) { - printf("second dim has size %d\n", data_size_array[1]); + LOG_INFO("second dim has size %d\n", data_size_array[1]); } if (ndim == 3) { - printf("third dim has size %d\n", data_size_array[2]); + LOG_INFO("third dim has size %d\n", data_size_array[2]); } } @@ -129,26 +129,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_INFO("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -165,7 +165,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object"); ret_value = 1; } @@ -177,7 +177,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_create failed"); ret_value = 1; } @@ -186,7 +186,7 @@ main(int argc, char **argv) write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_start failed"); ret_value = 1; } @@ -195,28 +195,28 @@ main(int argc, char **argv) write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_close failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close object o1"); ret_value = 1; } } @@ -227,7 +227,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - printf("Fail to open object @ line %d!\n", __LINE__); + LOG_INFO("Fail to open object"); ret_value = 1; } @@ -239,7 +239,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_create failed"); ret_value = 1; } @@ -248,7 +248,7 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_start failed"); exit(-1); } @@ -257,34 +257,34 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_close failed"); ret_value = 1; } if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d\n", __LINE__); + LOG_INFO("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close object o1"); ret_value = 1; } } @@ -293,47 +293,47 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_INFO("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_start_time = start; if (!rank) { - printf("write transfer start time: %lf\n", write_reg_transfer_start_time); + LOG_INFO("write transfer start time: %lf\n", write_reg_transfer_start_time); } MPI_Reduce(&write_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_wait_time = start; if (!rank) { - printf("write transfer wait time: %lf\n", write_reg_transfer_wait_time); + LOG_INFO("write transfer wait time: %lf\n", write_reg_transfer_wait_time); } MPI_Reduce(&read_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_start_time = start; if (!rank) { - printf("read transfer start time: %lf\n", read_reg_transfer_start_time); + LOG_INFO("read transfer start time: %lf\n", read_reg_transfer_start_time); } MPI_Reduce(&read_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_wait_time = start; if (!rank) { - printf("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); + LOG_INFO("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); } free(data); diff --git a/examples/region_transfer_2D.c b/examples/region_transfer_2D.c index c5d9f733d..be477d3c1 100644 --- a/examples/region_transfer_2D.c +++ b/examples/region_transfer_2D.c @@ -60,40 +60,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_INFO("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -106,20 +106,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object"); ret_value = 1; } @@ -143,19 +143,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -177,71 +177,71 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_INFO("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_INFO("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_INFO("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_INFO("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/region_transfer_3D.c b/examples/region_transfer_3D.c index 592f76674..7e549eab9 100644 --- a/examples/region_transfer_3D.c +++ b/examples/region_transfer_3D.c @@ -61,40 +61,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_INFO("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -107,20 +107,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_INFO("Fail to create object"); ret_value = 1; } @@ -146,19 +146,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -182,71 +182,71 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_INFO("wrong value %d!=%d", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_INFO("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_INFO("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_INFO("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_INFO("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_INFO("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_INFO("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/tileio.c b/examples/tileio.c index 788e9b671..1db6c4406 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -24,9 +24,9 @@ int g_x_ept, g_y_ept; void print_usage() { - printf("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " + LOG_INFO("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " "#num_elements_x #num_elements_y\n"); - printf("\tnote: #procs should equal to x_tiles*y_tiles\n"); + LOG_INFO("\tnote: #procs should equal to x_tiles*y_tiles\n"); } pdcid_t @@ -45,7 +45,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); if (obj_id == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } @@ -85,7 +85,7 @@ init(int argc, char **argv) MPI_Comm_rank(g_mpi_comm, &g_mpi_rank); MPI_Cart_coords(g_mpi_comm, g_mpi_rank, NUM_DIMS, g_coords); - // printf("my 2d rank: %d, coords: (%d, %d)\n", g_mpi_rank, g_coords[0], g_coords[1]); + // LOG_INFO("my 2d rank: %d, coords: (%d, %d)\n", g_mpi_rank, g_coords[0], g_coords[1]); } int @@ -133,7 +133,7 @@ main(int argc, char **argv) time_acquire_lock = MPI_Wtime(); ret = PDCreg_obtain_lock(obj_id, global_region_id, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Fail to obtain lock @ line %d!\n", __LINE__); + LOG_INFO("Fail to obtain lock"); } MPI_Barrier(MPI_COMM_WORLD); time_acquire_lock = MPI_Wtime() - time_acquire_lock; @@ -153,7 +153,7 @@ main(int argc, char **argv) time_release_lock = MPI_Wtime(); ret = PDCreg_release_lock(obj_id, global_region_id, PDC_WRITE); if (ret != SUCCEED) { - printf("Fail to release lock @ line %d!\n", __LINE__); + LOG_INFO("Fail to release lock"); } MPI_Barrier(MPI_COMM_WORLD); time_release_lock = MPI_Wtime() - time_release_lock; @@ -161,7 +161,7 @@ main(int argc, char **argv) // Unmap object ret = PDCbuf_obj_unmap(obj_id, global_region_id); if (ret != SUCCEED) { - printf("Fail to unmap @ line %d!\n", __LINE__); + LOG_INFO("Fail to unmap"); } // TODO delete before close ? PDCobj_close(obj_id); @@ -185,7 +185,7 @@ main(int argc, char **argv) if (g_mpi_rank == 0) { double bandwidth = g_x_tiles * g_y_tiles * g_x_ept * g_y_ept / 1024.0 / 1024.0 * sizeof(double) / time_total; - printf("Bandwidth: %.2fMB/s, total time: %.4f, lock: %.4f, io: %.4f, release: %.4f\n", bandwidth, + LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, lock: %.4f, io: %.4f, release: %.4f\n", bandwidth, time_total, time_acquire_lock, time_io, time_release_lock); } diff --git a/examples/tileio_v2.c b/examples/tileio_v2.c index cf128acad..194c9660e 100644 --- a/examples/tileio_v2.c +++ b/examples/tileio_v2.c @@ -24,9 +24,9 @@ int g_x_ept, g_y_ept; void print_usage() { - printf("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " + LOG_INFO("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " "#num_elements_x #num_elements_y\n"); - printf("\tnote: #procs should equal to x_tiles*y_tiles\n"); + LOG_INFO("\tnote: #procs should equal to x_tiles*y_tiles\n"); } pdcid_t @@ -45,7 +45,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); if (obj_id == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } @@ -85,7 +85,7 @@ init(int argc, char **argv) MPI_Comm_rank(g_mpi_comm, &g_mpi_rank); MPI_Cart_coords(g_mpi_comm, g_mpi_rank, NUM_DIMS, g_coords); - // printf("my 2d rank: %d, coords: (%d, %d)\n", g_mpi_rank, g_coords[0], g_coords[1]); + // LOG_INFO("my 2d rank: %d, coords: (%d, %d)\n", g_mpi_rank, g_coords[0], g_coords[1]); } int @@ -164,7 +164,7 @@ main(int argc, char **argv) if (g_mpi_rank == 0) { double bandwidth = g_x_ept * g_y_ept / 1024.0 / 1024.0 * g_x_tiles * g_y_tiles * sizeof(double) / time_total; - printf("Bandwidth: %.2fMB/s, total time: %.4f, transfer create: %.4f, transfer start: %.4f, " + LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, transfer create: %.4f, transfer start: %.4f, " "transfert wait: %.4f\n", bandwidth, time_total, time_create, time_start, time_wait); } diff --git a/examples/vpicio.c b/examples/vpicio.c index 46a56ff24..561c4dcd2 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_INFO("Usage: srun -n ./vpicio #particles\n"); } int @@ -90,7 +90,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } dims[0] = numparticles; @@ -112,13 +112,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); return 1; } // create an object property @@ -154,44 +154,44 @@ main(int argc, char **argv) obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_INFO("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); if (obj_yy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + LOG_INFO("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); if (obj_zz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + LOG_INFO("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); if (obj_pxx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + LOG_INFO("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); if (obj_pyy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + LOG_INFO("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); if (obj_pzz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + LOG_INFO("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); if (obj_id11 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + LOG_INFO("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); if (obj_id22 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } @@ -227,42 +227,42 @@ main(int argc, char **argv) transfer_request_x = PDCregion_transfer_create(&x[0], PDC_WRITE, obj_xx, region_x, region_xx); if (transfer_request_x == 0) { - printf("Array x transfer request creation failed\n"); + LOG_INFO("Array x transfer request creation failed\n"); return 1; } transfer_request_y = PDCregion_transfer_create(&y[0], PDC_WRITE, obj_yy, region_y, region_yy); if (transfer_request_y == 0) { - printf("Array y transfer request creation failed\n"); + LOG_INFO("Array y transfer request creation failed\n"); return 1; } transfer_request_z = PDCregion_transfer_create(&z[0], PDC_WRITE, obj_zz, region_z, region_zz); if (transfer_request_z == 0) { - printf("Array z transfer request creation failed\n"); + LOG_INFO("Array z transfer request creation failed\n"); return 1; } transfer_request_px = PDCregion_transfer_create(&px[0], PDC_WRITE, obj_pxx, region_px, region_pxx); if (transfer_request_px == 0) { - printf("Array px transfer request creation failed\n"); + LOG_INFO("Array px transfer request creation failed\n"); return 1; } transfer_request_py = PDCregion_transfer_create(&py[0], PDC_WRITE, obj_pyy, region_py, region_pyy); if (transfer_request_py == 0) { - printf("Array py transfer request creation failed\n"); + LOG_INFO("Array py transfer request creation failed\n"); return 1; } transfer_request_pz = PDCregion_transfer_create(&pz[0], PDC_WRITE, obj_pzz, region_pz, region_pzz); if (transfer_request_pz == 0) { - printf("Array pz transfer request creation failed\n"); + LOG_INFO("Array pz transfer request creation failed\n"); return 1; } transfer_request_id1 = PDCregion_transfer_create(&id1[0], PDC_WRITE, obj_id11, region_id1, region_id11); if (transfer_request_id1 == 0) { - printf("Array id1 transfer request creation failed\n"); + LOG_INFO("Array id1 transfer request creation failed\n"); return 1; } transfer_request_id2 = PDCregion_transfer_create(&id2[0], PDC_WRITE, obj_id22, region_id2, region_id22); if (transfer_request_id2 == 0) { - printf("Array id2 transfer request creation failed\n"); + LOG_INFO("Array id2 transfer request creation failed\n"); return 1; } @@ -279,124 +279,124 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to start transfer for region_xx\n"); + LOG_INFO("Failed to start transfer for region_xx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to start transfer for region_yy\n"); + LOG_INFO("Failed to start transfer for region_yy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to start transfer for region_zz\n"); + LOG_INFO("Failed to start transfer for region_zz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pxx\n"); + LOG_INFO("Failed to start transfer for region_pxx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pyy\n"); + LOG_INFO("Failed to start transfer for region_pyy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pzz\n"); + LOG_INFO("Failed to start transfer for region_pzz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id11\n"); + LOG_INFO("Failed to start transfer for region_id11\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id22\n"); + LOG_INFO("Failed to start transfer for region_id22\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_xx\n"); + LOG_INFO("Failed to transfer wait for region_xx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_yy\n"); + LOG_INFO("Failed to transfer wait for region_yy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_zz\n"); + LOG_INFO("Failed to transfer wait for region_zz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pxx\n"); + LOG_INFO("Failed to transfer wait for region_pxx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pyy\n"); + LOG_INFO("Failed to transfer wait for region_pyy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pzz\n"); + LOG_INFO("Failed to transfer wait for region_pzz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id11\n"); + LOG_INFO("Failed to transfer wait for region_id11\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id22\n"); + LOG_INFO("Failed to transfer wait for region_id22\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_x); if (ret != SUCCEED) { - printf("region xx transfer close failed\n"); + LOG_INFO("region xx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_y); if (ret != SUCCEED) { - printf("region yy transfer close failed\n"); + LOG_INFO("region yy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_z); if (ret != SUCCEED) { - printf("region zz transfer close failed\n"); + LOG_INFO("region zz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_px); if (ret != SUCCEED) { - printf("region pxx transfer close failed\n"); + LOG_INFO("region pxx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_py); if (ret != SUCCEED) { - printf("region pyy transfer close failed\n"); + LOG_INFO("region pyy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_pz); if (ret != SUCCEED) { - printf("region pzz transfer close failed\n"); + LOG_INFO("region pzz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id1); if (ret != SUCCEED) { - printf("region id11 transfer close failed\n"); + LOG_INFO("region id11 transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id2); if (ret != SUCCEED) { - printf("region id22 transfer close failed\n"); + LOG_INFO("region id22 transfer close failed\n"); return 1; } @@ -407,146 +407,146 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj_xx) < 0) { - printf("fail to close obj_xx\n"); + LOG_INFO("Fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - printf("fail to close object obj_yy\n"); + LOG_INFO("Fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - printf("fail to close object obj_zz\n"); + LOG_INFO("Fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - printf("fail to close object obj_pxx\n"); + LOG_INFO("Fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - printf("fail to close object obj_pyy\n"); + LOG_INFO("Fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - printf("fail to close object obj_pzz\n"); + LOG_INFO("Fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - printf("fail to close object obj_id11\n"); + LOG_INFO("Fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - printf("fail to close object obj_id22\n"); + LOG_INFO("Fail to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - printf("Fail to close obj property obj_prop_xx\n"); + LOG_INFO("Fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - printf("Fail to close obj property obj_prop_yy\n"); + LOG_INFO("Fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - printf("Fail to close obj property obj_prop_zz\n"); + LOG_INFO("Fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - printf("Fail to close obj property obj_prop_pxx\n"); + LOG_INFO("Fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - printf("Fail to close obj property obj_prop_pyy\n"); + LOG_INFO("Fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - printf("Fail to close obj property obj_prop_pzz\n"); + LOG_INFO("Fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - printf("Fail to close obj property obj_prop_id11\n"); + LOG_INFO("Fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - printf("Fail to close obj property obj_prop_id22\n"); + LOG_INFO("Fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - printf("fail to close region region_x\n"); + LOG_INFO("Fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - printf("fail to close region region_y\n"); + LOG_INFO("Fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - printf("fail to close region region_z\n"); + LOG_INFO("Fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - printf("fail to close region region_px\n"); + LOG_INFO("Fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - printf("fail to close region region_py\n"); + LOG_INFO("Fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - printf("fail to close region region_pz\n"); + LOG_INFO("Fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - printf("fail to close region region_id1\n"); + LOG_INFO("Fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - printf("fail to close region region_id2\n"); + LOG_INFO("Fail to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - printf("fail to close region region_xx\n"); + LOG_INFO("Fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - printf("fail to close region region_yy\n"); + LOG_INFO("Fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - printf("fail to close region region_zz\n"); + LOG_INFO("Fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - printf("fail to close region region_pxx\n"); + LOG_INFO("Fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - printf("fail to close region region_pyy\n"); + LOG_INFO("Fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - printf("fail to close region region_pzz\n"); + LOG_INFO("Fail to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - printf("fail to close region region_id11\n"); + LOG_INFO("Fail to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - printf("fail to close region region_id22\n"); + LOG_INFO("Fail to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - printf("fail to close container c1\n"); + LOG_INFO("Fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_INFO("Fail to close PDC\n"); return 1; } free(offset); diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index d33dc42d9..cd9132e17 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -45,7 +45,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio sleep_time timestamps #particles\n"); + LOG_INFO("Usage: srun -n ./vpicio sleep_time timestamps #particles\n"); } int @@ -108,7 +108,7 @@ main(int argc, char **argv) if (argc >= 4) { numparticles = atoll(argv[3]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } if (argc >= 5) { test_method = atoi(argv[4]); @@ -122,7 +122,7 @@ main(int argc, char **argv) } if (!rank) { - printf("sleep time = %u, timestamps = %" PRIu64 ", numparticles = %" PRIu64 + LOG_INFO("sleep time = %u, timestamps = %" PRIu64 ", numparticles = %" PRIu64 ", test_method = %d, region_ partition = %d\n", sleep_time, timestamps, numparticles, test_method, (int)region_partition); } @@ -145,13 +145,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); return 1; } // create an object property @@ -252,49 +252,49 @@ main(int argc, char **argv) sprintf(obj_name, "obj-var-xx %" PRIu64 "", i); obj_xx[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_xx, 0, comm); if (obj_xx[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_INFO("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); if (obj_yy[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + LOG_INFO("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); if (obj_zz[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + LOG_INFO("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); if (obj_pxx[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + LOG_INFO("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); if (obj_pyy[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + LOG_INFO("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); if (obj_pzz[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + LOG_INFO("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); if (obj_id11[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + LOG_INFO("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); if (obj_id22[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } } @@ -323,84 +323,84 @@ main(int argc, char **argv) transfer_request_x[i] = PDCregion_transfer_create(&x[0], PDC_WRITE, obj_xx[i], region_x, region_xx); if (transfer_request_x[i] == 0) { - printf("Array x transfer request creation failed\n"); + LOG_INFO("Array x transfer request creation failed\n"); return 1; } transfer_request_y[i] = PDCregion_transfer_create(&y[0], PDC_WRITE, obj_yy[i], region_y, region_yy); if (transfer_request_y[i] == 0) { - printf("Array y transfer request creation failed\n"); + LOG_INFO("Array y transfer request creation failed\n"); return 1; } transfer_request_z[i] = PDCregion_transfer_create(&z[0], PDC_WRITE, obj_zz[i], region_z, region_zz); if (transfer_request_z[i] == 0) { - printf("Array z transfer request creation failed\n"); + LOG_INFO("Array z transfer request creation failed\n"); return 1; } transfer_request_px[i] = PDCregion_transfer_create(&px[0], PDC_WRITE, obj_pxx[i], region_px, region_pxx); if (transfer_request_px[i] == 0) { - printf("Array px transfer request creation failed\n"); + LOG_INFO("Array px transfer request creation failed\n"); return 1; } transfer_request_py[i] = PDCregion_transfer_create(&py[0], PDC_WRITE, obj_pyy[i], region_py, region_pyy); if (transfer_request_py[i] == 0) { - printf("Array py transfer request creation failed\n"); + LOG_INFO("Array py transfer request creation failed\n"); return 1; } transfer_request_pz[i] = PDCregion_transfer_create(&pz[0], PDC_WRITE, obj_pzz[i], region_pz, region_pzz); if (transfer_request_pz[i] == 0) { - printf("Array pz transfer request creation failed\n"); + LOG_INFO("Array pz transfer request creation failed\n"); return 1; } transfer_request_id1[i] = PDCregion_transfer_create(&id1[0], PDC_WRITE, obj_id11[i], region_id1, region_id11); if (transfer_request_id1[i] == 0) { - printf("Array id1 transfer request creation failed\n"); + LOG_INFO("Array id1 transfer request creation failed\n"); return 1; } transfer_request_id2[i] = PDCregion_transfer_create(&id2[0], PDC_WRITE, obj_id22[i], region_id2, region_id22); if (transfer_request_id2[i] == 0) { - printf("Array id2 transfer request creation failed\n"); + LOG_INFO("Array id2 transfer request creation failed\n"); return 1; } } else { ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx[i], region_xx); if (ret < 0) - printf("Array x PDCbuf_obj_map failed\n"); + LOG_INFO("Array x PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy[i], region_yy); if (ret < 0) - printf("Array y PDCbuf_obj_map failed\n"); + LOG_INFO("Array y PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz[i], region_zz); if (ret < 0) - printf("Array z PDCbuf_obj_map failed\n"); + LOG_INFO("Array z PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx[i], region_pxx); if (ret < 0) - printf("Array px PDCbuf_obj_map failed\n"); + LOG_INFO("Array px PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy[i], region_pyy); if (ret < 0) - printf("Array py PDCbuf_obj_map failed\n"); + LOG_INFO("Array py PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz[i], region_pzz); if (ret < 0) - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_INFO("Array pz PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11[i], region_id11); if (ret < 0) - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_INFO("Array id1 PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22[i], region_id22); if (ret < 0) - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_INFO("Array id2 PDCbuf_obj_map failed\n"); } #ifdef ENABLE_MPI transfer_create += MPI_Wtime() - start; @@ -432,7 +432,7 @@ main(int argc, char **argv) if (test_method == 2) { ret = PDCregion_transfer_start_all(temp_requests, 8); if (ret != SUCCEED) { - printf("Failed to start transfer for all regions\n"); + LOG_INFO("Failed to start transfer for all regions\n"); return 1; } } @@ -444,28 +444,28 @@ main(int argc, char **argv) else { ret = PDCreg_obtain_lock(obj_xx[i], region_xx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_xx\n"); + LOG_INFO("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy[i], region_yy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_yy\n"); + LOG_INFO("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz[i], region_zz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_zz\n"); + LOG_INFO("Failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx[i], region_pxx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pxx\n"); + LOG_INFO("Failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy[i], region_pyy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pyy\n"); + LOG_INFO("Failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz[i], region_pzz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pzz\n"); + LOG_INFO("Failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11[i], region_id11, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id11\n"); + LOG_INFO("Failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22[i], region_id22, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id22\n"); + LOG_INFO("Failed to obtain lock for region_id22\n"); } #ifdef ENABLE_MPI transfer_start += MPI_Wtime() - start; @@ -489,7 +489,7 @@ main(int argc, char **argv) if (test_method == 2) { ret = PDCregion_transfer_wait_all(temp_requests, 8); if (ret != SUCCEED) { - printf("Failed to start transfer for all regions\n"); + LOG_INFO("Failed to start transfer for all regions\n"); return 1; } } @@ -501,28 +501,28 @@ main(int argc, char **argv) else { ret = PDCreg_release_lock(obj_xx[i], region_xx, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_xx\n"); + LOG_INFO("Failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy[i], region_yy, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_yy\n"); + LOG_INFO("Failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz[i], region_zz, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_zz\n"); + LOG_INFO("Failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx[i], region_pxx, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pxx\n"); + LOG_INFO("Failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy[i], region_pyy, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pyy\n"); + LOG_INFO("Failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz[i], region_pzz, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pzz\n"); + LOG_INFO("Failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11[i], region_id11, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_id11\n"); + LOG_INFO("Failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22[i], region_id22, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_id22\n"); + LOG_INFO("Failed to release lock for region_id22\n"); } #ifdef ENABLE_MPI end = MPI_Wtime(); @@ -532,111 +532,111 @@ main(int argc, char **argv) if (test_method) { ret = PDCregion_transfer_close(transfer_request_x[i]); if (ret != SUCCEED) { - printf("region xx transfer close failed\n"); + LOG_INFO("region xx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_y[i]); if (ret != SUCCEED) { - printf("region yy transfer close failed\n"); + LOG_INFO("region yy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_z[i]); if (ret != SUCCEED) { - printf("region zz transfer close failed\n"); + LOG_INFO("region zz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_px[i]); if (ret != SUCCEED) { - printf("region pxx transfer close failed\n"); + LOG_INFO("region pxx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_py[i]); if (ret != SUCCEED) { - printf("region pyy transfer close failed\n"); + LOG_INFO("region pyy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_pz[i]); if (ret != SUCCEED) { - printf("region pzz transfer close failed\n"); + LOG_INFO("region pzz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id1[i]); if (ret != SUCCEED) { - printf("region id11 transfer close failed\n"); + LOG_INFO("region id11 transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id2[i]); if (ret != SUCCEED) { - printf("region id22 transfer close failed\n"); + LOG_INFO("region id22 transfer close failed\n"); return 1; } } else { ret = PDCbuf_obj_unmap(obj_xx[i], region_xx); if (ret != SUCCEED) - printf("region xx unmap failed\n"); + LOG_INFO("region xx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_yy[i], region_yy); if (ret != SUCCEED) - printf("region yy unmap failed\n"); + LOG_INFO("region yy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_zz[i], region_zz); if (ret != SUCCEED) - printf("region zz unmap failed\n"); + LOG_INFO("region zz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pxx[i], region_pxx); if (ret != SUCCEED) - printf("region pxx unmap failed\n"); + LOG_INFO("region pxx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pyy[i], region_pyy); if (ret != SUCCEED) - printf("region pyy unmap failed\n"); + LOG_INFO("region pyy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pzz[i], region_pzz); if (ret != SUCCEED) - printf("region pzz unmap failed\n"); + LOG_INFO("region pzz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id11[i], region_id11); if (ret != SUCCEED) - printf("region id11 unmap failed\n"); + LOG_INFO("region id11 unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id22[i], region_id22); if (ret != SUCCEED) - printf("region id22 unmap failed\n"); + LOG_INFO("region id22 unmap failed\n"); } #ifdef ENABLE_MPI transfer_close += MPI_Wtime() - start; #endif if (PDCregion_close(region_xx) < 0) { - printf("fail to close region region_xx\n"); + LOG_INFO("Fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - printf("fail to close region region_yy\n"); + LOG_INFO("Fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - printf("fail to close region region_zz\n"); + LOG_INFO("Fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - printf("fail to close region region_pxx\n"); + LOG_INFO("Fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - printf("fail to close region region_pyy\n"); + LOG_INFO("Fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - printf("fail to close region region_pzz\n"); + LOG_INFO("Fail to close region region_pzz\n"); return 1; } if (PDCregion_close(region_id11) < 0) { - printf("fail to close region region_id11\n"); + LOG_INFO("Fail to close region region_id11\n"); return 1; } if (PDCregion_close(region_id22) < 0) { - printf("fail to close region region_id22\n"); + LOG_INFO("Fail to close region region_id22\n"); return 1; } MPI_Barrier(MPI_COMM_WORLD); @@ -649,35 +649,35 @@ main(int argc, char **argv) PDC_timing_report("write"); for (i = 0; i < timestamps; ++i) { if (PDCobj_close(obj_xx[i]) < 0) { - printf("fail to close obj_xx\n"); + LOG_INFO("Fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy[i]) < 0) { - printf("fail to close object obj_yy\n"); + LOG_INFO("Fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz[i]) < 0) { - printf("fail to close object obj_zz\n"); + LOG_INFO("Fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx[i]) < 0) { - printf("fail to close object obj_pxx\n"); + LOG_INFO("Fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy[i]) < 0) { - printf("fail to close object obj_pyy\n"); + LOG_INFO("Fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz[i]) < 0) { - printf("fail to close object obj_pzz\n"); + LOG_INFO("Fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11[i]) < 0) { - printf("fail to close object obj_id11\n"); + LOG_INFO("Fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22[i]) < 0) { - printf("fail to close object obj_id22\n"); + LOG_INFO("Fail to close object obj_id22\n"); return 1; } } @@ -689,37 +689,37 @@ main(int argc, char **argv) MPI_Reduce(&transfer_create, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_create, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer create: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer create: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&transfer_start, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_start, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_start, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer start: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer start: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&transfer_wait, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_wait, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_wait, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer wait: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer wait: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&transfer_close, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_close, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&transfer_close, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("transfer close: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("transfer close: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&flush_all, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&flush_all, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&flush_all, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("flush all: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("flush all: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } MPI_Reduce(&total_time, &max_time, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); MPI_Reduce(&total_time, &avg_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&total_time, &min_time, 1, MPI_DOUBLE, MPI_MIN, 0, MPI_COMM_WORLD); if (!rank) { - printf("total: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); + LOG_INFO("total: %lf - %lf - %lf\n", min_time, avg_time / size, max_time); } #endif free(obj_xx); @@ -731,81 +731,81 @@ main(int argc, char **argv) free(obj_id11); free(obj_id22); if (PDCprop_close(obj_prop_xx) < 0) { - printf("Fail to close obj property obj_prop_xx\n"); + LOG_INFO("Fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - printf("Fail to close obj property obj_prop_yy\n"); + LOG_INFO("Fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - printf("Fail to close obj property obj_prop_zz\n"); + LOG_INFO("Fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - printf("Fail to close obj property obj_prop_pxx\n"); + LOG_INFO("Fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - printf("Fail to close obj property obj_prop_pyy\n"); + LOG_INFO("Fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - printf("Fail to close obj property obj_prop_pzz\n"); + LOG_INFO("Fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - printf("Fail to close obj property obj_prop_id11\n"); + LOG_INFO("Fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - printf("Fail to close obj property obj_prop_id22\n"); + LOG_INFO("Fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - printf("fail to close region region_x\n"); + LOG_INFO("Fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - printf("fail to close region region_y\n"); + LOG_INFO("Fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - printf("fail to close region region_z\n"); + LOG_INFO("Fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - printf("fail to close region region_px\n"); + LOG_INFO("Fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - printf("fail to close region region_py\n"); + LOG_INFO("Fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - printf("fail to close region region_pz\n"); + LOG_INFO("Fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - printf("fail to close region region_id1\n"); + LOG_INFO("Fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - printf("fail to close region region_id2\n"); + LOG_INFO("Fail to close region region_id2\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - printf("fail to close container c1\n"); + LOG_INFO("Fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_INFO("Fail to close PDC\n"); return 1; } free(offset); diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index f3a2088fa..4643eb92a 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_INFO("Usage: srun -n ./vpicio #particles\n"); } int @@ -87,7 +87,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } dims[0] = numparticles; @@ -109,13 +109,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_INFO("Fail to create container"); return 1; } // create an object property @@ -151,44 +151,44 @@ main(int argc, char **argv) obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_INFO("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); if (obj_yy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + LOG_INFO("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); if (obj_zz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + LOG_INFO("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); if (obj_pxx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + LOG_INFO("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); if (obj_pyy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + LOG_INFO("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); if (obj_pzz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + LOG_INFO("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); if (obj_id11 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + LOG_INFO("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); if (obj_id22 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } @@ -223,82 +223,82 @@ main(int argc, char **argv) #endif ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx, region_xx); if (ret < 0) { - printf("Array x PDCbuf_obj_map failed\n"); + LOG_INFO("Array x PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy, region_yy); if (ret < 0) { - printf("Array y PDCbuf_obj_map failed\n"); + LOG_INFO("Array y PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz, region_zz); if (ret < 0) { - printf("Array z PDCbuf_obj_map failed\n"); + LOG_INFO("Array z PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx, region_pxx); if (ret < 0) { - printf("Array px PDCbuf_obj_map failed\n"); + LOG_INFO("Array px PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy, region_pyy); if (ret < 0) { - printf("Array py PDCbuf_obj_map failed\n"); + LOG_INFO("Array py PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz, region_pzz); if (ret < 0) { - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_INFO("Array pz PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11, region_id11); if (ret < 0) { - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_INFO("Array id1 PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22, region_id22); if (ret < 0) { - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_INFO("Array id2 PDCbuf_obj_map failed\n"); return 1; } ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_xx\n"); + LOG_INFO("Failed to obtain lock for region_xx\n"); return 1; } ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_yy\n"); + LOG_INFO("Failed to obtain lock for region_yy\n"); return 1; } ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_zz\n"); + LOG_INFO("Failed to obtain lock for region_zz\n"); return 1; } ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_pxx\n"); + LOG_INFO("Failed to obtain lock for region_pxx\n"); return 1; } ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_pyy\n"); + LOG_INFO("Failed to obtain lock for region_pyy\n"); return 1; } ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_pzz\n"); + LOG_INFO("Failed to obtain lock for region_pzz\n"); return 1; } ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_id11\n"); + LOG_INFO("Failed to obtain lock for region_id11\n"); return 1; } ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_id22\n"); + LOG_INFO("Failed to obtain lock for region_id22\n"); return 1; } @@ -314,226 +314,226 @@ main(int argc, char **argv) } ret = PDCreg_release_lock(obj_xx, region_xx, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_xx\n"); + LOG_INFO("Failed to release lock for region_xx\n"); return 1; } ret = PDCreg_release_lock(obj_yy, region_yy, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_yy\n"); + LOG_INFO("Failed to release lock for region_yy\n"); return 1; } ret = PDCreg_release_lock(obj_zz, region_zz, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_zz\n"); + LOG_INFO("Failed to release lock for region_zz\n"); return 1; } ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_pxx\n"); + LOG_INFO("Failed to release lock for region_pxx\n"); return 1; } ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_pyy\n"); + LOG_INFO("Failed to release lock for region_pyy\n"); return 1; } ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_pzz\n"); + LOG_INFO("Failed to release lock for region_pzz\n"); return 1; } ret = PDCreg_release_lock(obj_id11, region_id11, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_id11\n"); + LOG_INFO("Failed to release lock for region_id11\n"); return 1; } ret = PDCreg_release_lock(obj_id22, region_id22, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_id22\n"); + LOG_INFO("Failed to release lock for region_id22\n"); return 1; } ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) { - printf("region xx unmap failed\n"); + LOG_INFO("region xx unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_yy, region_yy); if (ret != SUCCEED) { - printf("region yy unmap failed\n"); + LOG_INFO("region yy unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_zz, region_zz); if (ret != SUCCEED) { - printf("region zz unmap failed\n"); + LOG_INFO("region zz unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_pxx, region_pxx); if (ret != SUCCEED) { - printf("region pxx unmap failed\n"); + LOG_INFO("region pxx unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_pyy, region_pyy); if (ret != SUCCEED) { - printf("region pyy unmap failed\n"); + LOG_INFO("region pyy unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_pzz, region_pzz); if (ret != SUCCEED) { - printf("region pzz unmap failed\n"); + LOG_INFO("region pzz unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_id11, region_id11); if (ret != SUCCEED) { - printf("region id11 unmap failed\n"); + LOG_INFO("region id11 unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_id22, region_id22); if (ret != SUCCEED) { - printf("region id22 unmap failed\n"); + LOG_INFO("region id22 unmap failed\n"); return 1; } PDC_timing_report("write"); if (PDCobj_close(obj_xx) < 0) { - printf("fail to close obj_xx\n"); + LOG_INFO("Fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - printf("fail to close object obj_yy\n"); + LOG_INFO("Fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - printf("fail to close object obj_zz\n"); + LOG_INFO("Fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - printf("fail to close object obj_pxx\n"); + LOG_INFO("Fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - printf("fail to close object obj_pyy\n"); + LOG_INFO("Fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - printf("fail to close object obj_pzz\n"); + LOG_INFO("Fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - printf("fail to close object obj_id11\n"); + LOG_INFO("Fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - printf("fail to close object obj_id22\n"); + LOG_INFO("Fail to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - printf("Fail to close obj property obj_prop_xx\n"); + LOG_INFO("Fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - printf("Fail to close obj property obj_prop_yy\n"); + LOG_INFO("Fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - printf("Fail to close obj property obj_prop_zz\n"); + LOG_INFO("Fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - printf("Fail to close obj property obj_prop_pxx\n"); + LOG_INFO("Fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - printf("Fail to close obj property obj_prop_pyy\n"); + LOG_INFO("Fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - printf("Fail to close obj property obj_prop_pzz\n"); + LOG_INFO("Fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - printf("Fail to close obj property obj_prop_id11\n"); + LOG_INFO("Fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - printf("Fail to close obj property obj_prop_id22\n"); + LOG_INFO("Fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - printf("fail to close region region_x\n"); + LOG_INFO("Fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - printf("fail to close region region_y\n"); + LOG_INFO("Fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - printf("fail to close region region_z\n"); + LOG_INFO("Fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - printf("fail to close region region_px\n"); + LOG_INFO("Fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - printf("fail to close region region_py\n"); + LOG_INFO("Fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - printf("fail to close region region_pz\n"); + LOG_INFO("Fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - printf("fail to close region region_id1\n"); + LOG_INFO("Fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - printf("fail to close region region_id2\n"); + LOG_INFO("Fail to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - printf("fail to close region region_xx\n"); + LOG_INFO("Fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - printf("fail to close region region_yy\n"); + LOG_INFO("Fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - printf("fail to close region region_zz\n"); + LOG_INFO("Fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - printf("fail to close region region_pxx\n"); + LOG_INFO("Fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - printf("fail to close region region_pyy\n"); + LOG_INFO("Fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - printf("fail to close region region_pzz\n"); + LOG_INFO("Fail to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - printf("fail to close region region_id11\n"); + LOG_INFO("Fail to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - printf("fail to close region region_id22\n"); + LOG_INFO("Fail to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - printf("fail to close container c1\n"); + LOG_INFO("Fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_INFO("Fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_INFO("Fail to close PDC\n"); return 1; } free(offset); diff --git a/src/api/close_server.c b/src/api/close_server.c index 24b66f5bc..5ad2d8c4c 100644 --- a/src/api/close_server.c +++ b/src/api/close_server.c @@ -29,6 +29,7 @@ #include #include "pdc.h" +#include "pdc_logger.h" #include "pdc_client_connect.h" int @@ -48,11 +49,11 @@ main(int argc, char *argv[]) PDC_Client_close_all_server(); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); #ifdef ENABLE_MPI if (!rank) { - printf("total close time = %lf\n", MPI_Wtime() - start); + LOG_INFO("total close time = %lf\n", MPI_Wtime() - start); } MPI_Finalize(); #endif diff --git a/src/api/include/pdc.h b/src/api/include/pdc.h index 3503df7e3..1178cd6ad 100644 --- a/src/api/include/pdc.h +++ b/src/api/include/pdc.h @@ -29,6 +29,7 @@ #include "pdc_public.h" #include "pdc_prop.h" #include "pdc_cont.h" +#include "pdc_logger.h" #ifdef ENABLE_MPI #include "pdc_mpi.h" diff --git a/src/api/pdc_analysis/pdc_analysis_common.c b/src/api/pdc_analysis/pdc_analysis_common.c index e04a8d6a7..51fd1f5d6 100644 --- a/src/api/pdc_analysis/pdc_analysis_common.c +++ b/src/api/pdc_analysis/pdc_analysis_common.c @@ -36,6 +36,7 @@ #include "pdc_analysis_pkg.h" #include "pdc_region.h" #include "pdc_server_analysis.h" +#include "pdc_logger.h" size_t analysis_registry_size = 0; size_t transform_registry_size = 0; @@ -475,14 +476,14 @@ HG_TEST_RPC_CB(analysis_ftn, handle) if (ftnPtr != NULL) { if ((iterIn = in.iter_in) == 0) { nulliter_count = 1; - printf("input is a NULL iterator\n"); + LOG_INFO("input is a NULL iterator\n"); } else if (execution_locus == SERVER_MEMORY) { /* inputIter = &PDC_Block_iterator_cache[iterIn]; */ } if ((iterOut = in.iter_out) == 0) { nulliter_count += 1; - printf("output is a NULL iterator\n"); + LOG_INFO("output is a NULL iterator\n"); } /* For the unusual case where both the input and output iterators @@ -518,7 +519,7 @@ HG_TEST_RPC_CB(analysis_ftn, handle) */ if (ftnPtr && (nulliter_count == 2)) { result = ftnPtr(iterIn, iterOut); - printf("function call result was %d\n----------------\n", result); + LOG_INFO("function call result was %d\n----------------\n", result); /* FIXME: * We might consider adding the function result into @@ -551,7 +552,7 @@ HG_TEST_RPC_CB(obj_data_iterator, handle) memset(&in, 0, sizeof(in)); // Decode input HG_Get_input(handle, &in); - // printf("obj_data_iterator_cb entered!\n"); + // LOG_INFO("obj_data_iterator_cb entered!\n"); ret_value = PDC_Server_instantiate_data_iterator(&in, &out); HG_Respond(handle, NULL, NULL, &out); diff --git a/src/api/pdc_analysis/pdc_hist_pkg.c b/src/api/pdc_analysis/pdc_hist_pkg.c index 75343a144..7f99e8463 100644 --- a/src/api/pdc_analysis/pdc_hist_pkg.c +++ b/src/api/pdc_analysis/pdc_hist_pkg.c @@ -1,6 +1,7 @@ #include "pdc_hist_pkg.h" #include #include +#include "pdc_logger.h" #define MACRO_SAMPLE_MIN_MAX(TYPE, n, data, sample_pct, min, max) \ ({ \ @@ -272,7 +273,8 @@ PDC_gen_hist(pdc_var_type_t dtype, uint64_t n, void *data) #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_end, 0); gen_hist_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("== generate histogram of %lu elements with %d bins takes %.2fs\n", n, hist->nbin, gen_hist_time); + LOG_INFO("== generate histogram of %lu elements with %d bins takes %.2fs\n", n, hist->nbin, + gen_hist_time); #endif ret_value = hist; @@ -311,11 +313,11 @@ PDC_print_hist(pdc_histogram_t *hist) for (i = 0; i < hist->nbin; i++) { if (i != hist->nbin - 1) - printf("[%.2f, %.2f): %" PRIu64 "\n", hist->range[i * 2], hist->range[i * 2 + 1], hist->bin[i]); + LOG_INFO("[%.2f, %.2f): %" PRIu64 "\n", hist->range[i * 2], hist->range[i * 2 + 1], hist->bin[i]); else - printf("[%.2f, %.2f]: %" PRIu64 "\n", hist->range[i * 2], hist->range[i * 2 + 1], hist->bin[i]); + LOG_INFO("[%.2f, %.2f]: %" PRIu64 "\n", hist->range[i * 2], hist->range[i * 2 + 1], hist->bin[i]); } - printf("\n\n"); + LOG_INFO("\n\n"); done: fflush(stdout); diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index cb402724c..d9cf379e5 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -42,6 +42,7 @@ #include "pdc_analysis_pkg.h" #include "pdc_transforms_common.h" #include "pdc_client_connect.h" +#include "pdc_logger.h" #include "mercury.h" #include "mercury_macros.h" @@ -244,7 +245,7 @@ pdc_client_check_int_ret_cb(const struct hg_cb_info *callback_info) PGOTO_ERROR(ret_value, "==Error with HG_Get_output"); if (output.ret != 1) - printf("==%s() - Return value [%d] is NOT expected\n", __func__, output.ret); + LOG_ERROR("==() - Return value [%d] is NOT expected\n", output.ret); if (lookup_args != NULL) lookup_args->ret = output.ret; @@ -267,34 +268,21 @@ hg_progress_fn(void *foo) #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("[%s] enter %s \n", cur_time, __func__); + LOG_INFO("enter %s \n", cur_time); #endif while (hg_progress_flag_g != 1) { do { - /* PDC_get_time_str(cur_time); */ - /* printf("[%s] before HG_Trigger\n", cur_time); */ - ret = HG_Trigger(hg_context, 0, 1, &actual_count); - - /* PDC_get_time_str(cur_time); */ - /* printf("[%s] after HG_Trigger\n", cur_time); */ } while ((ret == HG_SUCCESS) && actual_count && hg_progress_flag_g != 1); - - /* PDC_get_time_str(cur_time); */ - /* printf("[%s] before HG_Progress\n", cur_time); */ - if (hg_progress_flag_g != 1) HG_Progress(hg_context, 100); - usleep(1000); - /* PDC_get_time_str(cur_time); */ - /* printf("[%s] after HG_Progress\n", cur_time); */ } #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("[%s] leaving %s\n", cur_time, __func__); + LOG_DEBUG("leaving %s\n", cur_time); #endif return (NULL); @@ -313,7 +301,7 @@ PDC_Client_transfer_pthread_create() #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s %s created pthread\n", cur_time, __func__); + LOG_DEBUG("%s created pthread\n", cur_time); #endif } @@ -334,7 +322,7 @@ PDC_Client_transfer_pthread_terminate() #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s %s terminated pthread\n", cur_time, __func__); + LOG_DEBUG("%s terminated pthread\n", cur_time); #endif } @@ -351,8 +339,7 @@ PDC_Client_transfer_pthread_cnt_add(int n) #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s %s change cnt from %d to %d\n", cur_time, __func__, hg_progress_task_cnt_g, - hg_progress_task_cnt_g + n); + LOG_DEBUG("%s change cnt from %d to %d\n", cur_time, hg_progress_task_cnt_g, hg_progress_task_cnt_g + n); #endif hg_progress_task_cnt_g += n; @@ -417,9 +404,9 @@ PDC_Client_read_server_addr_from_file() is_server_ready = 1; break; } - printf("==PDC_CLIENT[%d]: Config file from default location [%s] not available, " - "waiting %d seconds\n", - pdc_client_mpi_rank_g, config_fname, sleeptime); + LOG_WARNING("==PDC_CLIENT[%d]: Config file from default location [%s] not available, " + "waiting %d seconds\n", + pdc_client_mpi_rank_g, config_fname, sleeptime); fflush(stdout); sleep(sleeptime); sleeptime *= 2; @@ -443,7 +430,7 @@ PDC_Client_read_server_addr_from_file() #endif if (pdc_server_num_g == 0) { - printf("==PDC_CLIENT[%d]: server number error %d\n", pdc_client_mpi_rank_g, pdc_server_num_g); + LOG_ERROR("==PDC_CLIENT[%d]: server number error %d\n", pdc_client_mpi_rank_g, pdc_server_num_g); return -1; } @@ -495,12 +482,11 @@ client_send_flush_obj_all_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); *rpc_return = output.ret; if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: flush_obj_all_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: flush_obj_all_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); goto done; } done: - // printf("client close RPC is finished here, return value = %d\n", output.ret); fflush(stdout); hg_atomic_decr32(&atomic_work_todo_g); HG_Free_output(handle, &output); @@ -523,7 +509,7 @@ obj_reset_dims_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: obj_reset_dims_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: obj_reset_dims_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); region_transfer_args->ret = -1; goto done; } @@ -552,12 +538,11 @@ client_send_flush_obj_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); *rpc_return = output.ret; if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: flush_obj_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: flush_obj_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); goto done; } done: - // printf("client close RPC is finished here, return value = %d\n", output.ret); fflush(stdout); hg_atomic_decr32(&atomic_work_todo_g); HG_Free_output(handle, &output); @@ -581,12 +566,12 @@ client_send_close_all_server_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); *rpc_return = output.ret; if (ret_value != HG_SUCCESS || output.ret != 88) { - printf("PDC_CLIENT[%d]: close_all_server_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: close_all_server_rpc_cb error with HG_Get_output\n", + pdc_client_mpi_rank_g); goto done; } done: - // printf("client close RPC is finished here, return value = %d\n", output.ret); fflush(stdout); hg_atomic_decr32(&atomic_work_todo_g); HG_Free_output(handle, &output); @@ -609,7 +594,7 @@ client_send_transfer_request_metadata_query_rpc_cb(const struct hg_cb_info *call ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf( + LOG_ERROR( "PDC_CLIENT[%d]: client_send_transfer_request_metadata_query_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); region_transfer_args->ret = -1; @@ -642,7 +627,7 @@ client_send_transfer_request_metadata_query2_rpc_cb(const struct hg_cb_info *cal ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf( + LOG_ERROR( "PDC_CLIENT[%d]: client_send_transfer_request_metadata_query2_rpc_cb error with HG_Get_output\n", pdc_client_mpi_rank_g); region_transfer_args->ret = -1; @@ -670,7 +655,7 @@ client_send_transfer_request_all_rpc_cb(const struct hg_cb_info *callback_info) #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s PDC_CLIENT[%d] enter %s\n", cur_time, pdc_client_mpi_rank_g, __func__); + LOG_DEBUG("%s PDC_CLIENT[%d] enter\n", cur_time, pdc_client_mpi_rank_g); #endif region_transfer_args = (struct _pdc_transfer_request_all_args *)callback_info->arg; @@ -678,19 +663,13 @@ client_send_transfer_request_all_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: %s error with HG_Get_output\n", pdc_client_mpi_rank_g, __func__); + LOG_ERROR("PDC_CLIENT[%d]: error with HG_Get_output\n", pdc_client_mpi_rank_g); region_transfer_args->ret = -1; goto done; } region_transfer_args->ret = output.ret; region_transfer_args->metadata_id = output.metadata_id; - - /* // Tang */ - /* region_transfer_args->ret = 1; */ - /* printf("PDC_CLIENT[%d]: %s ret %d meta id %llu\n", */ - /* pdc_client_mpi_rank_g, __func__, output.ret, output.metadata_id); */ - done: fflush(stdout); hg_atomic_decr32(&atomic_work_todo_g); @@ -714,8 +693,8 @@ client_send_transfer_request_wait_all_rpc_cb(const struct hg_cb_info *callback_i ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: client_send_transfer_request_wait_all_rpc_cb error with HG_Get_output\n", - pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: client_send_transfer_request_wait_all_rpc_cb error with HG_Get_output\n", + pdc_client_mpi_rank_g); region_transfer_args->ret = -1; goto done; } @@ -743,7 +722,7 @@ client_send_transfer_request_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: %s error with HG_Get_output\n", __func__, pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: error with HG_Get_output\n", pdc_client_mpi_rank_g); region_transfer_args->ret = -1; goto done; } @@ -773,8 +752,8 @@ client_send_transfer_request_status_rpc_cb(const struct hg_cb_info *callback_inf ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: client_send_transfer_request_status_rpc_cb error with HG_Get_output\n", - pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: client_send_transfer_request_status_rpc_cb error with HG_Get_output\n", + pdc_client_mpi_rank_g); region_transfer_args->ret = -1; goto done; } @@ -806,9 +785,8 @@ client_send_transfer_request_wait_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf( - "PDC_CLIENT[%d]: client_send_transfer_request_wait_rpc_cb error with HG_Get_output @ line %d\n", - pdc_client_mpi_rank_g, __LINE__); + LOG_ERROR("PDC_CLIENT[%d]: client_send_transfer_request_wait_rpc_cb error with HG_Get_output\n", + pdc_client_mpi_rank_g); region_transfer_args->ret = -1; goto done; } @@ -840,8 +818,8 @@ client_send_buf_unmap_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("PDC_CLIENT[%d]: client_send_buf_unmap_rpc_cb error with HG_Get_output\n", - pdc_client_mpi_rank_g); + LOG_ERROR("PDC_CLIENT[%d]: client_send_buf_unmap_rpc_cb error with HG_Get_output\n", + pdc_client_mpi_rank_g); fflush(stdout); region_unmap_args->ret = -1; PGOTO_DONE(ret_value); @@ -981,8 +959,8 @@ PDC_Client_lookup_server(int server_id, int is_init) target_addr_string = pdc_server_info_g[lookup_args.server_id].addr_string; if (is_client_debug_g == 1) { - printf("==PDC_CLIENT[%d]: - Testing connection to server %d [%s]\n", pdc_client_mpi_rank_g, - lookup_args.server_id, target_addr_string); + LOG_DEBUG("==PDC_CLIENT[%d]: - Testing connection to server %d [%s]\n", pdc_client_mpi_rank_g, + lookup_args.server_id, target_addr_string); fflush(stdout); } @@ -996,8 +974,8 @@ PDC_Client_lookup_server(int server_id, int is_init) PDC_Client_check_response(&send_context_g); if (is_client_debug_g == 1) { - printf("==PDC_CLIENT[%5d]: - connected to server %5d\n", pdc_client_mpi_rank_g, - lookup_args.server_id); + LOG_DEBUG("==PDC_CLIENT[%5d]: - connected to server %5d\n", pdc_client_mpi_rank_g, + lookup_args.server_id); fflush(stdout); } @@ -1071,8 +1049,7 @@ PDC_Client_send_rpc(int server_id) FUNC_ENTER(NULL); if (server_id < 0 || server_id >= pdc_server_num_g) - PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: %s invalid server ID %d", pdc_client_mpi_rank_g, __func__, - server_id); + PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: invalid server ID %d", pdc_client_mpi_rank_g, server_id); // Debug statistics for counting number of messages sent to each server. debug_server_id_count[server_id]++; @@ -1254,7 +1231,7 @@ hg_test_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) local_bulk_handle = hg_cb_info->info.bulk.local_handle; if (hg_cb_info->ret == HG_CANCELED) - printf("HG_Bulk_transfer() was successfully canceled\n"); + LOG_INFO("HG_Bulk_transfer() was successfully canceled\n"); else if (hg_cb_info->ret != HG_SUCCESS) PGOTO_ERROR(HG_PROTOCOL_ERROR, "Error in callback"); @@ -1405,7 +1382,7 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po gethostname(hostname, sizeof(hostname)); sprintf(na_info_string, "%s://%s:%d", hg_transport, hostname, port); if (pdc_client_mpi_rank_g == 0) { - printf("==PDC_CLIENT: using %.7s\n", na_info_string); + LOG_INFO("==PDC_CLIENT: using %.7s\n", na_info_string); fflush(stdout); } @@ -1425,15 +1402,15 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po sleep(1); goto drc_access_again; } - printf("client drc_access() failed (%d, %s)", rc, drc_strerror(-rc)); + LOG_ERROR("client drc_access() failed (%d, %s)", rc, drc_strerror(-rc)); fflush(stdout); PGOTO_ERROR(FAIL, "client drc_access() failed"); } cookie = drc_get_first_cookie(credential_info); if (pdc_client_mpi_rank_g == 0) { - printf("# Credential is %u\n", credential); - printf("# Cookie is %u\n", cookie); + LOG_INFO("# Credential is %u\n", credential); + LOG_INFO("# Cookie is %u\n", cookie); fflush(stdout); } sprintf(pdc_auth_key, "%u", cookie); @@ -1556,7 +1533,7 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po } else if (strcmp(client_lookup_env, "ALL") == 0) { if (pdc_client_mpi_rank_g == 0) - printf("==PDC_CLIENT[%d]: Client lookup all servers at start time!\n", pdc_client_mpi_rank_g); + LOG_INFO("==PDC_CLIENT[%d]: Client lookup all servers at start time!\n", pdc_client_mpi_rank_g); for (local_server_id = 0; local_server_id < pdc_server_num_g; local_server_id++) { if (pdc_client_mpi_size_g > 1000) PDC_msleep(pdc_client_mpi_rank_g % 300); @@ -1567,12 +1544,13 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po } else { if (pdc_client_mpi_rank_g == 0) - printf("==PDC_CLIENT[%d]: Client lookup server at start time disabled!\n", pdc_client_mpi_rank_g); + LOG_INFO("==PDC_CLIENT[%d]: Client lookup server at start time disabled!\n", + pdc_client_mpi_rank_g); } if (is_client_debug_g == 1 && pdc_client_mpi_rank_g == 0) { - printf("==PDC_CLIENT[%d]: Successfully established connection to %d PDC metadata server%s\n\n", - pdc_client_mpi_rank_g, pdc_server_num_g, pdc_client_mpi_size_g == 1 ? "" : "s"); + LOG_INFO("==PDC_CLIENT[%d]: Successfully established connection to %d PDC metadata server%s\n\n", + pdc_client_mpi_rank_g, pdc_server_num_g, pdc_client_mpi_size_g == 1 ? "" : "s"); fflush(stdout); } @@ -1617,16 +1595,16 @@ PDC_Client_init() MPI_Comm_dup(MPI_COMM_WORLD, &PDC_CLIENT_COMM_WORLD_g); MPI_Comm_rank(PDC_CLIENT_COMM_WORLD_g, &pdc_client_mpi_rank_g); MPI_Comm_size(PDC_CLIENT_COMM_WORLD_g, &pdc_client_mpi_size_g); - // printf("my client rank = %d, client communicator size = %d\n", pdc_client_mpi_rank_g, - // pdc_client_mpi_size_g); + LOG_DEBUG("my client rank = %d, client communicator size = %d\n", pdc_client_mpi_rank_g, + pdc_client_mpi_size_g); #endif if (pdc_client_mpi_rank_g == 0) - printf("==PDC_CLIENT: PDC_DEBUG set to %d!\n", is_client_debug_g); + LOG_INFO("==PDC_CLIENT: PDC_DEBUG set to %d!\n", is_client_debug_g); // get server address and fill in $pdc_server_info_g if (PDC_Client_read_server_addr_from_file() != SUCCEED) { - printf("==PDC_CLIENT[%d]: Error getting PDC Metadata servers info, exiting ...", pdc_server_num_g); + LOG_ERROR("==PDC_CLIENT[%d]: Error getting PDC Metadata servers info, exiting ...", pdc_server_num_g); exit(0); } @@ -1653,8 +1631,8 @@ PDC_Client_init() PDC_set_execution_locus(CLIENT_MEMORY); if (pdc_client_mpi_rank_g == 0) { - printf("==PDC_CLIENT[0]: Found %d PDC Metadata servers, running with %d PDC clients\n", - pdc_server_num_g, pdc_client_mpi_size_g); + LOG_INFO("==PDC_CLIENT[0]: Found %d PDC Metadata servers, running with %d PDC clients\n", + pdc_server_num_g, pdc_client_mpi_size_g); } // Init debug info @@ -1663,7 +1641,7 @@ PDC_Client_init() memset(debug_server_id_count, 0, sizeof(int) * pdc_server_num_g); } else - printf("==PDC_CLIENT: Server number not properly initialized!\n"); + LOG_ERROR("==PDC_CLIENT: Server number not properly initialized!\n"); // Cori KNL has 68 cores per node, Haswell 32 port = pdc_client_mpi_rank_g % PDC_MAX_CORE_PER_NODE + 8000; @@ -1682,8 +1660,8 @@ PDC_Client_init() } if (pdc_client_mpi_rank_g == 0) { - printf("==PDC_CLIENT[%d]: using [%s] as tmp dir, %d clients per server\n", pdc_client_mpi_rank_g, - pdc_client_tmp_dir_g, pdc_nclient_per_server_g); + LOG_INFO("==PDC_CLIENT[%d]: using [%s] as tmp dir, %d clients per server\n", pdc_client_mpi_rank_g, + pdc_client_tmp_dir_g, pdc_nclient_per_server_g); } if (mercury_has_init_g) { @@ -1758,7 +1736,7 @@ PDC_Client_finalize() #ifndef ENABLE_MPI for (i = 0; i < pdc_server_num_g; i++) { - printf(" Server%3d, %d\n", i, debug_server_id_count[i]); + LOG_INFO(" Server%3d, %d\n", i, debug_server_id_count[i]); } #endif // free debug info @@ -1767,7 +1745,7 @@ PDC_Client_finalize() #ifdef ENABLE_TIMING if (pdc_client_mpi_rank_g == 0) - printf("==PDC_CLIENT[%d]: T_memcpy: %.2f\n", pdc_client_mpi_rank_g, memcpy_time_g); + LOG_INFO("==PDC_CLIENT[%d]: T_memcpy: %.2f\n", pdc_client_mpi_rank_g, memcpy_time_g); #endif hg_ret = HG_Context_destroy(send_context_g); @@ -2468,7 +2446,7 @@ PDC_Client_delete_metadata(char *delete_name, pdcid_t obj_delete_prop) PDC_Client_check_response(&send_context_g); if (lookup_args.ret != 1) - printf("PDC_CLIENT: delete NOT successful ... ret_value = %d\n", lookup_args.ret); + LOG_ERROR("PDC_CLIENT: delete NOT successful ... ret_value = %d\n", lookup_args.ret); done: fflush(stdout); @@ -2592,8 +2570,8 @@ PDC_Client_query_metadata_name_timestep(const char *obj_name, int time_step, pdc hg_atomic_set32(&atomic_work_todo_g, 1); PDC_Client_check_response(&send_context_g); *out = lookup_args.data; - // printf("rank = %d, PDC_Client_query_metadata_name_timestep = %u\n", pdc_client_mpi_rank_g, - // out[0]->data_server_id); + LOG_DEBUG("rank = %d, PDC_Client_query_metadata_name_timestep = %u\n", pdc_client_mpi_rank_g, + out[0]->data_server_id); done: fflush(stdout); HG_Destroy(metadata_query_handle); @@ -2602,38 +2580,6 @@ PDC_Client_query_metadata_name_timestep(const char *obj_name, int time_step, pdc } // Only let one process per node to do the actual query, then broadcast to all others -#if 0 -perr_t -PDC_Client_query_metadata_name_timestep_agg_same_node(const char *obj_name, int time_step, - pdc_metadata_t **out, uint32_t *metadata_id) -{ - perr_t ret_value = SUCCEED; - - FUNC_ENTER(NULL); - -#ifdef ENABLE_MPI - if (pdc_client_same_node_rank_g == 0) { - ret_value = PDC_Client_query_metadata_name_timestep(obj_name, time_step, out, metadata_id); - if (ret_value != SUCCEED || NULL == *out) { - *out = (pdc_metadata_t *)calloc(1, sizeof(pdc_metadata_t)); - PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: - ERROR with query [%s]", pdc_client_mpi_rank_g, obj_name); - } - - } - else - *out = (pdc_metadata_t *)calloc(1, sizeof(pdc_metadata_t)); - - MPI_Bcast(*out, sizeof(pdc_metadata_t), MPI_CHAR, 0, PDC_SAME_NODE_COMM_g); - -#else - ret_value = PDC_Client_query_metadata_name_timestep(obj_name, time_step, out, metadata_id); -#endif - -done: - fflush(stdout); - FUNC_LEAVE(ret_value); -} -#endif perr_t PDC_Client_query_metadata_name_timestep_agg(const char *obj_name, int time_step, pdc_metadata_t **out, uint32_t *metadata_server_id) @@ -2813,8 +2759,6 @@ PDC_Client_obj_reset_dims(const char *obj_name, int time_step, int ndim, uint64_ else { *reset = 0; } - // printf("rank = %d, PDC_Client_query_metadata_name_timestep = %u\n", pdc_client_mpi_rank_g, - // out[0]->data_server_id); done: fflush(stdout); HG_Destroy(obj_reset_dims_handle); @@ -2857,12 +2801,13 @@ PDC_Client_send_name_recv_id(const char *obj_name, uint64_t cont_id, pdcid_t obj in.data_type = create_prop->obj_prop_pub->type; in.data.data_server_id = PDC_CLIENT_DATA_SERVER(); in.data.region_partition = create_prop->obj_prop_pub->region_partition; - // printf("prepare for sending region partition %d with obj name %s\n", (int)in.data.region_partition, - // obj_name); + LOG_DEBUG("prepare for sending region partition %d with obj name %s\n", (int)in.data.region_partition, + obj_name); *data_server_id = in.data.data_server_id; - // printf("pdc_client_mpi_rank_g = %d, pdc_nclient_per_server_g = %d, pdc_server_num_g = %d, - // data_server_id = %u\n", (int)pdc_client_mpi_rank_g, (int)pdc_nclient_per_server_g, - // (int)pdc_server_num_g, (unsigned)in.data.data_server_id); + LOG_DEBUG("pdc_client_mpi_rank_g = %d, pdc_nclient_per_server_g = %d, pdc_server_num_g = %d, " + "data_server_id = %u\n", + (int)pdc_client_mpi_rank_g, (int)pdc_nclient_per_server_g, (int)pdc_server_num_g, + (unsigned)in.data.data_server_id); if ((in.data.ndim = create_prop->obj_prop_pub->ndim) > 0) { if (in.data.ndim >= 1) @@ -2903,8 +2848,8 @@ PDC_Client_send_name_recv_id(const char *obj_name, uint64_t cont_id, pdcid_t obj debug_server_id_count[server_id]++; if (is_client_debug_g == 1) { - printf("==PDC_CLIENT[%d]: obj [%s] to be created on server%u\n", pdc_client_mpi_rank_g, obj_name, - server_id); + LOG_INFO("==PDC_CLIENT[%d]: obj [%s] to be created on server%u\n", pdc_client_mpi_rank_g, obj_name, + server_id); fflush(stdout); } if (PDC_Client_try_lookup_server(server_id, 0) != SUCCEED) @@ -2961,8 +2906,9 @@ PDC_Client_close_all_server() if (pdc_client_mpi_size_g < pdc_server_num_g) { if (pdc_client_mpi_rank_g == 0) - printf("==CLIENT[%d]: run close_server with equal ranks of servers (%d) for faster checkpoint!\n", - pdc_client_mpi_rank_g, pdc_server_num_g); + LOG_INFO( + "==CLIENT[%d]: run close_server with equal ranks of servers (%d) for faster checkpoint!\n", + pdc_client_mpi_rank_g, pdc_server_num_g); } if (pdc_client_mpi_size_g >= pdc_server_num_g) { @@ -3231,7 +3177,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s PDC_CLIENT[%d] enter %s\n", cur_time, pdc_client_mpi_rank_g, __func__); + LOG_DEBUG("%s PDC_CLIENT[%d] enter\n", cur_time, pdc_client_mpi_rank_g); #endif #ifdef PDC_TIMING @@ -3240,7 +3186,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d #endif if (!(access_type == PDC_WRITE || access_type == PDC_READ)) { ret_value = FAIL; - printf("Invalid PDC type in function %s @ %d\n", __func__, __LINE__); + LOG_ERROR("Invalid PDC type"); goto done; } in.n_objs = n_objs; @@ -3256,8 +3202,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d hg_class = HG_Context_get_class(send_context_g); if (PDC_Client_try_lookup_server(data_server_id, 0) != SUCCEED) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line %d", - pdc_client_mpi_rank_g, __LINE__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server", pdc_client_mpi_rank_g); hg_ret = HG_Create(send_context_g, pdc_server_info_g[data_server_id].addr, transfer_request_all_register_id_g, &client_send_transfer_request_all_handle); @@ -3266,7 +3211,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d hg_ret = HG_Bulk_create(hg_class, 1, (void **)&bulk_buf, &bulk_size, HG_BULK_READWRITE, &(in.local_bulk_handle)); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "%s: Could not create local bulk data handle @ line %d\n", __func__, __LINE__); + PGOTO_ERROR(FAIL, "Could not create local bulk data handle\n"); hg_atomic_set32(&atomic_work_todo_g, 1); @@ -3275,8 +3220,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s PDC_CLIENT[%d] %s: forwarded to %d\n", cur_time, pdc_client_mpi_rank_g, __func__, - data_server_id); + LOG_DEBUG("%s PDC_CLIENT[%d] forwarded to %d\n", cur_time, pdc_client_mpi_rank_g, data_server_id); #endif #ifdef ENABLE_MPI @@ -3297,8 +3241,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d #endif if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request_all(): Could not start HG_Forward() @ line %d\n", - __LINE__); + PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request_all(): Could not start HG_Forward()\n"); /* PDC_Client_check_response(&send_context_g); */ @@ -3306,7 +3249,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s PDC_CLIENT[%d] %s: received response\n", cur_time, pdc_client_mpi_rank_g, __func__); + LOG_DEBUG("%s PDC_CLIENT[%d] received response\n", cur_time, pdc_client_mpi_rank_g); #endif #ifdef ENABLE_MPI @@ -3325,20 +3268,17 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d pdc_timestamp_register(pdc_client_transfer_request_start_all_write_timestamps, function_start, end); } #endif - /* - printf("%s checkpoint, first value is %d @ line %d\n", __func__,((int *)buf)[0], __LINE__); - */ for (i = 0; i < n_objs; ++i) { metadata_id[i] = transfer_args.metadata_id + i; } if (transfer_args.ret != 1) - PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed... @ line %d\n", __LINE__); + PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed..."); HG_Destroy(client_send_transfer_request_all_handle); #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s PDC_CLIENT[%d] leave %s\n", cur_time, pdc_client_mpi_rank_g, __func__); + LOG_DEBUG("%s PDC_CLIENT[%d] leaving\n", cur_time, pdc_client_mpi_rank_g); #endif done: @@ -3366,15 +3306,13 @@ PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, in.total_buf_size = total_buf_size; // Compute metadata server id - // fprintf(stderr, "%s [%d]: metdata_id = %u, total_buf_size = - // %lu\n", __func__, pdc_client_mpi_rank_g, metadata_server_id, total_buf_size); debug_server_id_count[metadata_server_id]++; hg_class = HG_Context_get_class(send_context_g); if (PDC_Client_try_lookup_server(metadata_server_id, 0) != SUCCEED) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line %d", - pdc_client_mpi_rank_g, __LINE__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line", + pdc_client_mpi_rank_g); hg_ret = HG_Create(send_context_g, pdc_server_info_g[metadata_server_id].addr, transfer_request_metadata_query2_register_id_g, &client_send_transfer_request_metadata_query2_handle); @@ -3384,21 +3322,19 @@ PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, hg_ret = HG_Bulk_create(hg_class, 1, (void **)&buf, (hg_size_t *)&(in.total_buf_size), HG_BULK_READWRITE, &(in.local_bulk_handle)); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "%s: Could not create local bulk data handle @ line %d\n", __func__, __LINE__); + PGOTO_ERROR(FAIL, "Could not create local bulk data handle\n"); hg_ret = HG_Forward(client_send_transfer_request_metadata_query2_handle, client_send_transfer_request_metadata_query2_rpc_cb, &transfer_args, &in); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR( - FAIL, - "PDC_Client_send_transfer_request_metadata_query2(): Could not start HG_Forward() @ line %d\n", - __LINE__); + PGOTO_ERROR(FAIL, + "PDC_Client_send_transfer_request_metadata_query2(): Could not start HG_Forward()\n"); hg_atomic_set32(&atomic_work_todo_g, 1); PDC_Client_check_response(&send_context_g); if (transfer_args.ret != 1) - PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer_request_metadata_query2 failed... @ line %d\n", __LINE__); + PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer_request_metadata_query2 failed..."); HG_Destroy(client_send_transfer_request_metadata_query2_handle); @@ -3441,8 +3377,7 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i hg_class = HG_Context_get_class(send_context_g); if (PDC_Client_try_lookup_server(metadata_server_id, 0) != SUCCEED) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line %d", - pdc_client_mpi_rank_g, __LINE__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server", pdc_client_mpi_rank_g); hg_ret = HG_Create(send_context_g, pdc_server_info_g[metadata_server_id].addr, transfer_request_metadata_query_register_id_g, &client_send_transfer_request_metadata_query_handle); @@ -3452,20 +3387,18 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i hg_ret = HG_Bulk_create(hg_class, 1, (void **)&buf, (hg_size_t *)&(in.total_buf_size), HG_BULK_READWRITE, &(in.local_bulk_handle)); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "%s: Could not create local bulk data handle @ line %d\n", __func__, __LINE__); + PGOTO_ERROR(FAIL, "Could not create local bulk data handle\n"); hg_ret = HG_Forward(client_send_transfer_request_metadata_query_handle, client_send_transfer_request_metadata_query_rpc_cb, &transfer_args, &in); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR( - FAIL, - "PDC_Client_send_transfer_request_metadata_query(): Could not start HG_Forward() @ line %d\n", - __LINE__); + PGOTO_ERROR(FAIL, + "PDC_Client_send_transfer_request_metadata_query(): Could not start HG_Forward()\n"); hg_atomic_set32(&atomic_work_todo_g, 1); PDC_Client_check_response(&send_context_g); if (transfer_args.ret != 1) - PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer_request_metadata_query failed... @ line %d\n", __LINE__); + PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer_request_metadata_query failed..."); *output_buf_size = transfer_args.total_buf_size; *query_id = transfer_args.query_id; @@ -3477,7 +3410,6 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i pdc_timings.PDCtransfer_request_metadata_query_rpc += end - start; pdc_timestamp_register(pdc_client_transfer_request_metadata_query_timestamps, function_start, end); #endif - // fprintf(stderr, "%s: checkpoint %d\n", __func__, __LINE__); done: fflush(stdout); @@ -3517,8 +3449,7 @@ PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, u hg_class = HG_Context_get_class(send_context_g); if (PDC_Client_try_lookup_server(data_server_id, 0) != SUCCEED) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line %d", - pdc_client_mpi_rank_g, __LINE__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server", pdc_client_mpi_rank_g); hg_ret = HG_Create(send_context_g, pdc_server_info_g[data_server_id].addr, transfer_request_wait_all_register_id_g, &client_send_transfer_request_wait_all_handle); @@ -3528,7 +3459,7 @@ PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, u hg_ret = HG_Bulk_create(hg_class, 1, (void **)&transfer_request_id, (hg_size_t *)&(in.total_buf_size), HG_BULK_READWRITE, &(in.local_bulk_handle)); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "%s: Could not create local bulk data handle @ line %d\n", __func__, __LINE__); + PGOTO_ERROR(FAIL, "Could not create local bulk data handle\n"); hg_ret = HG_Forward(client_send_transfer_request_wait_all_handle, client_send_transfer_request_wait_all_rpc_cb, &transfer_args, &in); @@ -3538,18 +3469,12 @@ PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, u start = MPI_Wtime(); #endif if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, - "PDC_Client_send_transfer_request_wait_all(): Could not start HG_Forward() @ line %d\n", - __LINE__); + PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request_wait_all(): Could not start HG_Forward()\n"); hg_atomic_set32(&atomic_work_todo_g, 1); PDC_Client_check_response(&send_context_g); - /* - - printf("%s checkpoint, first value is %d @ line %d\n", ((int *)buf)[0], __func__, __LINE__); - */ if (transfer_args.ret != 1) - PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request wait all failed... @ line %d\n", __LINE__); + PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request wait all failed..."); HG_Destroy(client_send_transfer_request_wait_all_handle); @@ -3588,12 +3513,11 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, #endif if (!(access_type == PDC_WRITE || access_type == PDC_READ)) { ret_value = FAIL; - printf("Invalid PDC type in function %s @ %d\n", __func__, __LINE__); + LOG_ERROR("Invalid PDC type\n"); goto done; } - // printf("rank = %d, %s data_server_id = %u\n", pdc_client_mpi_rank_g, __func__, - // data_server_id); + LOG_DEBUG("rank = %d, data_server_id = %u\n", pdc_client_mpi_rank_g, data_server_id); in.access_type = access_type; in.remote_unit = unit; in.obj_id = obj_id; @@ -3625,8 +3549,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, pack_region_metadata(remote_ndim, remote_offset, remote_size, &(in.remote_region)); if (PDC_Client_try_lookup_server(data_server_id, 0) != SUCCEED) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line %d", - pdc_client_mpi_rank_g, __LINE__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server", pdc_client_mpi_rank_g); hg_ret = HG_Create(send_context_g, pdc_server_info_g[data_server_id].addr, transfer_request_register_id_g, &client_send_transfer_request_handle); @@ -3636,7 +3559,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, &(in.local_bulk_handle)); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "%s: Could not create local bulk data handle @ line %d\n", __func__, __LINE__); + PGOTO_ERROR(FAIL, "Could not create local bulk data handle\n"); hg_atomic_set32(&atomic_work_todo_g, 1); @@ -3656,8 +3579,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, PDC_Client_transfer_pthread_create(); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request(): Could not start HG_Forward() @ line %d\n", - __LINE__); + PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request(): Could not start HG_Forward()\n"); /* hg_atomic_set32(&atomic_work_todo_g, 1); */ /* PDC_Client_check_response(&send_context_g); */ @@ -3682,7 +3604,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, *metadata_id = transfer_args.metadata_id; if (transfer_args.ret != 1) - PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed... @ line %d\n", __LINE__); + PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed..."); HG_Destroy(client_send_transfer_request_handle); done: @@ -3704,26 +3626,24 @@ PDC_Client_transfer_request_status(pdcid_t transfer_request_id, uint32_t data_se in.transfer_request_id = transfer_request_id; if (PDC_Client_try_lookup_server(data_server_id, 0) != SUCCEED) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line %d", - pdc_client_mpi_rank_g, __LINE__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server", pdc_client_mpi_rank_g); hg_ret = HG_Create(send_context_g, pdc_server_info_g[data_server_id].addr, transfer_request_status_register_id_g, &client_send_transfer_request_status_handle); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "%s: Could not create local bulk data handle @ line %d\n", __func__, __LINE__); + PGOTO_ERROR(FAIL, "Could not create local bulk data handle\n"); hg_ret = HG_Forward(client_send_transfer_request_status_handle, client_send_transfer_request_status_rpc_cb, &transfer_args, &in); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request(): Could not start HG_Forward() @ line %d\n", - __LINE__); + PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request(): Could not start HG_Forward() @ line %d\n"); hg_atomic_set32(&atomic_work_todo_g, 1); PDC_Client_check_response(&send_context_g); if (transfer_args.ret != 1) - PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed... @ line %d\n", __LINE__); + PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed..."); HG_Destroy(client_send_transfer_request_status_handle); *completed = transfer_args.status; @@ -3763,14 +3683,13 @@ PDC_Client_transfer_request_wait(pdcid_t transfer_request_id, uint32_t data_serv in.access_type = access_type; if (PDC_Client_try_lookup_server(data_server_id, 0) != SUCCEED) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server @ line %d", - pdc_client_mpi_rank_g, __LINE__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: ERROR with PDC_Client_try_lookup_server", pdc_client_mpi_rank_g); hg_ret = HG_Create(send_context_g, pdc_server_info_g[data_server_id].addr, transfer_request_wait_register_id_g, &client_send_transfer_request_wait_handle); if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "%s: Could not create local bulk data handle @ line %d\n", __func__, __LINE__); + PGOTO_ERROR(FAIL, "Could not create local bulk data handle\n"); hg_ret = HG_Forward(client_send_transfer_request_wait_handle, client_send_transfer_request_wait_rpc_cb, &transfer_args, &in); @@ -3786,8 +3705,7 @@ PDC_Client_transfer_request_wait(pdcid_t transfer_request_id, uint32_t data_serv #endif if (hg_ret != HG_SUCCESS) - PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request(): Could not start HG_Forward() @ line %d\n", - __LINE__); + PGOTO_ERROR(FAIL, "PDC_Client_send_transfer_request(): Could not start HG_Forward()\n"); hg_atomic_set32(&atomic_work_todo_g, 1); PDC_Client_check_response(&send_context_g); @@ -3804,7 +3722,7 @@ PDC_Client_transfer_request_wait(pdcid_t transfer_request_id, uint32_t data_serv #endif if (transfer_args.ret != 1) - PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed... @ line %d\n", __LINE__); + PGOTO_ERROR(FAIL, "PDC_CLIENT: transfer request failed..."); HG_Destroy(client_send_transfer_request_wait_handle); @@ -3877,9 +3795,9 @@ PDC_Client_buf_map(pdcid_t local_region_id, pdcid_t remote_obj_id, size_t ndim, data_size = (size_t *)malloc(sizeof(size_t)); *data_ptrs = local_data + unit * local_offset[0]; *data_size = unit * local_dims[0]; - // printf("offset size = %d, local dim = %d, unit = %d, data_ptrs[0] = %d, data_ptrs[1] = %d\n", - // (int)local_offset[0], (int) local_dims[0], (int) unit, ((int*)data_ptrs)[0], ((int*)data_ptrs)[1] - // ); + LOG_DEBUG("offset size = %d, local dim = %d, unit = %d, data_ptrs[0] = %d, data_ptrs[1] = %d\n", + (int)local_offset[0], (int)local_dims[0], (int)unit, ((int *)data_ptrs)[0], + ((int *)data_ptrs)[1]); } else if (ndim == 2 && local_offset[1] == 0) { local_count = 1; @@ -3899,9 +3817,6 @@ PDC_Client_buf_map(pdcid_t local_region_id, pdcid_t remote_obj_id, size_t ndim, data_ptrs[i] = data_ptrs[i - 1] + unit * local_dims[1]; data_size[i] = data_size[0]; } - /* data_size[0] *= unit; */ - // printf("offset size = %d, local dim = %d %d, unit = %d, data_size = %d %d\n", (int)local_offset[0], - // (int) local_dims[0], (int) local_dims[1], (int) unit, (int)data_size[0], (int)data_size[1] ); } else if (ndim == 3 && local_offset[2] == 0) { local_count = 1; @@ -3933,10 +3848,6 @@ PDC_Client_buf_map(pdcid_t local_region_id, pdcid_t remote_obj_id, size_t ndim, data_ptrs[i * local_dims[1] + j + 1] = data_ptrs[i * local_dims[1] + j] + unit * local_dims[2]; data_size[i * local_dims[1] + j + 1] = data_size[0]; } - /* data_size[0] *= unit; */ - /* printf("offset size = %d, local dim = %d %d %d, unit = %d, data_size = %d %d %d\n", - * (int)local_offset[0], (int)local_dims[0], (int)local_dims[1], (int) local_dims[2], (int) unit, - * (int)data_size[0], (int)data_size[1] , (int)data_size[2]); */ } else PGOTO_ERROR(FAIL, "mapping for array of dimension greater than 4 is not supproted"); @@ -4822,7 +4733,7 @@ PDC_Client_get_data_from_server_shm_cb(const struct hg_cb_info *callback_info) /* map the shared memory segment to the address space of the process */ shm_base = mmap(0, data_size, PROT_READ, MAP_SHARED, shm_fd, 0); if (shm_base == MAP_FAILED) { - // printf("==PDC_CLIENT: Map failed: %s\n", strerror(errno)); + LOG_ERROR("==PDC_CLIENT: Map failed\n"); ret_value = FAIL; goto close; } @@ -4843,7 +4754,6 @@ PDC_Client_get_data_from_server_shm_cb(const struct hg_cb_info *callback_info) /* remove the mapped shared memory segment from the address space of the process */ if (munmap(shm_base, data_size) == -1) { } - // PGOTO_ERROR(FAIL, "==PDC_CLIENT: Unmap failed: %s", strerror(errno)); close: /* close the shared memory segment as if it was a file */ @@ -4917,8 +4827,8 @@ PDC_Client_data_server_read_check(int server_id, uint32_t client_id, pdc_metadat if (lookup_args.ret != 1 && lookup_args.ret != 111) { ret_value = SUCCEED; if (is_client_debug_g) - printf("==PDC_CLIENT[%d]: %s- IO request has not been fulfilled by server\n", - pdc_client_mpi_rank_g, __func__); + LOG_DEBUG("==PDC_CLIENT[%d]: IO request has not been fulfilled by server\n", + pdc_client_mpi_rank_g); HG_Destroy(data_server_read_check_handle); if (lookup_args.ret == -1) ret_value = FAIL; @@ -5406,7 +5316,6 @@ PDC_Client_wait(struct pdc_request *request, unsigned long max_wait_ms, unsigned gettimeofday(&start_time, 0); // TODO: Calculate region size and estimate the wait time // Write is 4-5x faster - while (completed == 0 && cnt < PDC_MAX_TRIAL_NUM) { ret_value = PDC_Client_test(request, &completed); if (ret_value != SUCCEED) @@ -5417,7 +5326,7 @@ PDC_Client_wait(struct pdc_request *request, unsigned long max_wait_ms, unsigned ((end_time.tv_sec - start_time.tv_sec) * 1000000LL + end_time.tv_usec - start_time.tv_usec) / 1000; if (elapsed_ms > max_wait_ms) { - printf("==PDC_CLIENT[%d]: exceeded max IO request waiting time...\n", pdc_client_mpi_rank_g); + LOG_WARNING("==PDC_CLIENT[%d]: exceeded max IO request waiting time...\n", pdc_client_mpi_rank_g); break; } PDC_msleep(check_interval_ms); @@ -5610,14 +5519,14 @@ PDC_Client_write_wait_notify(pdc_metadata_t *meta, struct pdc_region_info *regio PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: Failed to send write request to server", pdc_client_mpi_rank_g); DL_PREPEND(pdc_io_request_list_g, request); - printf("==PDC_CLIENT[%d]: Finished sending write request to server, waiting for notification\n", - pdc_client_mpi_rank_g); + LOG_INFO("==PDC_CLIENT[%d]: Finished sending write request to server, waiting for notification\n", + pdc_client_mpi_rank_g); fflush(stdout); hg_atomic_set32(&atomic_work_todo_g, 1); PDC_Client_check_response(&send_context_g); - printf("==PDC_CLIENT[%d]: received write finish notification\n", pdc_client_mpi_rank_g); + LOG_INFO("==PDC_CLIENT[%d]: received write finish notification\n", pdc_client_mpi_rank_g); fflush(stdout); done: @@ -6154,15 +6063,15 @@ PDC_Client_complete_read_request(int nbuf, struct pdc_request *req) /* open the shared memory segment as if it was a file */ req->shm_fd_arr[i] = shm_open(req->shm_addr_arr[i], O_RDONLY, 0666); if (req->shm_fd_arr[i] == -1) { - printf("==PDC_CLIENT[%d]: %s - Shared memory open failed [%s]!\n", pdc_client_mpi_rank_g, - __func__, req->shm_addr_arr[i]); + LOG_ERROR("==PDC_CLIENT[%d]: Shared memory open failed [%s]!\n", pdc_client_mpi_rank_g, + req->shm_addr_arr[i]); continue; } /* map the shared memory segment to the address space of the process */ req->shm_base_arr[i] = mmap(0, (req->shm_size_arr)[i], PROT_READ, MAP_SHARED, req->shm_fd_arr[i], 0); if (req->shm_base_arr[i] == MAP_FAILED) { - // printf("==PDC_CLIENT: Map failed: %s\n", strerror(errno)); + LOG_ERROR("==PDC_CLIENT: Map failed\n"); continue; } @@ -6186,13 +6095,13 @@ PDC_Client_complete_read_request(int nbuf, struct pdc_request *req) /* close the shared memory segment as if it was a file */ if (close(req->shm_fd_arr[i]) == -1) { - printf("==PDC_CLIENT: Close failed!\n"); + LOG_ERROR("==PDC_CLIENT: Close failed!\n"); continue; } /* remove the shared memory segment from the file system */ if (shm_unlink(req->shm_addr_arr[i]) == -1) { - printf("==PDC_CLIENT: Error removing %s\n", req->shm_addr_arr[i]); + LOG_ERROR("==PDC_CLIENT: Error removing %s\n", req->shm_addr_arr[i]); continue; } } @@ -6525,13 +6434,13 @@ PDC_Client_cp_data_to_local_server(int nobj, region_storage_meta_t **all_storage // Copy data to the shm segment for (i = 0; i < nobj; i++) { if (NULL == all_storage_meta[i]) { - printf("==PDC_CLIENT[%d]: NULL storage meta for %dth object!\n", pdc_client_mpi_rank_g, i); + LOG_ERROR("==PDC_CLIENT[%d]: NULL storage meta for %dth object!\n", pdc_client_mpi_rank_g, i); fflush(stdout); continue; } ndim = all_storage_meta[i]->region_transfer.ndim; if (ndim != 1) { - printf("==PDC_CLIENT[%d]: only support for 1D data now (%u)!\n", pdc_client_mpi_rank_g, ndim); + LOG_ERROR("==PDC_CLIENT[%d]: only support for 1D data now (%u)!\n", pdc_client_mpi_rank_g, ndim); fflush(stdout); continue; } @@ -6636,13 +6545,13 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_ prev_fname = NULL; for (i = 0; i < nobj; i++) { if (NULL == all_storage_meta[i]) { - printf("==PDC_CLIENT[%d]: NULL storage meta for %dth object!\n", pdc_client_mpi_rank_g, i); + LOG_ERROR("==PDC_CLIENT[%d]: NULL storage meta for %dth object!\n", pdc_client_mpi_rank_g, i); continue; } ndim = all_storage_meta[i]->region_transfer.ndim; if (ndim != 1) { - printf("==PDC_CLIENT[%d]: only support for 1D data now (%u)!\n", pdc_client_mpi_rank_g, ndim); + LOG_ERROR("==PDC_CLIENT[%d]: only support for 1D data now (%u)!\n", pdc_client_mpi_rank_g, ndim); continue; } @@ -6668,8 +6577,8 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_ fp_read = fopen(fname, "r"); nfopen_g++; if (fp_read == NULL) { - printf("==PDC_CLIENT[%d]: %s - fopen failed [%s] objid %" PRIu64 "\n", pdc_client_mpi_rank_g, - __func__, fname, all_storage_meta[i]->obj_id); + LOG_ERROR("==PDC_CLIENT[%d]: fopen failed [%s] objid %" PRIu64 "\n", pdc_client_mpi_rank_g, + fname, all_storage_meta[i]->obj_id); prev_fname = fname; continue; } @@ -6690,17 +6599,14 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_ file_offset, (*buf_arr)[i], &read_bytes); size_arr[i] = read_bytes; if (read_bytes != buf_size) { - printf("==PDC_CLIENT[%d]: actual read size %zu is not expected %" PRIu64 "\n", - pdc_client_mpi_rank_g, read_bytes, buf_size); + LOG_ERROR("==PDC_CLIENT[%d]: actual read size %zu is not expected %" PRIu64 "\n", + pdc_client_mpi_rank_g, read_bytes, buf_size); } if (strstr(fname, "PDCcacheBB") != NULL) { nread_bb_g++; read_bb_size_g += read_bytes / 1048576.0; } - - /* printf("==PDC_CLIENT[%d]: read data to buf[%d] %lu bytes done\n\n", */ - /* pdc_client_mpi_rank_g, i, read_bytes); */ } fflush(stdout); @@ -6884,13 +6790,13 @@ PDC_get_io_stats_mpi(double read_time, double query_time, int nfopen) reduce_overhead = MPI_Wtime() - reduce_overhead; if (pdc_client_mpi_rank_g == 0) { - printf("==PDC_CLIENT: IO STATS (MIN, AVG, MAX)\n" - " #fopen (%d, %d, %d)\n" - " Tquery (%6.4f, %6.4f, %6.4f)\n" - " #readBB %d, size %.2f MB\n" - " Tread (%6.4f, %6.4f, %6.4f)\nMPI overhead %.4f\n", - nfopen_min, nfopen_avg, nfopen_max, query_time_min, query_time_avg, query_time_max, nread_bb_g, - read_bb_size_g, read_time_min, read_time_avg, read_time_max, reduce_overhead); + LOG_INFO("==PDC_CLIENT: IO STATS (MIN, AVG, MAX)\n" + " #fopen (%d, %d, %d)\n" + " Tquery (%6.4f, %6.4f, %6.4f)\n" + " #readBB %d, size %.2f MB\n" + " Tread (%6.4f, %6.4f, %6.4f)\nMPI overhead %.4f\n", + nfopen_min, nfopen_avg, nfopen_max, query_time_min, query_time_avg, query_time_max, + nread_bb_g, read_bb_size_g, read_time_min, read_time_avg, read_time_max, reduce_overhead); } FUNC_LEAVE(ret_value); @@ -6925,7 +6831,6 @@ PDC_Client_query_name_read_entire_obj_client(int nobj, char **obj_names, void ** gettimeofday(&pdc_timer2, 0); query_time = PDC_get_elapsed_time_double(&pdc_timer1, &pdc_timer2); query_time_g += query_time; - /* printf("==PDC_CLIENT[%d]: query time %.4f\n", pdc_client_mpi_rank_g, query_time); */ #endif // Now we have all the storage metadata of all requests, start reading them all @@ -6973,8 +6878,8 @@ PDC_Client_query_name_read_entire_obj_client_agg(int my_nobj, char **my_obj_name local_names_1d = (char *)calloc(my_nobj, max_name_len); for (i = 0; i < my_nobj; i++) { if (strlen(my_obj_names[i]) > max_name_len) - printf("==PDC_CLIENT[%2d]: object name longer than %lu [%s]!\n", pdc_client_mpi_rank_g, - max_name_len, my_obj_names[i]); + LOG_ERROR("==PDC_CLIENT[%2d]: object name longer than %lu [%s]!\n", pdc_client_mpi_rank_g, + max_name_len, my_obj_names[i]); strncpy(local_names_1d + i * max_name_len, my_obj_names[i], max_name_len - 1); } @@ -7200,8 +7105,8 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re } if (is_client_debug_g == 1) { - printf("==PDC_CLIENT[%d]: read storage offset %" PRIu64 ", buf_offset %" PRIu64 "\n", - pdc_client_mpi_rank_g, storage_offset, buf_offset); + LOG_DEBUG("==PDC_CLIENT[%d]: read storage offset %" PRIu64 ", buf_offset %" PRIu64 "\n", + pdc_client_mpi_rank_g, storage_offset, buf_offset); } read_bytes = fread(buf + buf_offset, 1, total_bytes, fp); @@ -7210,8 +7115,8 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re gettimeofday(&pdc_timer_end1, 0); double region_read_time1 = PDC_get_elapsed_time_double(&pdc_timer_start1, &pdc_timer_end1); if (is_client_debug_g) { - printf("==PDC_CLIENT[%d]: fseek + fread %" PRIu64 " bytes, %.2fs\n", pdc_client_mpi_rank_g, - read_bytes, region_read_time1); + LOG_DEBUG("==PDC_CLIENT[%d]: fseek + fread %" PRIu64 " bytes, %.2fs\n", pdc_client_mpi_rank_g, + read_bytes, region_read_time1); fflush(stdout); } #endif @@ -7226,8 +7131,8 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re *total_read_bytes += read_bytes; if (is_client_debug_g == 1) { - printf("==PDC_CLIENT[%d]: Read entire storage region, size=%" PRIu64 "", pdc_client_mpi_rank_g, - read_bytes); + LOG_DEBUG("==PDC_CLIENT[%d]: Read entire storage region, size=%" PRIu64 "", pdc_client_mpi_rank_g, + read_bytes); } } // end if else { @@ -7253,8 +7158,8 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re else if (ndim == 3) { if (is_client_debug_g == 1) { - printf("read count: %" PRIu64 ", %" PRIu64 ", %" PRIu64 "\n", overlap_count[0], - overlap_count[1], overlap_count[2]); + LOG_INFO("read count: %" PRIu64 ", %" PRIu64 ", %" PRIu64 "\n", overlap_count[0], + overlap_count[1], overlap_count[2]); } uint64_t buf_serialize_offset; @@ -7269,7 +7174,7 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re buf_serialize_offset = buf_offset + i * req_count[0] + j * req_count[0] * req_count[1]; if (is_client_debug_g == 1) { - printf("Read to buf offset: %" PRIu64 "\n", buf_serialize_offset); + LOG_INFO("Read to buf offset: %" PRIu64 "\n", buf_serialize_offset); } read_bytes = fread(buf + buf_serialize_offset, 1, overlap_count[0], fp); @@ -7280,8 +7185,8 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re *total_read_bytes += read_bytes; if (is_client_debug_g == 1) { - printf("z: %" PRIu64 ", j: %" PRIu64 ", Read data size=%" PRIu64 ": [%.*s]\n", j, i, - overlap_count[0], (int)overlap_count[0], (char *)buf + buf_serialize_offset); + LOG_INFO("z: %" PRIu64 ", j: %" PRIu64 ", Read data size=%" PRIu64 ": [%.*s]\n", j, i, + overlap_count[0], (int)overlap_count[0], (char *)buf + buf_serialize_offset); } } // for each row } @@ -7340,7 +7245,7 @@ PDC_add_kvtag(pdcid_t obj_id, pdc_kvtag_t *kvtag, int is_cont) } // TODO: delete this line after debugging. - // printf("==CLIENT[%d]: PDC_add_kvtag::in.obj_id = %llu \n ", pdc_client_mpi_rank_g, in.obj_id); + // LOG_INFO("==CLIENT[%d]: PDC_add_kvtag::in.obj_id = %llu \n ", pdc_client_mpi_rank_g, in.obj_id); server_id = PDC_get_server_by_obj_id(meta_id, pdc_server_num_g); @@ -7373,7 +7278,7 @@ PDC_add_kvtag(pdcid_t obj_id, pdc_kvtag_t *kvtag, int is_cont) PDC_Client_check_response(&send_context_g); if (lookup_args.ret != 1) - printf("PDC_CLIENT: add kvtag NOT successful ... ret_value = %d\n", lookup_args.ret); + LOG_INFO("PDC_CLIENT: add kvtag NOT successful ... ret_value = %d\n", lookup_args.ret); done: fflush(stdout); @@ -7396,8 +7301,7 @@ metadata_get_kvtag_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { client_lookup_args->ret = -1; - PGOTO_ERROR(ret_value, "==PDC_CLIENT[%d]: %s error with HG_Get_output", pdc_client_mpi_rank_g, - __func__); + PGOTO_ERROR(ret_value, "==PDC_CLIENT[%d]: error with HG_Get_output", pdc_client_mpi_rank_g); } client_lookup_args->ret = output.ret; if (output.kvtag.name) @@ -7473,7 +7377,7 @@ PDC_get_kvtag(pdcid_t obj_id, char *tag_name, pdc_kvtag_t **kvtag, int is_cont) PDC_Client_check_response(&send_context_g); if (lookup_args.ret != 1) - printf("PDC_CLIENT: get kvtag NOT successful ... ret_value = %d\n", lookup_args.ret); + LOG_INFO("PDC_CLIENT: get kvtag NOT successful ... ret_value = %d\n", lookup_args.ret); done: fflush(stdout); @@ -7622,11 +7526,11 @@ PDC_Client_query_kvtag_server(uint32_t server_id, const pdc_kvtag_t *kvtag, int FUNC_ENTER(NULL); if (kvtag == NULL) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: %s - kvtag is NULL!", pdc_client_mpi_rank_g, __func__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: kvtag is NULL!", pdc_client_mpi_rank_g); if (n_res == NULL) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: %s - n_res is NULL!", pdc_client_mpi_rank_g, __func__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: n_res is NULL!", pdc_client_mpi_rank_g); if (out == NULL) - PGOTO_ERROR(FAIL, "==CLIENT[%d]: %s - out is NULL!", pdc_client_mpi_rank_g, __func__); + PGOTO_ERROR(FAIL, "==CLIENT[%d]: out is NULL!", pdc_client_mpi_rank_g); if (kvtag->name == NULL) in.name = " "; @@ -7777,7 +7681,7 @@ PDCtag_delete(pdcid_t obj_id, char *tag_name, int is_cont) PDC_Client_check_response(&send_context_g); if (lookup_args.ret != 1) - printf("PDC_CLIENT: del kvtag NOT successful ... ret_value = %d\n", lookup_args.ret); + LOG_INFO("PDC_CLIENT: del kvtag NOT successful ... ret_value = %d\n", lookup_args.ret); done: fflush(stdout); @@ -7836,12 +7740,7 @@ PDCcont_get(pdcid_t cont_id ATTRIBUTE(unused), char **cont_name ATTRIBUTE(unused FUNC_ENTER(NULL); - // TODO - /* ret_value = PDC_Client_query_container_name(char *cont_name, pdc_metadata_t **out); */ - /* if (ret_value != SUCCEED) { */ - /* PGOTO_ERROR(0, "==PDC_CLIENT[%d]: %s - error with PDC_Client_create_cont_id", */ - /* pdc_client_mpi_rank_g, __func__); */ - /* } */ + LOG_ERROR("PDCcont_get not implemented\n"); FUNC_LEAVE(ret_value); } @@ -8225,8 +8124,7 @@ PDC_recv_nhits(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); - printf("==PDC_CLIENT[%d]: %s - received %" PRIu64 " hits from server\n", pdc_client_mpi_rank_g, __func__, - in->nhits); + LOG_INFO("==PDC_CLIENT[%d]: received %" PRIu64 " hits from server\n", pdc_client_mpi_rank_g, in->nhits); DL_FOREACH(pdcquery_result_list_head_g, result_elt) { @@ -8362,8 +8260,8 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) query_id = bulk_args->query_id; origin = bulk_args->origin; - printf("==PDC_CLIENT[%d]: %s - received %" PRIu64 " coords from server %d\n", pdc_client_mpi_rank_g, - __func__, nhits, origin); + LOG_INFO("==PDC_CLIENT[%d]: received %" PRIu64 " coords from server %d\n", pdc_client_mpi_rank_g, + nhits, origin); if (nhits > 0) { ret_value = HG_Bulk_access(local_bulk_handle, 0, bulk_args->nbytes, HG_BULK_READWRITE, 1, @@ -8579,8 +8477,8 @@ report_avg_server_profiling_rst() ? (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; - printf("==PDC_CLIENT[%d]: server %d, avg profiling time: %.4f ms, memory usage: %.4f MB\n", - pdc_client_mpi_rank_g, i, avg_srv_time / 1000.0, srv_mem_usage); + LOG_INFO("==PDC_CLIENT[%d]: server %d, avg profiling time: %.4f ms, memory usage: %.4f MB\n", + pdc_client_mpi_rank_g, i, avg_srv_time / 1000.0, srv_mem_usage); } } @@ -8598,13 +8496,13 @@ report_avg_server_profiling_rst() // FUNC_ENTER(NULL); -// /* printf("Entered client_rpc_cb()"); */ +// /* LOG_INFO("Entered client_rpc_cb()"); */ // client_lookup_args = (struct client_lookup_args*) callback_info->arg; // handle = callback_info->info.forward.handle; // /* Get output from server*/ // ret_value = HG_Get_output(handle, &output); -// /* printf("Return value=%llu\n", output.ret); */ +// /* LOG_INFO("Return value=%llu\n", output.ret); */ // client_lookup_args->obj_id = output.ret; // hg_atomic_decr32(&atomic_work_todo_g); @@ -8626,13 +8524,13 @@ report_avg_server_profiling_rst() // FUNC_ENTER(NULL); -// /* printf("Entered client_rpc_cb()"); */ +// /* LOG_INFO("Entered client_rpc_cb()"); */ // client_lookup_args = (struct client_lookup_args*) callback_info->arg; // handle = callback_info->info.forward.handle; // /* Get output from server*/ // ret_value = HG_Get_output(handle, &output); -// /* printf("Return value=%llu\n", output.ret); */ +// /* LOG_INFO("Return value=%llu\n", output.ret); */ // client_lookup_args->obj_id = output.ret; // hg_atomic_decr32(&atomic_work_todo_g); @@ -8654,13 +8552,13 @@ client_dart_get_server_info_cb(const struct hg_cb_info *callback_info) FUNC_ENTER(NULL); - /* printf("Entered client_rpc_cb()"); */ + /* LOG_INFO("Entered client_rpc_cb()"); */ client_lookup_args = (struct client_genetic_lookup_args *)callback_info->arg; handle = callback_info->info.forward.handle; /* Get output from server*/ ret_value = HG_Get_output(handle, &output); - /* printf("Return value=%llu\n", output.ret); */ + /* LOG_INFO("Return value=%llu\n", output.ret); */ client_lookup_args->int64_value1 = output.indexed_word_count; client_lookup_args->int64_value2 = output.request_count; @@ -8690,9 +8588,8 @@ dart_retrieve_server_info_cb(dart_server *server_ptr) hg_return_t hg_ret = HG_Forward(dart_get_server_info_handle, client_dart_get_server_info_cb, &lookup_args, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, - "dart_get_server_info_g(): Could not start HG_Forward() on serverId = %ld with host = %s\n", - server_ptr->id, pdc_server_info_g[server_ptr->id].addr_string); + LOG_INFO("dart_get_server_info_g(): Could not start HG_Forward() on serverId = %ld with host = %s\n", + server_ptr->id, pdc_server_info_g[server_ptr->id].addr_string); HG_Destroy(dart_get_server_info_handle); return; } @@ -8741,30 +8638,30 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) // Get output from server ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("==PDC_CLIENT[%d]: dart_perform_one_server_on_receive_cb - error HG_Get_output\n", - pdc_client_mpi_rank_g); + LOG_INFO("==PDC_CLIENT[%d]: dart_perform_one_server_on_receive_cb - error HG_Get_output\n", + pdc_client_mpi_rank_g); client_lookup_args->n_meta = 0; goto done; } client_lookup_args->server_time_elapsed = output.server_time_elapsed; client_lookup_args->server_memory_consumption = output.server_memory_consumption; - // printf("lookup_args.op_type = %d and output.op_type = %d\n", client_lookup_args->op_type, + // LOG_INFO("lookup_args.op_type = %d and output.op_type = %d\n", client_lookup_args->op_type, // output.op_type); if (ret_value == HG_SUCCESS && output.has_bulk == 0) { - // printf("=== NO Bulk data should be taken care of. \n"); + // LOG_INFO("=== NO Bulk data should be taken care of. \n"); client_lookup_args->n_meta = 0; goto done; } // println("[Client_Side_Bulk] before copy n_meta. rank = %d", pdc_client_mpi_rank_g); - // printf("==PDC_CLIENT: Received response from server with bulk handle, n_buf=%d\n", output.ret); + // LOG_INFO("==PDC_CLIENT: Received response from server with bulk handle, n_buf=%d\n", output.ret); n_meta = output.n_items; client_lookup_args->n_meta = n_meta; - // printf("*(client_lookup_args->n_meta) = %ld\n", *(client_lookup_args->n_meta)); + // LOG_INFO("*(client_lookup_args->n_meta) = %ld\n", *(client_lookup_args->n_meta)); // println("[Client_Side_Bulk] before determining size. rank = %d", pdc_client_mpi_rank_g); if (n_meta == 0) { @@ -8780,16 +8677,16 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) client_lookup_args->handle = handle; client_lookup_args->nbytes = HG_Bulk_get_size(origin_bulk_handle); - /* printf("nbytes=%u\n", bulk_args->nbytes); */ + /* LOG_INFO("nbytes=%u\n", bulk_args->nbytes); */ if (client_lookup_args->is_id == 1) { recv_meta = (void *)calloc(n_meta, sizeof(uint64_t)); } else { // throw an error - printf("==PDC_CLIENT[%d]: ERROR - DART queries can only retrieve object IDs. Please check " - "client_lookup_args->is_id\n", - pdc_client_mpi_rank_g); + LOG_INFO("==PDC_CLIENT[%d]: ERROR - DART queries can only retrieve object IDs. Please check " + "client_lookup_args->is_id\n", + pdc_client_mpi_rank_g); goto done; } @@ -8807,7 +8704,7 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) // println("[Client_Side_Bulk] after bulk transfer. rank = %d", pdc_client_mpi_rank_g); if (ret_value != HG_SUCCESS) { - fprintf(stderr, "Could not read bulk data\n"); + LOG_INFO("Could not read bulk data\n"); client_lookup_args->n_meta = 0; goto done; } @@ -8843,7 +8740,7 @@ _dart_send_request_to_one_server(int server_id, dart_perform_one_server_in_t *da hg_return_t hg_ret; HG_Create(send_context_g, pdc_server_info_g[server_id].addr, dart_perform_one_server_g, handle); if (handle == NULL) { - printf("==CLIENT[%d]: Error with _dart_send_request_to_one_server\n", pdc_client_mpi_rank_g); + LOG_INFO("==CLIENT[%d]: Error with _dart_send_request_to_one_server\n", pdc_client_mpi_rank_g); return FAIL; } @@ -8853,8 +8750,8 @@ _dart_send_request_to_one_server(int server_id, dart_perform_one_server_in_t *da hg_ret = HG_Forward(*handle, dart_perform_one_server_on_receive_cb, lookup_args_ptr, dart_in); hg_atomic_incr32(&atomic_work_todo_g); if (hg_ret != HG_SUCCESS) { - printf("==CLIENT[%d]: _dart_send_request_to_one_server(): Could not start HG_Forward()\n", - pdc_client_mpi_rank_g); + LOG_INFO("==CLIENT[%d]: _dart_send_request_to_one_server(): Could not start HG_Forward()\n", + pdc_client_mpi_rank_g); hg_atomic_decr32(&atomic_work_todo_g); return FAIL; } @@ -8988,7 +8885,7 @@ PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char *query_s dart_determine_query_token_by_key_query(k_query, &tok, &dart_op); if (tok == NULL) { - printf("==PDC_CLIENT[%d]: Error with tok\n", pdc_client_mpi_rank_g); + LOG_INFO("==PDC_CLIENT[%d]: Error with tok\n", pdc_client_mpi_rank_g); ret_value = FAIL; return ret_value; } @@ -9052,7 +8949,7 @@ PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char *query_s free(tok); timer_pause(&timer); - // printf("perform search [ %s ] on %d servers from rank %d, total_count %" PRIu64 + // LOG_INFO("perform search [ %s ] on %d servers from rank %d, total_count %" PRIu64 // ", n_res %d, duration: %.4f ms\n", // query_string, num_servers, pdc_client_mpi_rank_g, total_count, *n_res, // timer_delta_ms(&timer) / 1000.0); @@ -9220,12 +9117,11 @@ PDC_Client_query_kvtag_col(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ *query_sent = 0; break; } - /* printf("==PDC_CLIENT[%d]: querying server %u\n", pdc_client_mpi_rank_g, i); */ + /* LOG_INFO("==PDC_CLIENT[%d]: querying server %u\n", pdc_client_mpi_rank_g, i); */ temp_ids = NULL; ret_value = PDC_Client_query_kvtag_server((uint32_t)i, kvtag, &nmeta, &temp_ids); if (ret_value != SUCCEED) { - PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: error in %s querying server %u", pdc_client_mpi_rank_g, - __func__, i); + PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: querying server %u", pdc_client_mpi_rank_g, i); } if (i == my_server_start) { *pdc_ids = temp_ids; @@ -9236,7 +9132,7 @@ PDC_Client_query_kvtag_col(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ free(temp_ids); } *n_res = *n_res + nmeta; - /* printf("==PDC_CLIENT[%d]: server %u returned %d res \n", pdc_client_mpi_rank_g, i, *n_res); */ + /* LOG_INFO("==PDC_CLIENT[%d]: server %u returned %d res \n", pdc_client_mpi_rank_g, i, *n_res); */ *query_sent = 1; } @@ -9392,10 +9288,10 @@ PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ } else { // print the pdc ids returned by this client, along with the client id - // printf("==PDC_CLIENT == COLLECTIVE [%d]: ", pdc_client_mpi_rank_g); + // LOG_INFO("==PDC_CLIENT == COLLECTIVE [%d]: ", pdc_client_mpi_rank_g); // for (i = 0; i < *n_res; i++) - // printf("%llu ", (*pdc_ids)[i]); - // printf("\n"); + // LOG_INFO("%llu ", (*pdc_ids)[i]); + // LOG_INFO("\n"); } if (pdc_client_mpi_size_g == 1) { @@ -9437,10 +9333,10 @@ PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ // print the pdc ids returned after gathering all the results if (pdc_client_mpi_rank_g == 0) { - // printf("==PDC_CLIENT == GATHERED [%d]: ", pdc_client_mpi_rank_g); + // LOG_INFO("==PDC_CLIENT == GATHERED [%d]: ", pdc_client_mpi_rank_g); // for (i = 0; i < *n_res; i++) - // printf("%llu ", (*pdc_ids)[i]); - // printf("\n"); + // LOG_INFO("%llu ", (*pdc_ids)[i]); + // LOG_INFO("\n"); } done: diff --git a/src/api/pdc_meta/pdc_metadata_client.c b/src/api/pdc_meta/pdc_metadata_client.c index 9115792cb..7c276adfc 100644 --- a/src/api/pdc_meta/pdc_metadata_client.c +++ b/src/api/pdc_meta/pdc_metadata_client.c @@ -71,7 +71,7 @@ send_query_condition_get_separate_result(char conditions[][CONDITION_LENGTH], in MPI_Comm world_comm, separate_query_result_t **result) { if (conditionCount <= 0) { - printf("No conditions to send\n"); + LOG_INFO("No conditions to send\n"); return; } *result = (separate_query_result_t *)malloc(conditionCount * sizeof(separate_query_result_t)); @@ -93,7 +93,7 @@ send_query_condition_get_separate_result(char conditions[][CONDITION_LENGTH], in perr_t rst = PDC_Client_search_obj_ref_through_dart(DART_HASH, condition, REF_PRIMARY_ID, &n_res, &out); if (rst != SUCCEED) { - printf("Error with PDC_Client_search_obj_ref_through_dart\n"); + LOG_INFO("Error with PDC_Client_search_obj_ref_through_dart\n"); return; } (*result)[i] = (separate_query_result_t){n_res, out, condition}; diff --git a/src/api/pdc_obj/pdc_mpi.c b/src/api/pdc_obj/pdc_mpi.c index 4db4d0479..df2fbfe21 100644 --- a/src/api/pdc_obj/pdc_mpi.c +++ b/src/api/pdc_obj/pdc_mpi.c @@ -53,9 +53,7 @@ PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, in MPI_Bcast(&(p->obj_info_pub->metadata_server_id), 1, MPI_UINT32_T, rank_id, comm); MPI_Bcast(&(((pdc_metadata_t *)p->metadata)->data_server_id), 1, MPI_UINT32_T, rank_id, comm); MPI_Bcast(&(((pdc_metadata_t *)p->metadata)->region_partition), 1, MPI_UINT8_T, rank_id, comm); - // printf("PDCobj_create_mpi: obj partition for %s is %u @ rank %d\n", obj_name, (unsigned) - // (((pdc_metadata_t *)p->metadata)->region_partition),rank); - // PDC_Client_attach_metadata_to_local_obj((char *)obj_name, p->meta_id, p->cont->meta_id, p); + FUNC_LEAVE(ret_value); } diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 7457e4d79..737ba4220 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -35,6 +35,7 @@ #include "pdc_transforms_pkg.h" #include "pdc_analysis_pkg.h" #include "pdc_client_connect.h" +#include "pdc_logger.h" #include #include #include @@ -612,9 +613,6 @@ PDCobj_open_common(const char *obj_name, pdcid_t pdc, int is_col) } p->metadata = out; - // printf("PDCobj_open_common: obj partition for %s is %d\n", obj_name, (int) (((pdc_metadata_t - // *)p->metadata)->region_partition)); - p->local_transfer_request_head = NULL; p->local_transfer_request_end = NULL; p->local_transfer_request_size = 0; @@ -975,7 +973,7 @@ PDCobj_set_dims(pdcid_t obj_id, int ndim, uint64_t *dims) FUNC_ENTER(NULL); info = PDC_find_id(obj_id); if (info == NULL) { - fprintf(stderr, "PDCobj_set_dims: cannnot find obj id @ line %d\n", __LINE__); + LOG_ERROR("PDCobj_set_dims: cannnot find obj id"); } object = (struct _pdc_obj_info *)(info->obj_ptr); if (object->local_transfer_request_size) { @@ -985,8 +983,8 @@ PDCobj_set_dims(pdcid_t obj_id, int ndim, uint64_t *dims) } if (ndim != (int)((pdc_metadata_t *)(object->metadata))->ndim) { - fprintf(stderr, "PDCobj_set_dims: input dimension size is wrong %d != %d @ line %d\n", ndim, - (int)object->obj_pt->obj_prop_pub->ndim, __LINE__); + LOG_ERROR("PDCobj_set_dims: input dimension size is wrong %d != %d\n", ndim, + (int)object->obj_pt->obj_prop_pub->ndim); } memcpy(object->obj_pt->obj_prop_pub->dims, dims, ndim * sizeof(uint64_t)); memcpy(((pdc_metadata_t *)(object->metadata))->dims, dims, ndim * sizeof(uint64_t)); @@ -1012,7 +1010,7 @@ PDCobj_get_dims(pdcid_t obj_id, int *ndim, uint64_t **dims) info = PDC_find_id(obj_id); if (info == NULL) { - fprintf(stderr, "PDCobj_set_dims: cannnot find obj id @ line %d\n", __LINE__); + LOG_ERROR("PDCobj_set_dims: cannnot find obj id"); } object = (struct _pdc_obj_info *)(info->obj_ptr); *ndim = object->obj_pt->obj_prop_pub->ndim; diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 1d4f6a718..c70be8507 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -42,6 +42,7 @@ #include "pdc_transforms_pkg.h" #include "pdc_client_connect.h" #include "pdc_analysis_pkg.h" +#include "pdc_logger.h" #include #define PDC_MERGE_TRANSFER_MIN_COUNT 50 @@ -238,10 +239,6 @@ PDCregion_transfer_create(void *buf, pdc_access_t access_type, pdcid_t obj_id, p p->is_done = 0; unit = p->unit; - /* - printf("creating a request from obj %s metadata id = %llu, access_type = %d\n", - obj2->obj_info_pub->name, (long long unsigned)obj2->obj_info_pub->meta_id, access_type); - */ p->local_region_ndim = reg1->ndim; p->local_region_offset = (uint64_t *)malloc( sizeof(uint64_t) * (reg1->ndim * 2 + reg2->ndim * 2 + obj2->obj_pt->obj_prop_pub->ndim)); @@ -269,14 +266,6 @@ PDCregion_transfer_create(void *buf, pdc_access_t access_type, pdcid_t obj_id, p for (j = 0; j < (int)reg2->ndim; ++j) { p->total_data_size *= reg2->size[j]; } - /* - int rank; - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - printf("rank = %d transfer request create check obj ndim %d, dims [%lld, %lld, %lld], - local_offset[0] = %lld, " "reg1->offset[0] = %lld\n", rank, (int)p->obj_ndim, (long long - int)p->obj_dims[0], (long long int)p->obj_dims[1], (long long int)p->obj_dims[2], (long long - int)p->local_region_offset[0], (long long int)reg1->offset[0]); - */ ret_value = PDC_id_register(PDC_TRANSFER_REQUEST, p); done: @@ -460,9 +449,6 @@ static_region_partition(char *buf, int ndim, uint64_t unit, pdc_access_t access_ static_offset = x * s + (i - x) * (s + 1); static_size = s + 1; } - // printf("static offset = %lu, static_size = %lu, offset = %lu, size = %lu\n", (long - // unsigned)static_offset, (long unsigned)static_size, (long unsigned)offset[split_dim], (long - // unsigned)size[split_dim]); // Check if this region fits into the server static region. if ((static_offset + static_size > offset[split_dim] && offset[split_dim] >= static_offset) || (offset[split_dim] + size[split_dim] > static_offset && static_offset >= offset[split_dim])) { @@ -545,10 +531,6 @@ pack_region_buffer(char *buf, uint64_t *obj_dims, size_t total_data_size, int lo FUNC_ENTER(NULL); if (local_ndim == 1) { - /* - printf("checkpoint at local copy ndim == 1 local_offset[0] = %lld @ line %d\n", - (long long int)local_offset[0], __LINE__); - */ *new_buf = buf + local_offset[0] * unit; } else if (local_ndim == 2) { @@ -672,7 +654,6 @@ unpack_region_metadata_query(char *buf, pdc_transfer_request_start_all_pkg **tra ptr = buf; size = *(int *)ptr; ptr += sizeof(int); - // printf("unpack_region_metadata_query: received %d obj partitions\n", size); counter = 0; index = 0; for (i = 0; i < size; ++i) { @@ -699,15 +680,11 @@ unpack_region_metadata_query(char *buf, pdc_transfer_request_start_all_pkg **tra local_request->sub_offsets = (uint64_t **)malloc(sizeof(uint64_t *) * local_request->n_obj_servers); local_request->obj_servers = (uint32_t *)malloc(sizeof(uint32_t) * local_request->n_obj_servers); - // printf("unpack_region_metadata_query: checkpoint %d, local_request = %llu, index = %d\n", - // __LINE__, (long long unsigned) local_request, index); set_obj_server_bufs(local_request); } transfer_request_end->next = NULL; transfer_request_end->transfer_request = local_request; transfer_request_end->data_server_id = *(uint32_t *)ptr; - // printf("unpack_region_metadata_query: @ line %d, i = %d, counter = %d, data_server_id = %u\n", - // __LINE__, i, counter, transfer_request_end->data_server_id); ptr += sizeof(uint32_t); transfer_request_end->remote_offset = @@ -732,19 +709,6 @@ unpack_region_metadata_query(char *buf, pdc_transfer_request_start_all_pkg **tra region_size *= transfer_request_end->remote_size[j]; sub_offset[j] = transfer_request_end->remote_offset[j] - local_request->remote_region_offset[j]; } - /* - printf("unpack_region_metadata_query: @ line %d remote_region_offset = %lu, %lu, - remote_region_size " - "= %lu, %lu, suboffset = %lu, %lu, remote_offset = %lu,%lu, remote_size = %lu,%lu\n", - __LINE__, (long unsigned)local_request->remote_region_offset[0], - (long unsigned)local_request->remote_region_offset[1], - (long unsigned)local_request->remote_region_size[0], - (long unsigned)local_request->remote_region_size[1], (long unsigned)sub_offset[0], - (long unsigned)sub_offset[1], (long unsigned)transfer_request_end->remote_offset[0], - (long unsigned)transfer_request_end->remote_offset[1], - (long unsigned)transfer_request_end->remote_size[0], - (long unsigned)transfer_request_end->remote_size[1]); - */ if (local_request->access_type == PDC_WRITE) { transfer_request_end->buf = (char *)malloc(region_size); memcpy_subregion(local_request->remote_region_ndim, local_request->unit, @@ -756,7 +720,6 @@ unpack_region_metadata_query(char *buf, pdc_transfer_request_start_all_pkg **tra if (!counter) { index++; } - // printf("unpack_region_metadata_query: @ line %d\n", __LINE__); } *transfer_request_head_ptr = transfer_request_head; @@ -787,8 +750,6 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i sizeof(pdc_transfer_request_start_all_pkg *) * input_size); size = 0; for (i = 0; i < input_size; ++i) { - // fprintf(stderr, "register_metadata[%d]: request i = %d, metadata_server_id = %u\n", - // pdc_client_mpi_rank_g, i, transfer_request_input[i]->transfer_request->metadata_server_id); if (transfer_request_input[i]->transfer_request->region_partition == PDC_REGION_DYNAMIC || transfer_request_input[i]->transfer_request->region_partition == PDC_REGION_LOCAL) { transfer_requests[size] = transfer_request_input[i]; @@ -801,35 +762,22 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i index = 0; qsort(transfer_requests, size, sizeof(pdc_transfer_request_start_all_pkg *), sort_by_metadata_server_start_all); - // printf("register_metadata @ line %d: input_size = %d, size = %d\n", __LINE__, input_size, size); for (i = 1; i < size; ++i) { - // fprintf(stderr, "register_metadata: checkpoint %d, sending offset = %lu, size = %lu\n", __LINE__, - // transfer_request[i]->remote_offset[0], transfer_request[i]->remote_size[0]); if (transfer_requests[i]->transfer_request->metadata_server_id != transfer_requests[i - 1]->transfer_request->metadata_server_id) { n_objs = i - index; pack_region_metadata_query(transfer_requests + index, n_objs, &buf, &total_buf_size); - // fprintf(stderr, "register_metadata[%d]: checkpoint %d, metadata_server_id = %u, total_buf_size - // = %lu\n", pdc_client_mpi_rank_g, __LINE__, - // transfer_requests[index]->transfer_request->metadata_server_id, total_buf_size); PDC_Client_transfer_request_metadata_query( buf, total_buf_size, n_objs, transfer_requests[index]->transfer_request->metadata_server_id, is_write, &output_buf_size, &query_id); - // fprintf(stderr, "register_metadata: checkpoint %d\n", __LINE__); free(buf); - // If it is a valid query ID, then it means regions are overlapping. - // fprintf(stderr, "register_metadata[%d]: checkpoint %d, metadata_server_id = %u\n", - // pdc_client_mpi_rank_g, __LINE__, - // transfer_requests[index]->transfer_request->metadata_server_id); if (query_id) { output_buf = (char *)malloc(output_buf_size); PDC_Client_transfer_request_metadata_query2( output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); - // fprintf(stderr, "register_metadata: checkpoint %d\n", __LINE__); unpack_region_metadata_query(output_buf, transfer_requests + index, &transfer_request_head, &transfer_request_end, &output_size); - // fprintf(stderr, "register_metadata: checkpoint %d\n", __LINE__); free(output_buf); if (transfer_request_front_head) { previous->next = transfer_request_head; @@ -841,34 +789,23 @@ register_metadata(pdc_transfer_request_start_all_pkg **transfer_request_input, i } index = i; } - // printf("register_metadata @ line %d: query_id = %lu, i = %d\n", __LINE__, (long unsigned)query_id, - // i); } if (size) { n_objs = size - index; - // fprintf(stderr, "register_metadata: checkpoint %d\n", __LINE__); pack_region_metadata_query(transfer_requests + index, n_objs, &buf, &total_buf_size); - // fprintf(stderr, "register_metadata[%d]: checkpoint %d, metadata_server_id = %u, total_buf_size = - // %lu\n", pdc_client_mpi_rank_g, __LINE__, - // transfer_requests[index]->transfer_request->metadata_server_id, total_buf_size); PDC_Client_transfer_request_metadata_query( buf, total_buf_size, n_objs, transfer_requests[index]->transfer_request->metadata_server_id, is_write, &output_buf_size, &query_id); - // fprintf(stderr, "register_metadata: checkpoint %d\n", __LINE__); free(buf); // If it is a valid query ID, then it means regions are overlapping. - // fprintf(stderr, "register_metadata[%d]: checkpoint %d, metadata_server_id = %u\n", - // pdc_client_mpi_rank_g, __LINE__, transfer_requests[index]->transfer_request->metadata_server_id); if (query_id) { output_buf = (char *)malloc(output_buf_size); PDC_Client_transfer_request_metadata_query2( output_buf, output_buf_size, query_id, transfer_requests[index]->transfer_request->metadata_server_id); - // fprintf(stderr, "register_metadata: checkpoint %d\n", __LINE__); unpack_region_metadata_query(output_buf, transfer_requests + index, &transfer_request_head, &transfer_request_end, &output_size); - // fprintf(stderr, "register_metadata: output_size = %d, checkpoint %d\n", output_size, __LINE__); free(output_buf); if (transfer_request_front_head) { previous->next = transfer_request_head; @@ -952,8 +889,7 @@ prepare_start_all_requests(pdcid_t *transfer_request_id, int size, continue; transfer_request = (pdc_transfer_request *)(transferinfo->obj_ptr); if (transfer_request->metadata_id != NULL) { - printf("==PDC_CLIENT[%d]: %s cannot start transfer request @ line %d\n", pdc_client_mpi_rank_g, - __func__, __LINE__); + LOG_ERROR("==PDC_CLIENT[%d]: cannot start transfer request\n", pdc_client_mpi_rank_g); return FAIL; } if (transfer_request->consistency == PDC_CONSISTENCY_POSIX) { @@ -980,8 +916,8 @@ prepare_start_all_requests(pdcid_t *transfer_request_id, int size, &(transfer_request->sub_offsets), &(transfer_request->output_offsets), &(transfer_request->output_sizes), &(transfer_request->output_buf)); if (transfer_request->n_obj_servers == 0) { - printf("PDC_Client %d: %s error with static region partition, no server is selected!\n", - pdc_client_mpi_rank_g, __func__); + LOG_ERROR("PDC_Client %d error with static region partition, no server is selected!\n", + pdc_client_mpi_rank_g); return FAIL; } for (j = 0; j < transfer_request->n_obj_servers; ++j) { @@ -1124,7 +1060,6 @@ finish_start_all_requests(pdc_transfer_request_start_all_pkg **write_transfer_re free(read_transfer_request[i]); } // MPI_Barrier(MPI_COMM_WORLD); - // fprintf(stderr, "checkpoint %d\n", __LINE__); if (write_size) { free(write_transfer_request); } @@ -1157,7 +1092,6 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr * unit: sizeof(size_t) */ metadata_size = n_objs * (sizeof(pdcid_t) + sizeof(int) * 2 + sizeof(size_t)); - // printf("checkpoint @ line %d\n", __LINE__); // Data size, including region offsets/length pairs and actual data for I/O. /* * For each of objects @@ -1169,8 +1103,6 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr data_size = 0; total_obj_data_size = 0; for (i = 0; i < n_objs; ++i) { - // printf("checkpoint i = %d, remote_region_size = %lu, unit = %lu @ line %d\n", i, - // transfer_requests[i]->remote_size[0], transfer_requests[i]->transfer_request->unit, __LINE__); obj_data_size = transfer_requests[i]->remote_size[0] * transfer_requests[i]->transfer_request->unit; for (j = 1; j < transfer_requests[i]->transfer_request->remote_region_ndim; ++j) { obj_data_size *= transfer_requests[i]->remote_size[j]; @@ -1184,7 +1116,6 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr data_size += sizeof(uint64_t) * transfer_requests[i]->transfer_request->remote_region_ndim * 3; } } - // printf("checkpoint @ line %d\n", __LINE__); if (access_type == PDC_WRITE) { total_buf_size = metadata_size + data_size; } @@ -1196,8 +1127,6 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr total_buf_size = metadata_size + data_size; } } - // printf("checkpoint @ line %d, total_buf_size = %lu, metadata_size = %lu, data_size = %lu\n", __LINE__, - // total_buf_size, metadata_size, data_size); bulk_buf = (char *)malloc(total_buf_size); *bulk_buf_ptr = bulk_buf; ptr = bulk_buf; @@ -1208,7 +1137,6 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr memcpy(ptr, a, b); \ ptr += b; \ } - // printf("checkpoint @ line %d\n", __LINE__); for (i = 0; i < n_objs; ++i) { unit = transfer_requests[i]->transfer_request->unit; MEMCPY_INC(&(transfer_requests[i]->transfer_request->obj_id), sizeof(pdcid_t)); @@ -1217,7 +1145,6 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr MEMCPY_INC(&unit, sizeof(size_t)); } - // printf("checkpoint @ line %d\n", __LINE__); for (i = 0; i < n_objs; ++i) { unit = transfer_requests[i]->transfer_request->unit; obj_data_size = transfer_requests[i]->remote_size[0] * unit; @@ -1264,7 +1191,7 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s PDC_CLIENT[%d] enter %s\n", cur_time, pdc_client_mpi_rank_g, __func__); + LOG_DEBUG("%s PDC_CLIENT[%d] enter\n", cur_time, pdc_client_mpi_rank_g); #endif if (size == 0) @@ -1282,14 +1209,9 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ &bulk_buf_size, read_bulk_buf + index); bulk_buf_ref = (int *)malloc(sizeof(int)); bulk_buf_ref[0] = n_objs; - // printf("checkpoint @ line %d, index = %d, dataserver_id = %d, n_objs = %d\n", __LINE__, index, - // transfer_requests[index]->data_server_id, n_objs); - /* printf("==PDC_CLIENT[%d]: %s 1 send to server %d\n", pdc_client_mpi_rank_g, __func__, - * transfer_requests[index]->data_server_id); */ PDC_Client_transfer_request_all(n_objs, transfer_requests[index]->transfer_request->access_type, transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); - // printf("transfer request towards data server %d\n", transfer_requests[index]->data_server_id); for (j = index; j < i; ++j) { // All requests share the same bulk buffer, reference counter is also shared among all // requests. @@ -1302,9 +1224,6 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ } transfer_requests[j]->transfer_request->metadata_id[transfer_requests[j]->index] = metadata_id[j]; - // printf("obj_id = %lu, set transfer_request metadata_id[%d] = %lu\n", - // transfer_requests[j]->transfer_request->obj_id, transfer_requests[j]->index, - // metadata_id[j]); } index = i; } @@ -1312,27 +1231,18 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ if (size) { // Freed at the wait operation (inside PDC_client_connect call) n_objs = size - index; - // printf("checkpoint @ line %d\n", __LINE__); PDC_Client_pack_all_requests(n_objs, transfer_requests + index, transfer_requests[index]->transfer_request->access_type, &bulk_buf, &bulk_buf_size, read_bulk_buf + index); - // printf("checkpoint @ line %d\n", __LINE__); bulk_buf_ref = (int *)malloc(sizeof(int)); bulk_buf_ref[0] = n_objs; - // printf("checkpoint @ line %d, index = %d, dataserver_id = %d, n_objs = %d\n", __LINE__, index, - // transfer_requests[index]->data_server_id, n_objs); - /* printf("==PDC_CLIENT[%d]: %s 2 send to server %d\n", pdc_client_mpi_rank_g, __func__, - * transfer_requests[index]->data_server_id); */ PDC_Client_transfer_request_all(n_objs, transfer_requests[index]->transfer_request->access_type, transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); - // printf("transfer request towards data server %d\n", transfer_requests[index]->data_server_id); for (j = index; j < size; ++j) { // All requests share the same bulk buffer, reference counter is also shared among all // requests. - // printf("checkpoint @ line %d, j = %d, %d\n", __LINE__, j, - // transfer_requests[j]->data_server_id); transfer_requests[j]->transfer_request->bulk_buf[transfer_requests[j]->index] = bulk_buf; transfer_requests[j]->transfer_request->bulk_buf_ref[transfer_requests[j]->index] = bulk_buf_ref; if (transfer_requests[j]->transfer_request->access_type == PDC_READ) { @@ -1340,8 +1250,6 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ read_bulk_buf[j]; } transfer_requests[j]->transfer_request->metadata_id[transfer_requests[j]->index] = metadata_id[j]; - // printf("obj_id = %lu, set transfer_request metadata_id[%d] = %lu\n", - // transfer_requests[j]->transfer_request->obj_id, transfer_requests[j]->index, metadata_id[j]); } } @@ -1373,14 +1281,12 @@ merge_transfer_request_ids(pdcid_t *transfer_request_id, int size, pdcid_t *merg for (i = 0; i < size; ++i) { transferinfo = PDC_find_id(transfer_request_id[i]); if (NULL == transferinfo) { - printf("==PDC_CLIENT[%d]: %s cannot find transfer request info @ line %d\n", - pdc_client_mpi_rank_g, __func__, __LINE__); + LOG_ERROR("==PDC_CLIENT[%d]: cannot find transfer request info\n", pdc_client_mpi_rank_g); return FAIL; } all_transfer_request[i] = (pdc_transfer_request *)(transferinfo->obj_ptr); if (NULL == all_transfer_request[i]) { - printf("==PDC_CLIENT[%d]: %s transfer request is NULL @ line %d\n", pdc_client_mpi_rank_g, - __func__, __LINE__); + LOG_ERROR("==PDC_CLIENT[%d]: transfer request is NULL\n", pdc_client_mpi_rank_g); return FAIL; } @@ -1477,7 +1383,7 @@ PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, int #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s PDC_CLIENT[%d] enter %s\n", cur_time, pdc_client_mpi_rank_g, __func__); + LOG_DEBUG("%s PDC_CLIENT[%d] enter\n", cur_time, pdc_client_mpi_rank_g); #endif // Merge the transfer_request_ids when they are operating on the same obj and have contiguous off, len @@ -1491,20 +1397,10 @@ PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, int } // Split write and read requests. Handle them separately. - // printf("%s: checkpoint %d\n", __func__, __LINE__); // [Tang] NOTE: prepare_start_all_requests include several metadata RPC operations ret_value = prepare_start_all_requests(transfer_request_id, size, &write_transfer_requests, &read_transfer_requests, &write_size, &read_size, &posix_transfer_request_id, &posix_size); - /* - printf("%s: checkpoint %d, write_size = %d, read_size = %d\n", __func__, __LINE__, - write_size, read_size); - int i; - for ( i = 0; i < read_size; ++i ) { - printf("read_transfer_requests[%d]->data_server_id = %d, obj_id = %lu\n", i, - read_transfer_requests[i]->data_server_id, read_transfer_requests[i]->transfer_request->obj_id); - } - */ PDC_Client_transfer_pthread_cnt_add(size); #ifdef ENABLE_MPI @@ -1515,26 +1411,19 @@ PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, int // Start write requests if (write_size > 0) PDC_Client_start_all_requests(write_transfer_requests, write_size, comm); - // printf("%s: checkpoint %d\n", __func__, __LINE__); // Start read requests if (read_size > 0) PDC_Client_start_all_requests(read_transfer_requests, read_size, comm); - /* - fprintf(stderr, "%s: checkpoint %d\n", __func__, __LINE__); - MPI_Barrier(comm); - */ // For POSIX consistency, we block here until the data is received by the server if (posix_size > 0) { - fprintf(stderr, "==PDC_CLIENT[%d]: %s wait for posix requests\n", pdc_client_mpi_rank_g, __func__); + LOG_ERROR("==PDC_CLIENT[%d]: wait for posix requests\n", pdc_client_mpi_rank_g); PDCregion_transfer_wait_all(posix_transfer_request_id, posix_size); free(posix_transfer_request_id); } // Clean up memory finish_start_all_requests(write_transfer_requests, read_transfer_requests, write_size, read_size); - // fprintf(stderr, "%s: checkpoint %d\n", __func__, __LINE__); - #ifdef ENABLE_MPI if (comm != 0) MPI_Barrier(comm); @@ -1650,7 +1539,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, transfer_request = (pdc_transfer_request *)(transferinfo->obj_ptr); if (transfer_request->metadata_id != NULL) { - printf("PDC_Client %s attempt to start existing transfer request @ line %d\n", __func__, __LINE__); + LOG_ERROR("PDC_Client %s attempt to start existing transfer request\n"); ret_value = FAIL; goto done; } @@ -1690,18 +1579,10 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, &(transfer_request->output_offsets), &(transfer_request->output_sizes), &(transfer_request->output_buf)); if (transfer_request->n_obj_servers == 0) { - printf("PDC_Client %d, %s: error with static region partition, no server is selected!\n", - pdc_client_mpi_rank_g, __func__); + LOG_ERROR("PDC_Client %d: error with static region partition, no server is selected!\n", + pdc_client_mpi_rank_g); return FAIL; } - /* - printf("n_obj_servers = %d\n", transfer_request->n_obj_servers); - for ( i = 0; i < transfer_request->n_obj_servers; ++i ) { - printf("sub_offsets = %lu, output_offsets = %lu, output_sizes = %lu\n", - transfer_request->sub_offsets[i][0], transfer_request->output_offsets[i][0], - transfer_request->output_sizes[i][0]); - } - */ // The following memories will be freed in the wait function. transfer_request->metadata_id = (uint64_t *)malloc(sizeof(uint64_t) * transfer_request->n_obj_servers); @@ -1855,16 +1736,9 @@ PDCregion_transfer_status(pdcid_t transfer_request_id, pdc_transfer_status_t *co } // If we reach here, then all transfers are finished. for (i = 0; i < transfer_request->n_obj_servers; ++i) { - // printf("finished waiting for data from server %d, output_offsets = %lu, output_size = %lu, - // metadata_id = %lu\n", transfer_request->obj_servers[i], - // transfer_request->output_offsets[i][0], transfer_request->output_sizes[i][0], - // transfer_request->metadata_id[i]); if (transfer_request->access_type == PDC_READ) { // We copy the data from different data server regions to the contiguous buffer. Subregion // copy uses sub_offset/size to align to the remote obj region. - // printf("sub_offsets = %lu, output_size = %lu, remote_region_size = %lu\n", - // transfer_request->sub_offsets[i][0], transfer_request->output_sizes[i][0], - // transfer_request->remote_region_size[0]); memcpy_subregion(transfer_request->remote_region_ndim, unit, transfer_request->access_type, transfer_request->new_buf, transfer_request->remote_region_size, transfer_request->read_bulk_buf[i], @@ -1874,11 +1748,8 @@ PDCregion_transfer_status(pdcid_t transfer_request_id, pdc_transfer_status_t *co free(transfer_request->output_buf[i]); } free(transfer_request->output_offsets[i]); - // free(transfer_request->output_sizes[i]); - // free(transfer_request->sub_offsets[i]); } // Copy read data from a contiguous buffer back to the user buffer using local data information. - // printf("rank %d checkpoint %d\n", pdc_client_mpi_rank_g, __LINE__); release_region_buffer( transfer_request->buf, transfer_request->obj_dims, transfer_request->local_region_ndim, transfer_request->local_region_offset, transfer_request->local_region_size, unit, @@ -1898,16 +1769,7 @@ PDCregion_transfer_status(pdcid_t transfer_request_id, pdc_transfer_status_t *co if (*completed != PDC_TRANSFER_STATUS_COMPLETE) { goto done; } - /* - uint64_t k; - printf("print bulk_buf :"); - for ( k = 0; k < transfer_request->local_region_size[0] * 2; ++k ) { - printf("%d,", *(int*) (transfer_request->bulk_buf + sizeof(int) * k)); - } - printf("\n"); - */ if (transfer_request->access_type == PDC_READ) { - // printf("copy %lu bytes of data\n", transfer_request->total_data_size); memcpy(transfer_request->new_buf, transfer_request->read_bulk_buf[0], transfer_request->total_data_size); } @@ -1969,7 +1831,6 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) } } - // printf("entered %s @ line %d\n", __func__, __LINE__); total_requests = 0; transfer_request_head = NULL; for (i = 0; i < size; ++i) { @@ -1980,13 +1841,10 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) if (1 == transfer_request->is_done) continue; if (!transfer_request->metadata_id) { - fprintf(stderr, - "PDCregion_transfer_wait_all [rank %d] @ line %d: Attempt to wait for a transfer request " - "that has not been started. %d/%d\n", - pdc_client_mpi_rank_g, __LINE__, i, size); - /* ret_value = FAIL; */ + LOG_ERROR("PDCregion_transfer_wait_all [rank %d]: Attempt to wait for a transfer request " + "that has not been started. %d/%d\n", + pdc_client_mpi_rank_g, i, size); continue; - /* goto done; */ } total_requests += transfer_request->n_obj_servers; for (j = 0; j < transfer_request->n_obj_servers; ++j) { @@ -2014,33 +1872,17 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) } } - /* #ifdef ENABLE_MPI */ - /* t1 = MPI_Wtime(); */ - /* fprintf(stderr, "Rank %d, Part 1 took %.6f\n", pdc_client_mpi_rank_g, t1 - t0); */ - /* #endif */ - transfer_requests = (pdc_transfer_request_wait_all_pkg **)malloc( sizeof(pdc_transfer_request_wait_all_pkg *) * total_requests); temp = transfer_request_head; for (i = 0; i < total_requests; ++i) { transfer_requests[i] = temp; - // printf("checkpoint %d, data_server_id = %u, metadata_id = %lu\n", __LINE__, - // transfer_requests[i]->data_server_id, transfer_requests[i]->metadata_id); + temp = temp->next; } qsort(transfer_requests, total_requests, sizeof(pdc_transfer_request_wait_all_pkg *), sort_by_data_server_wait_all); - /* for (i = 0; i < total_requests; ++i) { */ - // printf("checkpoint %d, data_server_id = %u, metadata_id = %lu\n", __LINE__, - // transfer_requests[i]->data_server_id, transfer_requests[i]->metadata_id); - /* } */ - - /* #ifdef ENABLE_MPI */ - /* t0 = MPI_Wtime(); */ - /* fprintf(stderr, "Rank %d, Part 2 took %.6f\n", pdc_client_mpi_rank_g, t0 - t1); */ - /* #endif */ - metadata_ids = (uint64_t *)malloc(sizeof(uint64_t) * total_requests); index = 0; for (i = 1; i < total_requests; ++i) { @@ -2051,7 +1893,6 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) metadata_ids[j] = transfer_requests[j]->metadata_id; } - // printf("PDCregion_transfer_wait_all: checkpoint %d\n", __LINE__); PDC_Client_transfer_request_wait_all(n_objs, metadata_ids + index, transfer_requests[index]->data_server_id); for (j = index; j < i; ++j) { @@ -2077,19 +1918,12 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) free(transfer_requests[j]->transfer_request->output_buf[transfer_requests[j]->index]); } free(transfer_requests[j]->transfer_request->output_offsets[transfer_requests[j]->index]); - // free(transfer_requests[j]->transfer_request->output_sizes[transfer_requests[j]->index]); - // free(transfer_requests[j]->transfer_request->sub_offsets[transfer_requests[j]->index]); } } index = i; } } - /* #ifdef ENABLE_MPI */ - /* t1 = MPI_Wtime(); */ - /* fprintf(stderr, "Rank %d, Part 3 took %.6f\n", pdc_client_mpi_rank_g, t1 - t0); */ - /* #endif */ - if (total_requests) { // Freed at the wait operation (inside PDC_client_connect call) n_objs = total_requests - index; @@ -2115,31 +1949,14 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) transfer_requests[j]->transfer_request->sub_offsets[transfer_requests[j]->index], transfer_requests[j]->transfer_request->output_sizes[transfer_requests[j]->index]); } - /* - uint64_t k; - fprintf(stderr,"print new_buf :"); - for ( k = 0; k < transfer_request->local_region_size[0]; ++k ) { - fprintf(stderr,"%d,", *(int*) (transfer_request->new_buf + - sizeof(int) * k)); - - } - printf("\n"); - */ if (transfer_requests[j]->transfer_request->output_buf) { free(transfer_requests[j]->transfer_request->output_buf[transfer_requests[j]->index]); } free(transfer_requests[j]->transfer_request->output_offsets[transfer_requests[j]->index]); - // free(transfer_requests[j]->transfer_request->output_sizes[transfer_requests[j]->index]); - // free(transfer_requests[j]->transfer_request->sub_offsets[transfer_requests[j]->index]); } } } - /* #ifdef ENABLE_MPI */ - /* t0 = MPI_Wtime(); */ - /* fprintf(stderr, "Rank %d, Part 4 took %.6f\n", pdc_client_mpi_rank_g, t0 - t1); */ - /* #endif */ - // Deal with merged read requests, need to copy a large buffer to each of the original request buf // TODO: Currently only supports 1D merging, so only consider 1D for now if (merged_xfer == 1) { @@ -2198,11 +2015,6 @@ PDCregion_transfer_wait_all(pdcid_t *transfer_request_id, int size) remove_local_transfer_request(transfer_request->obj_pointer, transfer_request_id[i]); } - /* #ifdef ENABLE_MPI */ - /* t1 = MPI_Wtime(); */ - /* fprintf(stderr, "Rank %d, Part 5 took %.6f\n", pdc_client_mpi_rank_g, t1 - t0); */ - /* #endif */ - for (i = 0; i < total_requests; ++i) { free(transfer_requests[i]); } @@ -2251,16 +2063,9 @@ PDCregion_transfer_wait(pdcid_t transfer_request_id) ret_value = PDC_Client_transfer_request_wait(transfer_request->metadata_id[i], transfer_request->obj_servers[i], transfer_request->access_type); - // printf("finished waiting for data from server %d, output_offsets = %lu, output_size = %lu, - // metadata_id = %lu\n", transfer_request->obj_servers[i], - // transfer_request->output_offsets[i][0], transfer_request->output_sizes[i][0], - // transfer_request->metadata_id[i]); if (transfer_request->access_type == PDC_READ) { // We copy the data from different data server regions to the contiguous buffer. Subregion // copy uses sub_offset/size to align to the remote obj region. - // printf("sub_offsets = %lu, output_size = %lu, remote_region_size = %lu\n", - // transfer_request->sub_offsets[i][0], transfer_request->output_sizes[i][0], - // transfer_request->remote_region_size[0]); memcpy_subregion(transfer_request->remote_region_ndim, unit, transfer_request->access_type, transfer_request->new_buf, transfer_request->remote_region_size, transfer_request->read_bulk_buf[i], @@ -2270,11 +2075,8 @@ PDCregion_transfer_wait(pdcid_t transfer_request_id) free(transfer_request->output_buf[i]); } free(transfer_request->output_offsets[i]); - // free(transfer_request->output_sizes[i]); - // free(transfer_request->sub_offsets[i]); } // Copy read data from a contiguous buffer back to the user buffer using local data information. - // printf("rank %d checkpoint %d\n", pdc_client_mpi_rank_g, __LINE__); release_region_buffer( transfer_request->buf, transfer_request->obj_dims, transfer_request->local_region_ndim, transfer_request->local_region_offset, transfer_request->local_region_size, unit, @@ -2292,16 +2094,7 @@ PDCregion_transfer_wait(pdcid_t transfer_request_id) ret_value = PDC_Client_transfer_request_wait(transfer_request->metadata_id[0], transfer_request->data_server_id, transfer_request->access_type); - /* - uint64_t k; - printf("print bulk_buf :"); - for ( k = 0; k < transfer_request->local_region_size[0] * 2; ++k ) { - printf("%d,", *(int*) (transfer_request->bulk_buf + sizeof(int) * k)); - } - printf("\n"); - */ if (transfer_request->access_type == PDC_READ) { - // printf("copy %lu bytes of data\n", transfer_request->total_data_size); memcpy(transfer_request->new_buf, transfer_request->read_bulk_buf[0], transfer_request->total_data_size); } @@ -2318,10 +2111,6 @@ PDCregion_transfer_wait(pdcid_t transfer_request_id) } else { // metadata is freed with previous wait (e.g. with posix consistency) - /* printf("PDC Client PDCregion_transfer_status attempt to check status for inactive transfer request - * @ " */ - /* "line %d\n", */ - /* __LINE__); */ ret_value = SUCCEED; } diff --git a/src/api/pdc_transform/pdc_transform.c b/src/api/pdc_transform/pdc_transform.c index 884cbf434..01a2a5c00 100644 --- a/src/api/pdc_transform/pdc_transform.c +++ b/src/api/pdc_transform/pdc_transform.c @@ -35,6 +35,7 @@ #include "pdc_analysis_pkg.h" #include "pdc_client_server_common.h" #include "pdc_utlist.h" +#include "pdc_logger.h" #include #include #include @@ -279,27 +280,8 @@ PDCbuf_io_transform_register(char *func ATTRIBUTE(unused), void *buf ATTRIBUTE(u int next_state ATTRIBUTE(unused), pdc_data_movement_t when ATTRIBUTE(unused)) { perr_t ret_value = FAIL; /* Return value (not implemented) */ -#if 0 - void *ftnHandle = NULL; - size_t (*ftnPtr)() = NULL; - struct _pdc_obj_info *object1 = NULL; - struct _pdc_region_transform_ftn_info *thisFtn = NULL; - struct pdc_region_info *region_info; - struct _pdc_id_info *id_info; - char *thisApp = NULL; - char *colonsep = NULL; - char *transformslibrary = NULL; - char *applicationDir = NULL; - char *userdefinedftn = NULL; - char *loadpath = NULL; - int local_regIndex; -#endif FUNC_ENTER(NULL); - printf("IO transforms are not currently supported!\n"); - // done: - // if (applicationDir) free(applicationDir); - // if (userdefinedftn) free(userdefinedftn); - + LOG_ERROR("IO transforms are not currently supported!\n"); FUNC_LEAVE(ret_value); } diff --git a/src/api/pdc_transform/pdc_transforms_common.c b/src/api/pdc_transform/pdc_transforms_common.c index 34ecd7b07..465be9640 100644 --- a/src/api/pdc_transform/pdc_transforms_common.c +++ b/src/api/pdc_transform/pdc_transforms_common.c @@ -29,6 +29,7 @@ #include "pdc_analysis_pkg.h" #include "pdc_transforms_common.h" #include "pdc_client_server_common.h" +#include "pdc_logger.h" #ifdef ENABLE_MULTITHREAD extern hg_thread_pool_t *hg_test_thread_pool_g; @@ -80,7 +81,7 @@ HG_TEST_RPC_CB(transform_ftn, handle) out.region_id = in.region_id; } else { - printf("Unable to resolve transform function pointer\n"); + LOG_ERROR("Unable to resolve transform function pointer\n"); out.ret = -1; } diff --git a/src/commons/collections/libhl/linklist.c b/src/commons/collections/libhl/linklist.c index fd2de72ac..66dbc3edd 100644 --- a/src/commons/collections/libhl/linklist.c +++ b/src/commons/collections/libhl/linklist.c @@ -198,11 +198,6 @@ static inline list_entry_t * create_entry() { list_entry_t *new_entry = (list_entry_t *)PDC_calloc(1, sizeof(list_entry_t)); - /* - if (!new_entry) { - fprintf(stderr, "Can't create new entry: %s", strerror(errno)); - } - */ return new_entry; } @@ -473,11 +468,6 @@ move_entry(linked_list_t *list, size_t srcPos, size_t dstPos) if (e) { if (insert_entry(list, e, dstPos) == 0) return 0; - else { - if (insert_entry(list, e, srcPos) != 0) { - // fprintf(stderr, "Can't restore entry at index %lu while moving to %lu\n", srcPos, dstPos); - } - } } /* TODO - Unimplemented */ return -1; @@ -742,7 +732,6 @@ list_create_tagged_value_nocopy(char *tag, void *val) { tagged_value_t *newval = (tagged_value_t *)PDC_calloc(1, sizeof(tagged_value_t)); if (!newval) { - // fprintf(stderr, "Can't create new tagged value: %s", strerror(errno)); return NULL; } @@ -766,7 +755,6 @@ list_create_tagged_value(char *tag, void *val, size_t vlen) { tagged_value_t *newval = (tagged_value_t *)PDC_calloc(1, sizeof(tagged_value_t)); if (!newval) { - // fprintf(stderr, "Can't create new tagged value: %s", strerror(errno)); return NULL; } @@ -781,7 +769,6 @@ list_create_tagged_value(char *tag, void *val, size_t vlen) newval->vlen = vlen; } else { - // fprintf(stderr, "Can't copy value: %s", strerror(errno)); free(newval->tag); free(newval); return NULL; @@ -808,7 +795,6 @@ list_create_tagged_sublist(char *tag, linked_list_t *sublist) { tagged_value_t *newval = (tagged_value_t *)PDC_calloc(1, sizeof(tagged_value_t)); if (!newval) { - // fprintf(stderr, "Can't create new tagged value: %s", strerror(errno)); return NULL; } diff --git a/src/commons/collections/libhl/rbtree.c b/src/commons/collections/libhl/rbtree.c index b6a1f3fab..14ad28302 100644 --- a/src/commons/collections/libhl/rbtree.c +++ b/src/commons/collections/libhl/rbtree.c @@ -7,6 +7,7 @@ #include "rbtree.h" #include "pdc_malloc.h" #include "comparators.h" +#include "pdc_logger.h" #define IS_BLACK(_n) (!(_n) || (_n)->color == RBTREE_COLOR_BLACK) #define IS_RED(_n) ((_n) && (_n)->color == RBTREE_COLOR_RED) @@ -650,7 +651,7 @@ rbt_add(rbt_t *rbt, void *k, size_t klen, void *v) rbt_rotate_left(rbt, grandparent); } else { - fprintf(stderr, "Corrupted tree\n"); + LOG_ERROR("Corrupted tree\n"); return -1; } } @@ -1033,12 +1034,12 @@ rbt_print(rbt_t *rbt) char format[16]; snprintf(format, sizeof(format), "%%%ds", w.ws_col); for (i = 0; i < 20; i++) - sprintf(s[i], format, " "); + sprintf(s[i], format, ""); rbt_print_internal(rbt->root, 0, 0, 0, s); for (i = 0; i < 20; i++) - printf("%s\n", s[i]); + LOG_INFO("%s\n", s[i]); } #endif diff --git a/src/commons/collections/pdc_deque.c b/src/commons/collections/pdc_deque.c index 5d2280c28..174cfe5e2 100644 --- a/src/commons/collections/pdc_deque.c +++ b/src/commons/collections/pdc_deque.c @@ -1,4 +1,5 @@ #include "pdc_deque.h" +#include "pdc_logger.h" #include #define DEFAULT_CAPACITY 16 @@ -18,7 +19,7 @@ resize_deque(PDC_deque_t *deque, size_t new_capacity) { void **new_data = malloc(sizeof(void *) * new_capacity); if (new_data == NULL) { - printf("Failed to allocate memory for deque!\n"); + LOG_ERROR("Failed to allocate memory for deque!\n"); exit(1); } diff --git a/src/commons/collections/pdc_set_test.c b/src/commons/collections/pdc_set_test.c index 6798d7385..694d8370d 100644 --- a/src/commons/collections/pdc_set_test.c +++ b/src/commons/collections/pdc_set_test.c @@ -1,6 +1,7 @@ #include "pdc_set.h" #include "pdc_compare.h" #include "pdc_hash.h" +#include "pdc_logger.h" #include #include #include @@ -20,7 +21,7 @@ main(int argc, char **argv) char * endptr; uint64_t max_id = strtoull(argv[1], &endptr, 10); if (*endptr != '\0') { - fprintf(stderr, "Invalid number: %s\n", argv[1]); + LOG_ERROR("Invalid number: %s\n", argv[1]); return 1; } @@ -36,7 +37,7 @@ main(int argc, char **argv) // test if the size of set is correct if (set_num_entries(set) != (unsigned int)max_id) { - printf("Error: set size is not correct\n"); + LOG_ERROR("Error: set size is not correct\n"); return 1; } @@ -45,7 +46,7 @@ main(int argc, char **argv) uint64_t *value = malloc(sizeof(uint64_t)); *value = i; if (!set_query(set, value)) { - printf("Error: value %" PRIu64 " not found in the set\n", i); + LOG_ERROR("Error: value %" PRIu64 " not found in the set\n", i); return 1; } } @@ -56,7 +57,7 @@ main(int argc, char **argv) while (set_iter_has_more(it)) { uint64_t *value = set_iter_next(it); if (!set_query(set, value)) { - printf("Error: value %" PRIu64 " not found in the set\n", *value); + LOG_ERROR("Error: value %" PRIu64 " not found in the set\n", *value); return 1; } } diff --git a/src/commons/collections/pdc_stack.c b/src/commons/collections/pdc_stack.c index 3b332752a..85f8724c5 100644 --- a/src/commons/collections/pdc_stack.c +++ b/src/commons/collections/pdc_stack.c @@ -1,6 +1,7 @@ #include #include #include +#include "pdc_logger.h" #include "pdc_stack.h" #define DEFAULT_CAPACITY 16 @@ -20,7 +21,7 @@ stack_push(PDC_stack_t *stack, void *value) size_t new_capacity = stack->capacity * 2; void **new_data = realloc(stack->data, sizeof(void *) * new_capacity); if (new_data == NULL) { - printf("Failed to reallocate memory for stack!\n"); + LOG_ERROR("Failed to reallocate memory for stack!\n"); exit(1); } stack->data = new_data; @@ -33,7 +34,7 @@ void * stack_pop(PDC_stack_t *stack) { if (stack->size == 0) { - printf("Stack underflow!\n"); + LOG_ERROR("Stack underflow!\n"); exit(1); } return stack->data[--stack->size]; diff --git a/src/commons/file/common_io.c b/src/commons/file/common_io.c index ae7af7f27..a5e1f0ea4 100644 --- a/src/commons/file/common_io.c +++ b/src/commons/file/common_io.c @@ -4,13 +4,14 @@ #include #include #include +#include "pdc_logger.h" FILE * open_file(char *filename, char *mode) { FILE *fp = fopen(filename, mode); if (fp == NULL) { - fprintf(stderr, "Error opening file %s: %s\n", filename, strerror(errno)); + LOG_ERROR("Error opening file %s: %s\n", filename, strerror(errno)); exit(1); } return fp; @@ -20,7 +21,7 @@ int close_file(FILE *fp) { if (fclose(fp) != 0) { - fprintf(stderr, "Error closing file\n"); + LOG_ERROR("Error closing file\n"); return 1; } return 0; @@ -37,13 +38,13 @@ read_file(FILE *fp, io_buffer_t *buffer) // Allocate memory for the buffer buffer->buffer = (char *)malloc(buffer->size + 1); if (buffer->buffer == NULL) { - fprintf(stderr, "Error allocating memory for file buffer\n"); + LOG_ERROR("Error allocating memory for file buffer\n"); return 1; } // Read the file into the buffer if (fread(buffer->buffer, 1, buffer->size, fp) != buffer->size) { - fprintf(stderr, "Error reading file\n"); + LOG_ERROR("Error reading file\n"); return 1; } buffer->buffer[buffer->size] = '\0'; @@ -55,7 +56,7 @@ int write_file(FILE *fp, io_buffer_t *buffer) { if (fwrite(buffer->buffer, 1, buffer->size, fp) != buffer->size) { - fprintf(stderr, "Error writing file\n"); + LOG_ERROR("Error writing file\n"); return 1; } return 0; @@ -64,14 +65,14 @@ write_file(FILE *fp, io_buffer_t *buffer) void print_string(char *string) { - printf("%s", string); + LOG_JUST_PRINT("%s", string); } int read_line(FILE *fp, char *buffer, size_t size) { if (fgets(buffer, size, fp) == NULL) { - fprintf(stderr, "Error reading line\n"); + LOG_ERROR("Error reading line\n"); return 1; } // Remove the newline character if present @@ -85,7 +86,7 @@ int get_input(char *buffer, size_t size) { if (fgets(buffer, size, stdin) == NULL) { - fprintf(stderr, "Error getting input\n"); + LOG_ERROR("Error getting input\n"); return 1; } // Remove the newline character if present @@ -98,7 +99,7 @@ get_input(char *buffer, size_t size) void print_error(char *message) { - fprintf(stderr, "Error: %s\n", message); + LOG_ERROR("Error: %s\n", message); } int @@ -115,7 +116,7 @@ read_text_file(char *filename, void (*callback)(char *line)) callback(line); } if (ferror(fp)) { - fprintf(stderr, "Error reading file\n"); + LOG_ERROR("Error reading file\n"); return 1; } free(line); @@ -129,7 +130,7 @@ write_text_file(char *filename, char **lines, size_t num_lines) FILE *fp = open_file(filename, IO_MODE_WRITE); for (size_t i = 0; i < num_lines; i++) { if (fprintf(fp, "%s\n", lines[i]) < 0) { - fprintf(stderr, "Error writing to file\n"); + LOG_ERROR("Error writing to file\n"); close_file(fp); return 1; } @@ -143,7 +144,7 @@ read_binary_file(char *filename, void *buffer, size_t size) { FILE *fp = open_file(filename, IO_MODE_BINARY IO_MODE_READ); if (fread(buffer, 1, size, fp) != size) { - fprintf(stderr, "Error reading file\n"); + LOG_ERROR("Error reading file\n"); close_file(fp); return 1; } @@ -156,7 +157,7 @@ write_binary_file(char *filename, void *buffer, size_t size) { FILE *fp = open_file(filename, IO_MODE_BINARY IO_MODE_WRITE); if (fwrite(buffer, 1, size, fp) != size) { - fprintf(stderr, "Error writing file\n"); + LOG_ERROR("Error writing file\n"); close_file(fp); return 1; } @@ -169,17 +170,17 @@ update_binary_file(char *filename, void *buffer, size_t size, unsigned long star { FILE *fp = open_file(filename, IO_MODE_BINARY IO_MODE_READ IO_MODE_WRITE); if (fseek(fp, start_pos, SEEK_SET) != 0) { - fprintf(stderr, "Error seeking to starting position\n"); + LOG_ERROR("Error seeking to starting position\n"); close_file(fp); return 1; } if (fwrite(buffer, 1, size, fp) != size) { - fprintf(stderr, "Error writing to file\n"); + LOG_ERROR("Error writing to file\n"); close_file(fp); return 1; } if (length != size && ftruncate(fileno(fp), start_pos + size) != 0) { - fprintf(stderr, "Error truncating file\n"); + LOG_ERROR("Error truncating file\n"); close_file(fp); return 1; } diff --git a/src/commons/index/dart/dart_core.c b/src/commons/index/dart/dart_core.c index da1a81210..9c54a5ba4 100644 --- a/src/commons/index/dart/dart_core.c +++ b/src/commons/index/dart/dart_core.c @@ -119,7 +119,6 @@ dart_determine_query_token_by_key_query(char *k_query, char **out_token, dart_op uint64_t get_server_id_by_vnode_id(DART *dart, uint64_t vnode_id) { - // printf("vnode_id = %d, dart->num_server = %d\n", vnode_id, dart->num_server); int num_vnode_per_server = dart->num_vnode / dart->num_server; return (vnode_id / num_vnode_per_server) % dart->num_server; } @@ -184,153 +183,6 @@ get_base_virtual_node_id_by_string(DART *dart, char *str) return (rst % (uint64_t)dart->num_vnode); } -// /** -// * This function is for getting the alternative virtual node ID. -// * -// */ -// uint64_t -// get_reconciled_vnode_id_with_power_of_two_choice_rehashing(DART *dart, uint64_t base_vnode_idx, char *word, -// get_server_info_callback get_server_cb) -// { - -// int ir_idx = (int)ceil((double)(dart->alphabet_size / 2)); - -// // base virtual node address always in the first element of the array. -// uint64_t rst = base_vnode_idx; - -// // determine the tree height. -// int tree_height = dart->dart_tree_height; - -// // get serverID for base virtual node -// uint64_t serverId = get_server_id_by_vnode_id(dart, base_vnode_idx); - -// // we first let reconciled virtual node to be the base virtual node. -// uint64_t reconciled_vnode_idx = base_vnode_idx; - -// if (dart->dart_tree_height <= 1) { -// return reconciled_vnode_idx; -// } - -// // The procedure of picking alternative virtual node is important. -// // We first need to know what is the character lying on the leaves of DART partition tree. -// int last_c_index = tree_height - 1; - -// int post_leaf_index = 0; -// int pre_leaf_index = 0; - -// // The pre_leaf_index is the index of character right before the leaf character. -// // The post_leaf_index is the index of character right after the leaf character. -// if (strlen(word) <= tree_height) { -// // if the word is not longer than the tree height, then there is no post-leaf character, therefore -// // post_leaf_index should be 0 -// post_leaf_index = 0; -// // then the last_c_index should be the index of the last character in the alphabet. -// last_c_index = strlen(word) - 1; -// if (strlen(word) <= 1) { -// // if the word contains 0-1 character, there is no pre-leaf character and therefore -// pre_leaf_index -// // should be 0. -// pre_leaf_index = 0; -// } -// else { -// // otherwise, pre_leaf_index should be the index of proceeding character of the -// // leaf-level character in the alphabet. -// pre_leaf_index = (int)word[last_c_index - 1] % dart->alphabet_size; -// } -// } -// else { -// // if the length of the word exceeds the height of the DART partition tree, -// // definitely, post-leaf character exists. -// post_leaf_index = (int)word[last_c_index + 1] % dart->alphabet_size; -// // but, there is a case where DART partition tree is of height 1. -// // in this case, there will be no pre-leaf character. -// if (tree_height <= 1) { -// pre_leaf_index = 0; -// } -// else { -// // otherwise, there will be a pre-leaf character. -// pre_leaf_index = (int)word[last_c_index - 1] % dart->alphabet_size; -// } -// } -// int leaf_index = (int)word[last_c_index] % dart->alphabet_size; - -// int leaf_post_sum = leaf_index + pre_leaf_index + post_leaf_index; -// int leaf_post_diff = abs(post_leaf_index - leaf_index - pre_leaf_index); - -// // int leaf_post_sum = leaf_index + pre_leaf_index + 0; -// // int leaf_post_diff = abs(leaf_index-pre_leaf_index); - -// // We calculate the region size: -// int region_size = dart->num_vnode / dart->alphabet_size; // d=1, rs = 1; d = 2, rs = k; d = 3, rs =k^2; -// // We calculate the sub-region size: -// int sub_region_size = region_size / dart->alphabet_size; // d=1, srs = 0; d = 2, srs = 1; d = 3, srs = -// k; - -// // We calculate the major offset which possibly pick a virtual node in another sub-region. -// int major_offset = (leaf_post_sum % dart->alphabet_size) * (sub_region_size); -// // We calcuate the minor offset which will possibly pick a different virtual node within the same -// // sub-region. -// int minor_offset = leaf_post_diff; -// // Finally the region offset will be some certain virtual node in one region. -// // uint64_t region_offset = (reconciled_vnode_idx + (uint64_t)major_offset - (uint64_t)minor_offset) -// // % (uint64_t)region_size; -// uint64_t region_offset = -// (reconciled_vnode_idx + (uint64_t)major_offset - (uint64_t)minor_offset) % (uint64_t)region_size; -// // Invert region Index: ceil(alphabet_size / 2); - -// int n = 0; -// uint64_t c; -// // uint64_t rst = 0; -// uint64_t i_t_n; -// int met_end = 0; -// for (n = 1; n <= dart->dart_tree_height; n++) { -// if (word[n - 1] == '\0') { -// met_end = 1; -// } -// if (word[n - 1] != '\0' && met_end == 0) { -// if (n == 1) { -// i_t_n = ((int)word[n - 1] + ir_idx) % dart->alphabet_size; -// } -// else if (n == (dart->dart_tree_height - 1)) { -// i_t_n = ((int)word[n - 1] + leaf_post_sum) % dart->alphabet_size; -// } -// else if (n == dart->dart_tree_height) { -// i_t_n = abs((int)word[n - 1] - leaf_post_diff) % dart->alphabet_size; -// } -// } -// c = (i_t_n) * ((uint64_t)uint32_pow(dart->alphabet_size, dart->dart_tree_height - n)); -// rst += c; -// } - -// int alterV = (rst % (uint64_t)dart->num_vnode); - -// // // We also calculate the region start position. -// // uint64_t region_start = ((((int)word[0]+ir_idx) % dart->alphabet_size)) * region_size;// -// // ((reconciled_vnode_idx)/region_size) * (region_size); -// // // Finally, the reconciled vnode index is calculated. -// // // reconciled_vnode_idx = (0 + region_start + region_offset) % dart->num_vnode; -// // reconciled_vnode_idx = (reconciled_vnode_idx + region_start + region_offset) % dart->num_vnode; - -// // Only when inserting a word, we do such load detection. -// // get alternative virtual node and therefore the alternative server ID. -// int reconcile_serverId = get_server_id_by_vnode_id(dart, alterV); -// if (get_server_cb != NULL) { -// // Check both physical server to see which one has smaller number of indexed keywords on it. -// dart_server origin_server = get_server_cb(serverId); -// dart_server reconciled_server = get_server_cb(reconcile_serverId); -// // printf("For keyword %s, choosing between %d and %d\n", word, serverId, reconcile_serverId); - -// if (origin_server.indexed_word_count > reconciled_server.indexed_word_count) { -// // printf("Reconcile happened. from %d to %d\n", vnode_idx , reconciled_vnode_idx); -// rst = alterV; -// } -// } -// else { -// rst = alterV; -// } -// return rst; -// } - /** * This function is for getting the alternative virtual node ID. * @@ -439,10 +291,8 @@ get_reconciled_vnode_id_with_power_of_two_choice_rehashing_2(DART *dart, uint64_ dart_server reconciled_server; reconciled_server.id = reconcile_serverId; get_server_cb(&reconciled_server); - // printf("For keyword %s, choosing between %d and %d\n", word, serverId, reconcile_serverId); if (origin_server.indexed_word_count > reconciled_server.indexed_word_count) { - // printf("Reconcile happened. from %d to %d\n", vnode_idx , reconciled_vnode_idx); rst = reconciled_vnode_idx; } } @@ -699,7 +549,6 @@ DART_hash(DART *dart_g, char *key, dart_op_type_t op_type, get_server_info_callb loop_count = 2; #endif } - // printf("[DART_hash] key = %s\n", key); int iter = 0; int is_suffix = 0; for (iter = 0; iter < loop_count; iter++) { diff --git a/src/commons/index/dart/dart_core_test.c b/src/commons/index/dart/dart_core_test.c index 43ac0b7d3..51339458d 100644 --- a/src/commons/index/dart/dart_core_test.c +++ b/src/commons/index/dart/dart_core_test.c @@ -1,4 +1,5 @@ #include "dart_core.h" +#include "pdc_logger.h" int32_t request_count_g; @@ -15,7 +16,7 @@ main(int argc, char *argv[]) { if (argc != 4) { - printf("Usage: %s \n", argv[0]); + LOG_JUST_PRINT("Usage: %s \n", argv[0]); return 1; } @@ -46,47 +47,47 @@ main(int argc, char *argv[]) index_hash_result_t *out; int array_len = DART_hash(&dart, query_str, OP_INSERT, NULL, &out); // print out in the same line - printf("server ids for insert (%d): \n{", array_len); + LOG_JUST_PRINT("server ids for insert (%d): \n{", array_len); for (int i = 0; i < array_len; i++) { - printf(" %d : %s,\n", out[i].server_id, out[i].key); + LOG_JUST_PRINT(" %d : %s,\n", out[i].server_id, out[i].key); } - printf("\n}\n"); + LOG_JUST_PRINT("\n}\n"); free(out); array_len = DART_hash(&dart, query_str, OP_EXACT_QUERY, NULL, &out); - printf("server ids for exact search (%d): \n{", array_len); + LOG_JUST_PRINT("server ids for exact search (%d): \n{", array_len); for (int i = 0; i < array_len; i++) { - printf(" %d : %s,\n", out[i].server_id, out[i].key); + LOG_JUST_PRINT(" %d : %s,\n", out[i].server_id, out[i].key); } - printf("\n}\n"); + LOG_JUST_PRINT("\n}\n"); free(out); array_len = DART_hash(&dart, substring(query_str, 0, strlen(query_str) - 3), OP_PREFIX_QUERY, NULL, &out); - printf("server ids for prefix search (%d): \n{", array_len); + LOG_JUST_PRINT("server ids for prefix search (%d): \n{", array_len); for (int i = 0; i < array_len; i++) { - printf(" %d : %s,\n", out[i].server_id, out[i].key); + LOG_JUST_PRINT(" %d : %s,\n", out[i].server_id, out[i].key); } - printf("\n}\n"); + LOG_JUST_PRINT("\n}\n"); free(out); array_len = DART_hash(&dart, substring(query_str, 3, strlen(query_str)), OP_SUFFIX_QUERY, NULL, &out); - printf("server ids for suffix search (%d): \n{", array_len); + LOG_JUST_PRINT("server ids for suffix search (%d): \n{", array_len); for (int i = 0; i < array_len; i++) { - printf(" %d : %s,\n", out[i].server_id, out[i].key); + LOG_JUST_PRINT(" %d : %s,\n", out[i].server_id, out[i].key); } - printf("\n}\n"); + LOG_JUST_PRINT("\n}\n"); free(out); array_len = DART_hash(&dart, substring(query_str, 2, strlen(query_str) - 2), OP_INFIX_QUERY, NULL, &out); - printf("server ids for infix search (%d): \n{", array_len); + LOG_JUST_PRINT("server ids for infix search (%d): \n{", array_len); for (int i = 0; i < array_len; i++) { - printf(" %d : %s,\n", out[i].server_id, out[i].key); + LOG_JUST_PRINT(" %d : %s,\n", out[i].server_id, out[i].key); } - printf("\n}\n"); + LOG_JUST_PRINT("\n}\n"); return 0; } \ No newline at end of file diff --git a/src/commons/index/dart/index/hashtable/hashtable_impl.c b/src/commons/index/dart/index/hashtable/hashtable_impl.c deleted file mode 100644 index 15cbf5e88..000000000 --- a/src/commons/index/dart/index/hashtable/hashtable_impl.c +++ /dev/null @@ -1,174 +0,0 @@ - -// void -// create_hash_table_for_keyword(char *keyword, char *value, size_t len, void *data) -// { -// uint32_t hashVal = djb2_hash(keyword, (int)len); -// printf("%d:", hashVal); -// gen_obj_id_in_t in; -// gen_obj_id_out_t out; - -// in.data.obj_name = keyword; -// in.data.time_step = (int32_t)data; -// in.data.user_id = (uint32_t)data; -// char *taglist = (char *)calloc(256, sizeof(char)); -// printf("%s=%s", keyword, value); -// sprintf(taglist, "%s=%s", keyword, value); -// in.data.tags = taglist; -// in.data.data_location = " "; -// in.data.app_name = " "; -// in.data.ndim = 1; -// in.hash_value = hashVal; - -// PDC_insert_metadata_to_hash_table(&in, &out); -// } - -// int -// brutal_force_partial_search(metadata_query_transfer_in_t *in, uint32_t *n_meta, void ***buf_ptrs, -// char *k_query, char *vfrom_query, char *vto_query, uint32_t *hash_value) -// { -// int result = 0; - -// uint32_t iter = 0; -// HashTableIterator hash_table_iter; -// HashTableValue * head = NULL; -// pdc_metadata_t * elt; -// int n_entry; - -// if (metadata_hash_table_g != NULL) { -// if (hash_value != NULL) { -// head = hash_table_lookup(metadata_hash_table_g, hash_value); -// if (head != NULL) { -// DL_FOREACH(head->metadata, elt) -// { -// // List all objects, no need to check other constraints -// if (in->is_list_all == 1) { -// (*buf_ptrs)[iter++] = elt; -// } -// // check if current metadata matches search constraint -// else if (is_metadata_satisfy_constraint(elt, in) == 1) { -// (*buf_ptrs)[iter++] = elt; -// } -// } -// } -// } -// else { -// n_entry = hash_table_num_entries(metadata_hash_table_g); -// hash_table_iterate(metadata_hash_table_g, &hash_table_iter); - -// while (n_entry != 0 && hash_table_iter_has_more(&hash_table_iter)) { -// head = hash_table_iter_next(&hash_table_iter); -// DL_FOREACH(head->metadata, elt) -// { -// // List all objects, no need to check other constraints -// if (in->is_list_all == 1) { -// (*buf_ptrs)[iter++] = elt; -// } -// // check if current metadata matches search constraint -// else if (is_metadata_satisfy_constraint(elt, in) == 1) { -// (*buf_ptrs)[iter++] = elt; -// } -// } -// } -// } -// *n_meta = iter; - -// printf("==PDC_SERVER: brutal_force_partial_search: Total matching results: %d\n", *n_meta); -// result = 1; -// } // if (metadata_hash_table_g != NULL) -// else { -// printf("==PDC_SERVER: metadata_hash_table_g not initilized!\n"); -// result = 0; -// } - -// return result; -// } - -// void -// search_through_hash_table(char *k_query, uint32_t index_type, pattern_type_t pattern_type, -// pdc_art_iterator_param_t *param) -// { - -// metadata_query_transfer_in_t in; -// in.is_list_all = -1; -// in.user_id = -1; -// in.app_name = " "; -// in.obj_name = " "; -// in.time_step_from = -1; -// in.time_step_to = -1; -// in.ndim = -1; -// in.tags = " "; -// char * qType_string; -// uint32_t n_meta; -// void ** buf_ptrs; -// char * tok; - -// uint32_t *hash_ptr = NULL; -// uint32_t hash_value = -1; - -// switch (pattern_type) { -// case PATTERN_EXACT: -// qType_string = "Exact"; -// tok = k_query; -// if (index_type == 1) { -// hash_value = djb2_hash(tok, (int)strlen(tok)); -// hash_ptr = &hash_value; -// } -// else if (index_type == 2) { -// hash_value = djb2_hash(tok, 1); -// hash_ptr = &hash_value; -// } -// break; -// case PATTERN_PREFIX: -// qType_string = "Prefix"; -// tok = subrstr(k_query, strlen(k_query) - 1); -// if (index_type == 2) { -// hash_value = djb2_hash(tok, 1); -// hash_ptr = &hash_value; -// } -// else { -// hash_ptr = NULL; -// } -// break; -// case PATTERN_SUFFIX: -// qType_string = "Suffix"; -// tok = substr(k_query, 1); -// tok = reverse_str(tok); -// if (index_type == 2) { -// hash_value = djb2_hash(tok, 1); -// hash_ptr = &hash_value; -// } -// else { -// hash_ptr = NULL; -// } -// break; -// case PATTERN_MIDDLE: -// qType_string = "Infix"; -// tok = substring(k_query, 1, strlen(k_query) - 1); -// break; -// default: -// break; -// } - -// int search_rst = brutal_force_partial_search(&in, &n_meta, &buf_ptrs, k_query, NULL, NULL, hash_ptr); -// int i = 0; -// for (i = 0; i < n_meta; i++) { -// pdc_metadata_t *metadata = (pdc_metadata_t *)buf_ptrs[i]; -// hashset_add(param->out, (metadata->user_id)); -// param->total_count = param->total_count + 1; -// } -// } - -// void -// delete_hash_table_for_keyword(char *keyword, size_t len, void *data) -// { -// uint32_t hashVal = djb2_hash(keyword, (int)len); - -// metadata_delete_in_t in; -// metadata_delete_out_t out; - -// in.obj_name = keyword; -// in.time_step = (int32_t)data; -// in.hash_value = hashVal; - -// PDC_delete_metadata_from_hash_table(&in, &out); -// } \ No newline at end of file diff --git a/src/commons/index/dart/index/hashtable/include/hashtable_impl.h b/src/commons/index/dart/index/hashtable/include/hashtable_impl.h deleted file mode 100644 index 238273745..000000000 --- a/src/commons/index/dart/index/hashtable/include/hashtable_impl.h +++ /dev/null @@ -1,25 +0,0 @@ - -// /** -// * @brief Create the metadata index -// * @param in [IN] Input parameters for the create operation -// * @param out [OUT] Output parameters for the create operation -// * @return perr_t SUCCESS on success, FAIL on failure -// */ -// perr_t PDC_Server_metadata_index_create(metadata_index_create_in_t *in, metadata_index_create_out_t *out); - -// /** -// * @brief Delete the metadata index -// * @param in [IN] Input parameters for the delete operation -// * @param out [OUT] Output parameters for the delete operation -// * @return perr_t SUCCESS on success, FAIL on failure -// */ -// perr_t PDC_Server_metadata_index_delete(metadata_index_delete_in_t *in, metadata_index_delete_out_t *out); - -// /** -// * @brief Search the metadata index -// * @param in [IN] Input parameters for the search operation -// * @param out [OUT] Output parameters for the search operation -// * @return perr_t SUCCESS on success, FAIL on failure -// */ -// perr_t PDC_Server_metadata_index_search(metadata_index_search_in_t *in, metadata_index_search_out_t *out, -// uint64_t *n_obj_ids_ptr, uint64_t **buf_ptrs); \ No newline at end of file diff --git a/src/commons/index/dart/index/idioms/idioms_local_index.c b/src/commons/index/dart/index/idioms/idioms_local_index.c index 7f325b33b..16c0d31eb 100644 --- a/src/commons/index/dart/index/idioms/idioms_local_index.c +++ b/src/commons/index/dart/index/idioms/idioms_local_index.c @@ -44,21 +44,11 @@ insert_obj_ids_into_value_leaf(void *index, void *attr_val, int is_trie, size_t size_t num_obj_ids) { perr_t ret = SUCCEED; - // printf("index is %p, obj_id: %llu\n", index, obj_ids[0]); if (index == NULL) { + LOG_ERROR("index was null\n"); return FAIL; } - // if (strcmp((char *)attr_val, "str109str") == 0) { - // printf("attr_val: %s, value_len: %zu, obj_ids: %llu\n", (char *)attr_val, value_len, obj_ids[0]); - // } - // if (strcmp((char *)attr_val, "str096str") == 0) { - // printf("attr_val: %s, value_len: %zu, obj_ids: %llu\n", (char *)attr_val, value_len, obj_ids[0]); - // } - // if (strcmp((char *)attr_val, "str099str") == 0) { - // printf("attr_val: %s, value_len: %zu, obj_ids: %llu\n", (char *)attr_val, value_len, obj_ids[0]); - // } - void *entry = NULL; int idx_found = -1; // -1 not found, 0 found. if (is_trie) { @@ -211,15 +201,6 @@ idioms_local_index_create(IDIOMS_t *idioms, IDIOMS_md_idx_record_t *idx_record) timer_start(&index_timer); art_tree *key_trie = (idx_record->is_key_suffix == 1) ? idioms->art_key_suffix_tree_g : idioms->art_key_prefix_tree_g; - // if (strcmp(key, "str109str") == 0) { - // printf("key: %s, len: %d\n", key, len); - // } - // if (strcmp(key, "str096str") == 0) { - // printf("key: %s, len: %d\n", key, len); - // } - // if (strcmp(key, "str099str") == 0) { - // printf("key: %s, len: %d\n", key, len); - // } insert_into_key_trie(key_trie, key, len, idx_record); /** * Note: in IDIOMS, the client-runtime is responsible for iterating all suffixes of the key. @@ -250,8 +231,9 @@ idioms_local_index_create(IDIOMS_t *idioms, IDIOMS_md_idx_record_t *idx_record) timer_pause(&index_timer); if (DART_SERVER_DEBUG) { - printf("[Server_Side_Insert_%d] Timer to insert a keyword %s : %s into index = %.4f microseconds\n", - idioms->server_id_g, key, idx_record->value, timer_delta_us(&index_timer)); + LOG_DEBUG( + "[Server_Side_Insert_%d] Timer to insert a keyword %s : %s into index = %.4f microseconds\n", + idioms->server_id_g, key, idx_record->value, timer_delta_us(&index_timer)); char value_str[64]; if (idx_record->type == PDC_STRING) { snprintf(value_str, 64, "%s", idx_record->value); @@ -268,11 +250,12 @@ idioms_local_index_create(IDIOMS_t *idioms, IDIOMS_md_idx_record_t *idx_record) else { snprintf(value_str, 64, "[UnknownValue]"); } - printf("[idioms_local_index_create] Client %" PRIu32 " inserted a kvtag \"%s\" : \"%s\" -> %" PRIu64 - " into Server %" PRIu32 " in %.4f microseconds, insert_request_count_g = %" PRId64 - ", index_record_count_g = %" PRId64 "\n", - idx_record->src_client_id, key, value_str, idx_record->obj_ids[0], idioms->server_id_g, - timer_delta_us(&index_timer), idioms->insert_request_count_g, idioms->index_record_count_g); + LOG_DEBUG("[idioms_local_index_create] Client %" PRIu32 + " inserted a kvtag \"%s\" : \"%s\" -> %" PRIu64 " into Server %" PRIu32 + " in %.4f microseconds, insert_request_count_g = %" PRId64 + ", index_record_count_g = %" PRId64 "\n", + idx_record->src_client_id, key, value_str, idx_record->obj_ids[0], idioms->server_id_g, + timer_delta_us(&index_timer), idioms->insert_request_count_g, idioms->index_record_count_g); } idioms->time_to_create_index_g += timer_delta_us(&index_timer); idioms->index_record_count_g++; @@ -495,8 +478,9 @@ idioms_local_index_delete(IDIOMS_t *idioms, IDIOMS_md_idx_record_t *idx_record) // #endif timer_pause(&index_timer); if (DART_SERVER_DEBUG) { - printf("[Server_Side_Delete_%d] Timer to delete a keyword %s : %s from index = %.4f microseconds\n", - idioms->server_id_g, key, idx_record->value, timer_delta_us(&index_timer)); + LOG_DEBUG( + "[Server_Side_Delete_%d] Timer to delete a keyword %s : %s from index = %.4f microseconds\n", + idioms->server_id_g, key, idx_record->value, timer_delta_us(&index_timer)); } idioms->time_to_delete_index_g += timer_delta_us(&index_timer); idioms->index_record_count_g--; @@ -515,7 +499,6 @@ collect_obj_ids(value_index_leaf_content_t *value_index_leaf, IDIOMS_md_idx_reco // get number of object IDs in the set int num_obj_ids = set_num_entries(obj_id_set); - // printf("[SEARCH] obj_id_set: %p, num_obj: %d\n", obj_id_set, num_obj_ids); // realloc the obj_ids array in idx_record idx_record->obj_ids = @@ -532,7 +515,7 @@ collect_obj_ids(value_index_leaf_content_t *value_index_leaf, IDIOMS_md_idx_reco idx_record->num_obj_ids += num_obj_ids; } else { - printf("ERROR: offset %zu != num_obj_ids %d\n", offset, num_obj_ids); + LOG_ERROR("ERROR: offset %zu != num_obj_ids %d\n", offset, num_obj_ids); } return 0; } @@ -543,9 +526,6 @@ value_trie_callback(void *data, const unsigned char *key, uint32_t key_len, void value_index_leaf_content_t *value_index_leaf = (value_index_leaf_content_t *)(value); IDIOMS_md_idx_record_t * idx_record = (IDIOMS_md_idx_record_t *)(data); - // printf("value_trie_callback: key: %s, value: %s, value_index_leaf: %p\n", key, (char - // *)idx_record->value, - // value_index_leaf); char * v_query = (char *)idx_record->value; pattern_type_t value_query_type = determine_pattern_type(v_query); if (value_query_type == PATTERN_MIDDLE) { @@ -566,10 +546,6 @@ value_rbt_callback(rbt_t *rbt, void *key, size_t klen, void *value, void *priv) { value_index_leaf_content_t *value_index_leaf = (value_index_leaf_content_t *)(value); IDIOMS_md_idx_record_t * idx_record = (IDIOMS_md_idx_record_t *)(priv); - - // printf("value_rbt_callback: key: %s, value: %s, value_index_leaf: %p\n", (char *)key, - // (char *)idx_record->value, value_index_leaf); - if (value_index_leaf != NULL) { collect_obj_ids(value_index_leaf, idx_record); } @@ -636,7 +612,7 @@ value_number_query(char *secondary_query, key_index_leaf_content_t *leafcnt, // the string is not ended or started with '~', and if it contains '~', it is a in-between query. split_string(secondary_query, "~", &tokens, &num_tokens); if (num_tokens != 2) { - printf("ERROR: invalid range query: %s\n", secondary_query); + LOG_ERROR("ERROR: invalid range query: %s\n", secondary_query); return -1; } char *lo_tok = tokens[0]; @@ -881,9 +857,9 @@ idioms_local_index_search(IDIOMS_t *idioms, IDIOMS_md_idx_record_t *idx_record) timer_pause(&index_timer); if (DART_SERVER_DEBUG) { - printf("[Server_Side_%s_%d] Time to address query '%s' and get %d results = %.4f microseconds\n", - qType_string, idioms->server_id_g, query, idx_record->num_obj_ids, - timer_delta_us(&index_timer)); + LOG_DEBUG("[Server_Side_%s_%d] Time to address query '%s' and get %d results = %.4f microseconds\n", + qType_string, idioms->server_id_g, query, idx_record->num_obj_ids, + timer_delta_us(&index_timer)); } idioms->time_to_search_index_g += timer_delta_us(&index_timer); idioms->search_request_count_g += 1; diff --git a/src/commons/index/dart/index/idioms/idioms_local_index_test.c b/src/commons/index/dart/index/idioms/idioms_local_index_test.c index ce0ca3551..343d86c2d 100644 --- a/src/commons/index/dart/index/idioms/idioms_local_index_test.c +++ b/src/commons/index/dart/index/idioms/idioms_local_index_test.c @@ -2,6 +2,7 @@ #include "dart_core.h" #include "bulki.h" #include "assert.h" +#include "pdc_logger.h" typedef enum { IDIOMS_INSERT = 1, IDIOMS_DELETE = 2, IDIOMS_QUERY = 3 } IDIOMS_OP_TYPE; @@ -184,7 +185,6 @@ server_perform_delete(dummy_server_t *server, char *key, BULKI_Entity *value_ent void server_perform_operation(dummy_server_t *server) { - // printf("Perform operation on server %d\n", server->id); BULKI_Entity * resultBent = empty_Bent_Array_Entity(); BULKI_Entity * bentArr = BULKI_Entity_deserialize(server->buffer_in); BULKI_Entity * opType_ent = BULKI_ENTITY_get_BULKI_Entity(bentArr, 0); @@ -266,18 +266,18 @@ client_insert_data(dummy_client_t *client, int id) result |= client_parse_response(client, NULL, NULL); } char *result_str = result == SUCCEED ? "SUCCEED" : "FAILED"; - printf("Insert result: %s\n", result_str); + LOG_INFO("Insert result: %s\n", result_str); return result; } void client_print_result(uint64_t *rst_ids, uint64_t rst_count) { - printf("Result count : %" PRIu64 " | ", rst_count); + LOG_JUST_PRINT("Result count : %" PRIu64 " | ", rst_count); for (int i = 0; i < rst_count; i++) { - printf("%lu ", rst_ids[i]); + LOG_JUST_PRINT("%lu ", rst_ids[i]); } - printf("|\n"); + LOG_JUST_PRINT("|\n"); } uint64_t @@ -347,7 +347,7 @@ client_delete_data(dummy_client_t *client, int id) result |= client_parse_response(client, NULL, NULL); } char *result_str = result == SUCCEED ? "SUCCEED" : "FAILED"; - printf("Delete result: %s\n", result_str); + LOG_INFO("Delete result: %s\n", result_str); return result; } @@ -460,30 +460,32 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) switch (query_series) { case 0: if (nres != 1) { - printf("fail to query kvtag [%s] with rank %d. Expect 1 result but got %d result\n", - "str109str=str109str", world_rank, nres); + LOG_ERROR("fail to query kvtag [%s] with rank %d. Expect 1 result but got %d result\n", + "str109str=str109str", world_rank, nres); step_failed = 0; } if (pdc_ids[0] != 109) { - printf("fail to query kvtag [%s] with rank %d. Expect 1 result which is 109, but got result " - "%" PRIu64 ".\n", - "str109str=str109str", world_rank, pdc_ids[0]); + LOG_ERROR( + "fail to query kvtag [%s] with rank %d. Expect 1 result which is 109, but got result " + "%" PRIu64 ".\n", + "str109str=str109str", world_rank, pdc_ids[0]); step_failed = 0; } break; case 1: if (nres != 10) { - printf("fail to query kvtag [%s] with rank %d. Expect 10 Result, but got %d result.\n", - "str09*=str09*", world_rank, nres); + LOG_ERROR("fail to query kvtag [%s] with rank %d. Expect 10 Result, but got %d result.\n", + "str09*=str09*", world_rank, nres); step_failed = 1; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { - printf("fail to query kvtag [%s] with rank %d. The %d th result does not match. Expect " - "%d, but got %" PRIu64 "\n", - "str09*=str09*", world_rank, i, i + 90, pdc_ids[i]); + LOG_ERROR( + "fail to query kvtag [%s] with rank %d. The %d th result does not match. Expect " + "%d, but got %" PRIu64 "\n", + "str09*=str09*", world_rank, i, i + 90, pdc_ids[i]); step_failed = 1; break; } @@ -491,17 +493,18 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 2: if (nres != 10) { - printf("fail to query kvtag [%s] with rank %d. Expect 10 result, but got %d result.\n", - "*09str=*09str", world_rank, nres); + LOG_ERROR("fail to query kvtag [%s] with rank %d. Expect 10 result, but got %d result.\n", + "*09str=*09str", world_rank, nres); step_failed = 2; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i * 10 + 9) { - printf("fail to query kvtag [%s] with rank %d. The $d th result does not match. Expect " - "%d, but got %" PRIu64 "\n", - "*09str=*09str", world_rank, i, i * 10 + 9, pdc_ids[i]); + LOG_ERROR( + "fail to query kvtag [%s] with rank %d. The $d th result does not match. Expect " + "%d, but got %" PRIu64 "\n", + "*09str=*09str", world_rank, i, i * 10 + 9, pdc_ids[i]); step_failed = 2; break; } @@ -509,8 +512,8 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 3: if (nres != 20) { - printf("fail to query kvtag [%s] with rank %d. Expected 20 results, but got %d results\n", - "*09*=*09*", world_rank, nres); + LOG_ERROR("fail to query kvtag [%s] with rank %d. Expected 20 results, but got %d results\n", + "*09*=*09*", world_rank, nres); step_failed = 3; } // the result is not in order, so we need to sort the result first @@ -519,9 +522,10 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) 99, 109, 209, 309, 409, 509, 609, 709, 809, 909}; for (i = 0; i < nres; i++) { if (pdc_ids[i] != expected[i]) { - printf("fail to query kvtag [%s] with rank %d. The %d th result does not match. Expect " - "%" PRIu64 ", but got %" PRIu64 " results.\n", - "*09*=*09*", world_rank, i, expected[i], pdc_ids[i]); + LOG_ERROR( + "fail to query kvtag [%s] with rank %d. The %d th result does not match. Expect " + "%" PRIu64 ", but got %" PRIu64 " results.\n", + "*09*=*09*", world_rank, i, expected[i], pdc_ids[i]); step_failed = 3; break; } @@ -529,12 +533,12 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 4: if (nres != 1) { - printf("fail to query kvtag [%s] with rank %d. Expected 1 result, but got %d results\n", - "intkey=109", world_rank, nres); + LOG_ERROR("fail to query kvtag [%s] with rank %d. Expected 1 result, but got %d results\n", + "intkey=109", world_rank, nres); step_failed = 4; } if (pdc_ids[0] != 109) { - printf( + LOG_ERROR( "fail to query kvtag [%s] with rank %d. Expected 1 result which is 109, but got %" PRIu64 "\n", "intkey=109", world_rank, pdc_ids[0]); @@ -543,17 +547,19 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 5: if (nres != 10) { - printf("fail to query kvtag [%s] with rank %d. Expected 10 results, but got %d results. \n", - "intkey=90|~|99", world_rank, nres); + LOG_ERROR( + "fail to query kvtag [%s] with rank %d. Expected 10 results, but got %d results. \n", + "intkey=90|~|99", world_rank, nres); step_failed = 5; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { - printf("fail to query kvtag [%s] with rank %d. The %d th result does not match, expect " - "%d but got %" PRIu64 "\n", - "intkey=90|~|99", world_rank, i, i + 90, pdc_ids[i]); + LOG_ERROR( + "fail to query kvtag [%s] with rank %d. The %d th result does not match, expect " + "%d but got %" PRIu64 "\n", + "intkey=90|~|99", world_rank, i, i + 90, pdc_ids[i]); step_failed = 5; break; } @@ -602,10 +608,10 @@ perform_loop_test(int num_clients, int num_servers) uint64_t *rst_ids = NULL; uint64_t rst_count = client_perform_search(&clients[client_rank], query, &rst_ids); if (validate_query_result(client_rank, rst_count, rst_ids) == -1) { - printf("query [%s] with rank %d succeed\n", query, client_rank); + LOG_INFO("query [%s] with rank %d succeed\n", query, client_rank); } else { - printf("query [%s] with rank %d failed\n", query, client_rank); + LOG_ERROR("query [%s] with rank %d failed\n", query, client_rank); } } } diff --git a/src/commons/index/dart/index/idioms/idioms_persistence.c b/src/commons/index/dart/index/idioms/idioms_persistence.c index 8b2b36ac6..e1a00f1f8 100644 --- a/src/commons/index/dart/index/idioms/idioms_persistence.c +++ b/src/commons/index/dart/index/idioms/idioms_persistence.c @@ -127,7 +127,6 @@ append_attr_name_node(void *data, const unsigned char *key, uint32_t key_len, vo kv_bulki = BULKI_init(1); // one key-value pair hash_table_insert(vnode_buf_ht, &(leafcnt->virtural_node_id), kv_bulki); } - // printf("[PERSISTENCE]key = %s\n", key); BULKI_Entity *key_entity = BULKI_ENTITY((void *)key, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *data_entity = BULKI_get(kv_bulki, key_entity); diff --git a/src/commons/logging/include/pdc_logger.h b/src/commons/logging/include/pdc_logger.h index d7a6c110b..c15412fda 100644 --- a/src/commons/logging/include/pdc_logger.h +++ b/src/commons/logging/include/pdc_logger.h @@ -5,6 +5,7 @@ #include #include #include +#include #define MAX_LOG_MSG_LENGTH 1024 #define MAX_LOG_FILE_SIZE (10 * 1024 * 1024) // 10 MB @@ -20,18 +21,34 @@ void setLogFile(PDC_LogLevel level, const char *fileName); void setLogLevel(PDC_LogLevel level); -void log_message(PDC_LogLevel level, const char *format, ...); - -void log_message_nlf(PDC_LogLevel level, const char *format, ...); - -#define LOG_ERROR(format, ...) log_message(LOG_LEVEL_ERROR, format, ##__VA_ARGS__) -#define LOG_WARNING(format, ...) log_message(LOG_LEVEL_WARNING, format, ##__VA_ARGS__) -#define LOG_INFO(format, ...) log_message(LOG_LEVEL_INFO, format, ##__VA_ARGS__) -#define LOG_DEBUG(format, ...) log_message(LOG_LEVEL_DEBUG, format, ##__VA_ARGS__) - -#define NLF_LOG_ERROR(format, ...) log_message_nlf(LOG_LEVEL_ERROR, format, ##__VA_ARGS__) -#define NLF_LOG_WARNING(format, ...) log_message_nlf(LOG_LEVEL_WARNING, format, ##__VA_ARGS__) -#define NLF_LOG_INFO(format, ...) log_message_nlf(LOG_LEVEL_INFO, format, ##__VA_ARGS__) -#define NLF_LOG_DEBUG(format, ...) log_message_nlf(LOG_LEVEL_DEBUG, format, ##__VA_ARGS__) +/** + * just_print is equivalent to calling printf("%s", args) meaning no extra information + * such as the file and line number will be printed + */ +void log_message(bool just_print, PDC_LogLevel level, const char *file, const char *func, int line_number, + const char *format, ...); + +void log_message_nlf(PDC_LogLevel level, const char *file, const char *func, int line_number, + const char *format, ...); + +#define LOG_ERROR(format, ...) \ + log_message(false, LOG_LEVEL_ERROR, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) +#define LOG_WARNING(format, ...) \ + log_message(false, LOG_LEVEL_WARNING, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) +#define LOG_INFO(format, ...) \ + log_message(false, LOG_LEVEL_INFO, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) +#define LOG_DEBUG(format, ...) \ + log_message(false, LOG_LEVEL_DEBUG, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) +#define LOG_JUST_PRINT(format, ...) \ + log_message(true, LOG_LEVEL_INFO, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) + +#define NLF_LOG_ERROR(format, ...) \ + log_message_nlf(LOG_LEVEL_ERROR, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) +#define NLF_LOG_WARNING(format, ...) \ + log_message_nlf(LOG_LEVEL_WARNING, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) +#define NLF_LOG_INFO(format, ...) \ + log_message_nlf(LOG_LEVEL_INFO, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) +#define NLF_LOG_DEBUG(format, ...) \ + log_message_nlf(LOG_LEVEL_DEBUG, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) #endif // PDC_LOGGER_H \ No newline at end of file diff --git a/src/commons/logging/pdc_logger.c b/src/commons/logging/pdc_logger.c index 6952f44bc..215f72707 100644 --- a/src/commons/logging/pdc_logger.c +++ b/src/commons/logging/pdc_logger.c @@ -58,8 +58,23 @@ rotate_log_file(PDC_LogLevel level) logFiles[level] = fopen(logFilenames[level], "a"); } +static FILE * +get_cur_log_file(PDC_LogLevel level) +{ + // Rotate log file if it exceeds the maximum size, but this doesn't apply to stdout and stderr + if (logFiles[level] != stdout && logFiles[level] != stderr) { + struct stat st; + stat(logFilenames[level], &st); + if (st.st_size >= MAX_LOG_FILE_SIZE) { + rotate_log_file(level); + } + } + return logFiles[level] ? logFiles[level] : stdout; +} + void -_log_message(int lf, PDC_LogLevel level, const char *format, va_list args) +_log_message(int lf, PDC_LogLevel level, const char *file, const char *func, int line_number, + const char *format, va_list args) { if (level > logLevel) { return; @@ -81,43 +96,57 @@ _log_message(int lf, PDC_LogLevel level, const char *format, va_list args) break; } - char *log_format = (lf == 1) ? "[%s.%06ld] [%s] %s\n" : "[%s.%06ld] [%s] %s"; - - char *message = (char *)calloc(MAX_LOG_MSG_LENGTH + 1, sizeof(char)); - vsnprintf(message, MAX_LOG_MSG_LENGTH, format, args); + // Extract only the filename (stem) from the full path + const char *filename = strrchr(file, '/'); + if (filename) { + filename++; + } + else { + filename = file; + } + // Properly format timestamp struct timeval tv; gettimeofday(&tv, NULL); - struct tm *timeinfo = localtime(&tv.tv_sec); - char * timestr = (char *)calloc(20, sizeof(char)); - strftime(timestr, 19, "%Y-%m-%d %H:%M:%S", timeinfo); + struct tm timeinfo; + localtime_r(&tv.tv_sec, &timeinfo); - // Rotate log file if it exceeds the maximum size, but this doesn't apply to stdout and stderr - if (logFiles[level] != stdout && logFiles[level] != stderr) { - struct stat st; - stat(logFilenames[level], &st); - if (st.st_size >= MAX_LOG_FILE_SIZE) { - rotate_log_file(level); - } - } - FILE *logFile = logFiles[level] ? logFiles[level] : stdout; - fprintf(logFile, log_format, timestr, tv.tv_usec, prefix, message); + char timestr[30]; + strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", &timeinfo); + + const char *log_format = "[%s.%06ld] [%s] [%s:%s:%d] %s"; + + char message[MAX_LOG_MSG_LENGTH + 1]; + vsnprintf(message, MAX_LOG_MSG_LENGTH, format, args); + + FILE *logFile = get_cur_log_file(level); + fprintf(logFile, log_format, timestr, tv.tv_usec, prefix, filename, func, line_number, message); + fflush(logFile); } void -log_message_nlf(PDC_LogLevel level, const char *format, ...) +log_message_nlf(PDC_LogLevel level, const char *file, const char *func, int line_number, const char *format, + ...) { va_list args; va_start(args, format); - _log_message(0, level, format, args); + _log_message(0, level, file, func, line_number, format, args); va_end(args); } void -log_message(PDC_LogLevel level, const char *format, ...) +log_message(bool just_print, PDC_LogLevel level, const char *file, const char *func, int line_number, + const char *format, ...) { + va_list args; va_start(args, format); - _log_message(1, level, format, args); + if (just_print) { + FILE *logFile = get_cur_log_file(level); + fprintf(logFile, file, func, line_number, format, args); + } + else { + _log_message(1, level, file, func, line_number, format, args); + } va_end(args); } \ No newline at end of file diff --git a/src/commons/profiling/pdc_hashtab.c b/src/commons/profiling/pdc_hashtab.c index e59b7e3ba..3483e5ef3 100644 --- a/src/commons/profiling/pdc_hashtab.c +++ b/src/commons/profiling/pdc_hashtab.c @@ -37,6 +37,7 @@ Boston, MA 02111-1307, USA. */ #include #include "pdc_config.h" #include "pdc_hashtab.h" +#include "pdc_logger.h" /* This macro defines reserved value for empty table entry. */ @@ -113,7 +114,7 @@ static unsigned long higher_prime_number(n) unsigned long n; /* If we've run out of primes, abort. */ if (n > *low) { - fprintf(stderr, "Cannot find prime bigger than %lu\n", n); + LOG_ERROR("Cannot find prime bigger than %lu\n", n); abort(); } diff --git a/src/commons/profiling/pdc_stack_ops.c b/src/commons/profiling/pdc_stack_ops.c index fab9f274a..38dc65a26 100644 --- a/src/commons/profiling/pdc_stack_ops.c +++ b/src/commons/profiling/pdc_stack_ops.c @@ -2,6 +2,7 @@ #include #include #include "pdc_stack_ops.h" +#include "pdc_logger.h" #include "pdc_hashtab.h" profileEntry_t *calltree = NULL; @@ -196,8 +197,8 @@ show_profile_info(void **ht_live_entry, void *extraInfo ATTRIBUTE(unused)) if (count == 0) puts(header); totalTime = thisEntry->totalTime; - printf("%s\n %d\t%-6" PRId64 " %6" PRId64 ",%6" PRId64 "\t\t %s\n", LineBreak, ++count, totalCalls, - totalTime.tv_sec / totalCalls, totalTime.tv_nsec / totalCalls, thisEntry->ftnkey); + LOG_INFO("%s\n %d\t%-6" PRId64 " %6" PRId64 ",%6" PRId64 "\t\t %s\n", LineBreak, ++count, totalCalls, + totalTime.tv_sec / totalCalls, totalTime.tv_nsec / totalCalls, thisEntry->ftnkey); } return TRUE; diff --git a/src/commons/query/qc_parser.c b/src/commons/query/qc_parser.c index 2a1b21ec5..b2c015156 100644 --- a/src/commons/query/qc_parser.c +++ b/src/commons/query/qc_parser.c @@ -1,22 +1,23 @@ #include "qc_parser.h" +#include "pdc_logger.h" void printSubExpression(char *expression, Condition *condition) { if (condition == NULL) { - printf("NULL\n"); + LOG_JUST_PRINT("NULL\n"); return; } - printf("level %d, logical op: %s, start: %d, end: %d ", condition->level, logicalOpStr[condition->op], - condition->start, condition->end); - printf("["); + LOG_JUST_PRINT("level %d, logical op: %s, start: %d, end: %d ", condition->level, + logicalOpStr[condition->op], condition->start, condition->end); + LOG_JUST_PRINT("["); for (int i = condition->start; i < condition->end; i++) { - printf("%c", expression[i]); + LOG_JUST_PRINT("%c", expression[i]); } - printf("]\n"); - printf("left:"); + LOG_JUST_PRINT("]\n"); + LOG_JUST_PRINT("left:"); printSubExpression(expression, condition->left); - printf("right:"); + LOG_JUST_PRINT("right:"); printSubExpression(expression, condition->right); } @@ -112,7 +113,6 @@ extractExpression(char *expression, Condition *condition) if (expression[i1] == ')') { levelCounter--; } - // printf("i1: %d, i2: %d, levelCounter: %d\n", i1, i2, levelCounter); if (levelCounter == condition->level) { int conditionFound = 0; if (expression[i1] == 'O' && expression[i2] == 'R') { // FOUND OR on the same level @@ -164,7 +164,6 @@ splitCondition(char *expression, Condition *condition) if (expression[i1] == ')') { levelCounter--; } - // printf("i1: %d, i2: %d, levelCounter: %d\n", i1, i2, levelCounter); if (levelCounter == condition->level) { int conditionFound = 0; if (expression[i1] == 'O' && expression[i2] == 'R') { // FOUND OR on the same level @@ -238,11 +237,11 @@ void printSubClauses(char *expression, subClause *subPtr, int numSubClauses) { for (int i = 0; i < numSubClauses; i++) { - printf("SubClause %d: Level: %d, Expression: ", i, subPtr[i].level); + LOG_JUST_PRINT("SubClause %d: Level: %d, Expression: ", i, subPtr[i].level); for (int j = subPtr[i].start; j <= subPtr[i].end; j++) { - printf("%c", expression[j]); + LOG_JUST_PRINT("%c", expression[j]); } - printf("\n"); + LOG_JUST_PRINT("\n"); if (subPtr[i].numSubClauses > 0) { printSubClauses(expression, subPtr[i].subClauseArray, subPtr[i].numSubClauses); } diff --git a/src/commons/serde/bulki/bulki.c b/src/commons/serde/bulki/bulki.c index 506ac560d..8a9b607f7 100644 --- a/src/commons/serde/bulki/bulki.c +++ b/src/commons/serde/bulki/bulki.c @@ -1,5 +1,6 @@ #include "bulki.h" #include "bulki_vle_util.h" +#include "pdc_logger.h" size_t get_BULKI_Entity_size(BULKI_Entity *bulk_entity) @@ -64,44 +65,44 @@ void BULKI_Entity_print(BULKI_Entity *bulk_entity) { if (bulk_entity == NULL) { - printf("Error: bulki_entity is NULL\n"); + LOG_ERROR("bulki_entity is NULL\n"); return; } - printf("BULKI_Entity:\n"); - printf("pdc_class: %d\n", bulk_entity->pdc_class); - printf("pdc_type: %d\n", bulk_entity->pdc_type); - printf("count: %zu\n", bulk_entity->count); - printf("size: %zu\n", bulk_entity->size); + LOG_INFO("BULKI_Entity:\n"); + LOG_INFO("pdc_class: %d\n", bulk_entity->pdc_class); + LOG_INFO("pdc_type: %d\n", bulk_entity->pdc_type); + LOG_INFO("count: %zu\n", bulk_entity->count); + LOG_INFO("size: %zu\n", bulk_entity->size); if (bulk_entity->pdc_class == PDC_CLS_ARRAY) { if (bulk_entity->pdc_type == PDC_BULKI) { BULKI *bulki_array = (BULKI *)bulk_entity->data; for (size_t i = 0; i < bulk_entity->count; i++) { - printf("BULKI[%zu]:\n", i); + LOG_INFO("BULKI[%zu]:\n", i); BULKI_print(&bulki_array[i]); } } else if (bulk_entity->pdc_type == PDC_BULKI_ENT) { BULKI_Entity *bulki_entity_array = (BULKI_Entity *)bulk_entity->data; for (size_t i = 0; i < bulk_entity->count; i++) { - printf("BULKI_Entity[%zu]:\n", i); + LOG_INFO("BULKI_Entity[%zu]:\n", i); BULKI_Entity_print(&bulki_entity_array[i]); } } else { - printf("BULKI_Entity[%zu]:\n", bulk_entity->count); + LOG_INFO("BULKI_Entity[%zu]:\n", bulk_entity->count); for (size_t i = 0; i < bulk_entity->count; i++) { - printf("%s : ", DataTypeNames[bulk_entity->pdc_type]); + LOG_INFO("%s : ", DataTypeNames[bulk_entity->pdc_type]); } - printf("\n"); + LOG_INFO("\n"); } } else if (bulk_entity->pdc_class == PDC_CLS_ITEM) { if (bulk_entity->pdc_type == PDC_BULKI) { - printf("BULKI:\n"); + LOG_INFO("BULKI:\n"); BULKI_print((BULKI *)bulk_entity->data); } else { - printf("%s\n", DataTypeNames[bulk_entity->pdc_type]); + LOG_INFO("%s\n", DataTypeNames[bulk_entity->pdc_type]); } } } @@ -110,18 +111,18 @@ void BULKI_print(BULKI *bulki) { if (bulki == NULL) { - printf("Error: bulki is NULL\n"); + LOG_ERROR("Error: bulki is NULL\n"); return; } - printf("BULKI:\n"); - printf("totalSize: %zu\n", bulki->totalSize); - printf("numKeys: %zu\n", bulki->numKeys); - printf("headerSize: %zu\n", bulki->header->headerSize); - printf("dataSize: %zu\n", bulki->data->dataSize); + LOG_INFO("BULKI:\n"); + LOG_INFO("totalSize: %zu\n", bulki->totalSize); + LOG_INFO("numKeys: %zu\n", bulki->numKeys); + LOG_INFO("headerSize: %zu\n", bulki->header->headerSize); + LOG_INFO("dataSize: %zu\n", bulki->data->dataSize); for (size_t i = 0; i < bulki->numKeys; i++) { - printf("key[%zu]:\n", i); + LOG_INFO("key[%zu]:\n", i); BULKI_Entity_print(&bulki->header->keys[i]); - printf("value[%zu]:\n", i); + LOG_INFO("value[%zu]:\n", i); BULKI_Entity_print(&bulki->data->values[i]); } } @@ -154,11 +155,11 @@ BULKI_Entity * BULKI_ENTITY_append_BULKI(BULKI_Entity *dest, BULKI *src) { if (src == NULL || dest == NULL) { - printf("Error: bulki is NULL\n"); + LOG_ERROR("Error: bulki is NULL\n"); return NULL; } if (dest->pdc_class != PDC_CLS_ARRAY || dest->pdc_type != PDC_BULKI) { - printf("Error: dest is not an array of BULKI structure\n"); + LOG_ERROR("Error: dest is not an array of BULKI structure\n"); return NULL; } dest->count = dest->count + 1; @@ -172,16 +173,16 @@ BULKI * BULKI_ENTITY_get_BULKI(BULKI_Entity *bulki_entity, size_t idx) { if (bulki_entity == NULL) { - printf("Error: bulki_entity is NULL\n"); + LOG_ERROR("Error: bulki_entity is NULL\n"); return NULL; } if (bulki_entity->pdc_class != PDC_CLS_ARRAY || bulki_entity->pdc_type != PDC_BULKI) { - printf("Error: bulki_entity is not an array of BULKI structure\n"); + LOG_ERROR("Error: bulki_entity is not an array of BULKI structure\n"); return NULL; } if (idx >= bulki_entity->count) { - printf("idx = %d, count = %d Warning: index for bulki_entity is out of bound\n", idx, - bulki_entity->count); + LOG_WARNING("idx = %d, count = %d Warning: index for bulki_entity is out of bound\n", idx, + bulki_entity->count); return NULL; } return &((BULKI *)bulki_entity->data)[idx]; @@ -191,11 +192,11 @@ BULKI_Entity * BULKI_ENTITY_append_BULKI_Entity(BULKI_Entity *dest, BULKI_Entity *src) { if (src == NULL || dest == NULL) { - printf("Error: bulki is NULL\n"); + LOG_ERROR("Error: bulki is NULL\n"); return NULL; } if (dest->pdc_class != PDC_CLS_ARRAY || dest->pdc_type != PDC_BULKI_ENT) { - printf("Error: dest is not an array of BULKI_Entity structure\n"); + LOG_ERROR("Error: dest is not an array of BULKI_Entity structure\n"); return NULL; } dest->count = dest->count + 1; @@ -209,16 +210,14 @@ BULKI_Entity * BULKI_ENTITY_get_BULKI_Entity(BULKI_Entity *bulki_entity, size_t idx) { if (bulki_entity == NULL) { - printf("Error: bulki_entity is NULL\n"); + LOG_ERROR("Error: bulki_entity is NULL\n"); return NULL; } if (bulki_entity->pdc_class != PDC_CLS_ARRAY || bulki_entity->pdc_type != PDC_BULKI_ENT) { - printf("Error: bulki_entity is not an array of BULKI_Entity structure\n"); + LOG_ERROR("Error: bulki_entity is not an array of BULKI_Entity structure\n"); return NULL; } if (idx >= bulki_entity->count) { - // printf("idx = %d, count = %d Warning: index for bulki_entity is out of bound\n", idx, - // bulki_entity->count); return NULL; } return &((BULKI_Entity *)bulki_entity->data)[idx]; @@ -228,7 +227,7 @@ BULKI_Entity * BULKI_ENTITY(void *data, uint64_t count, pdc_c_var_type_t pdc_type, pdc_c_var_class_t pdc_class) { if (pdc_type == PDC_BULKI_ENT && pdc_class == PDC_CLS_ITEM) { - printf("Error: BULKI_Entity cannot be an single item in another BULKI_Entity\n"); + LOG_ERROR("Error: BULKI_Entity cannot be an single item in another BULKI_Entity\n"); return NULL; } BULKI_Entity *bulki_entity = (BULKI_Entity *)calloc(1, sizeof(BULKI_Entity)); @@ -287,7 +286,6 @@ BULKI_Entity_equal(BULKI_Entity *be1, BULKI_Entity *be2) int meta_equal = be1->pdc_type == be2->pdc_type && be1->pdc_class == be2->pdc_class && be1->count == be2->count && be1->size == be2->size; if (!meta_equal) { - // printf("Error: be1 and be2 are not equal in terms of metadata\n"); return 0; } if (be1->pdc_class == PDC_CLS_ARRAY) { @@ -296,7 +294,6 @@ BULKI_Entity_equal(BULKI_Entity *be1, BULKI_Entity *be2) BULKI *bulki_array2 = (BULKI *)be2->data; for (size_t i = 0; i < be1->count; i++) { if (!BULKI_equal(&bulki_array1[i], &bulki_array2[i])) { - // printf("Error: be1 and be2 are not equal in terms of BULKI data in the array\n"); return 0; } } @@ -306,15 +303,12 @@ BULKI_Entity_equal(BULKI_Entity *be1, BULKI_Entity *be2) BULKI_Entity *bulki_entity_array2 = (BULKI_Entity *)be2->data; for (size_t i = 0; i < be1->count; i++) { if (!BULKI_Entity_equal(&bulki_entity_array1[i], &bulki_entity_array2[i])) { - // printf("Error: be1 and be2 are not equal in terms of BULKI_Entity data in the - // array\n"); return 0; } } } else { if (memcmp(be1->data, be2->data, be1->size - sizeof(uint8_t) * 2 - sizeof(uint64_t) * 2) != 0) { - // printf("Error: be1 and be2 are not equal in terms of base type data in the array\n"); return 0; } } @@ -322,13 +316,11 @@ BULKI_Entity_equal(BULKI_Entity *be1, BULKI_Entity *be2) else if (be1->pdc_class == PDC_CLS_ITEM) { if (be1->pdc_type == PDC_BULKI) { if (!BULKI_equal((BULKI *)be1->data, (BULKI *)be2->data)) { - // printf("Error: be1 and be2 are not equal in terms of BULKI data\n"); return 0; } } else { if (memcmp(be1->data, be2->data, be1->size - sizeof(uint8_t) * 2 - sizeof(uint64_t) * 2) != 0) { - // printf("Error: be1 and be2 are not equal in terms of base type data\n"); return 0; } } @@ -342,13 +334,13 @@ BULKI_equal(BULKI *bulki1, BULKI *bulki2) if (bulki1->numKeys != bulki2->numKeys || bulki1->totalSize != bulki2->totalSize || bulki1->header->headerSize != bulki2->header->headerSize || bulki1->data->dataSize != bulki2->data->dataSize) { - printf("Error: bulki1 and bulki2 are not equal in terms of metadata\n"); + LOG_ERROR("Error: bulki1 and bulki2 are not equal in terms of metadata\n"); return 0; } for (size_t i = 0; i < bulki1->numKeys; i++) { if (!BULKI_Entity_equal(&bulki1->header->keys[i], &bulki2->header->keys[i]) || !BULKI_Entity_equal(&bulki1->data->values[i], &bulki2->data->values[i])) { - printf("Error: bulki1 and bulki2 are not equal in terms of data\n"); + LOG_ERROR("Error: bulki1 and bulki2 are not equal in terms of data\n"); return 0; } } @@ -359,7 +351,7 @@ void BULKI_put(BULKI *bulki, BULKI_Entity *key, BULKI_Entity *value) { if (bulki == NULL || key == NULL || value == NULL) { - printf("Error: bulki, key, or value is NULL\n"); + LOG_ERROR("Error: bulki, key, or value is NULL\n"); return; } // search for existing key @@ -413,7 +405,7 @@ BULKI_Entity_Iterator * Bent_iterator_init(BULKI_Entity *array, void *filter, pdc_c_var_type_t filter_type) { if (array == NULL || array->pdc_class != PDC_CLS_ARRAY) { - printf("Error: not a proper array\n"); + LOG_ERROR("Error: not a proper array\n"); return NULL; } BULKI_Entity_Iterator *iter = (BULKI_Entity_Iterator *)calloc(1, sizeof(BULKI_Entity_Iterator)); @@ -500,7 +492,7 @@ BULKI_KV_Pair_Iterator * BULKI_KV_Pair_iterator_init(BULKI *bulki) { if (bulki == NULL) { - printf("Error: bulki is NULL\n"); + LOG_ERROR("Error: bulki is NULL\n"); return NULL; } BULKI_KV_Pair_Iterator *iter = (BULKI_KV_Pair_Iterator *)calloc(1, sizeof(BULKI_KV_Pair_Iterator)); @@ -550,7 +542,7 @@ BULKI_Entity_free(BULKI_Entity *bulk_entity, int free_struct) for (size_t i = 0; i < bulk_entity->count; i++) { BULKI_free(&bulki_array[i], 0); } - printf("Freeing bulki_array 1\n"); + LOG_INFO("Freeing bulki_array 1\n"); bulki_array = NULL; } else if (bulk_entity->pdc_type == PDC_BULKI_ENT && bulk_entity->data != NULL) { @@ -558,7 +550,7 @@ BULKI_Entity_free(BULKI_Entity *bulk_entity, int free_struct) for (size_t i = 0; i < bulk_entity->count; i++) { BULKI_Entity_free(&bulki_entity_array[i], 0); } - printf("Freeing bulki_array 2\n"); + LOG_INFO("Freeing bulki_array 2\n"); bulki_entity_array = NULL; } } @@ -566,14 +558,15 @@ BULKI_Entity_free(BULKI_Entity *bulk_entity, int free_struct) if (bulk_entity->pdc_type == PDC_BULKI && bulk_entity->data != NULL) { BULKI_free((BULKI *)bulk_entity->data, 0); bulk_entity->data = NULL; - printf("Freeing bulki_item 1\n"); + LOG_INFO("Freeing bulki_item 1\n"); } } - printf("Freeing bulk_entity\n"); + LOG_INFO("Freeing bulk_entity\n"); if (bulk_entity->data != NULL) { - printf("bulki_entity->class: %d, bulki_entity->class: %d, bulki_entity->data: %p, bulki_entity: " - "%p\n", - bulk_entity->pdc_class, bulk_entity->pdc_type, bulk_entity->data, bulk_entity); + LOG_INFO( + "bulki_entity->class: %d, bulki_entity->class: %d, bulki_entity->data: %p, bulki_entity: " + "%p\n", + bulk_entity->pdc_class, bulk_entity->pdc_type, bulk_entity->data, bulk_entity); free(bulk_entity->data); bulk_entity->data = NULL; } diff --git a/src/commons/serde/bulki/bulki_serde.c b/src/commons/serde/bulki/bulki_serde.c index fbdc9457a..471d2d9e5 100644 --- a/src/commons/serde/bulki/bulki_serde.c +++ b/src/commons/serde/bulki/bulki_serde.c @@ -1,5 +1,6 @@ #include "bulki_serde.h" #include "bulki_vle_util.h" +#include "pdc_logger.h" // clang-format off /** @@ -60,7 +61,6 @@ serialize_type_class(pdc_c_var_type_t type, pdc_c_var_class_t class) void * BULKI_Entity_serialize_to_buffer(BULKI_Entity *entity, void *buffer, size_t *offset) { - // printf("offset: %zu\n", *offset); // serialize the size uint64_t size = (uint64_t)get_BULKI_Entity_size(entity); *offset += BULKI_vle_encode_uint(size, buffer + *offset); @@ -74,9 +74,6 @@ BULKI_Entity_serialize_to_buffer(BULKI_Entity *entity, void *buffer, size_t *off uint64_t count = (uint64_t)(entity->count); *offset += BULKI_vle_encode_uint(count, buffer + *offset); - // printf("PRE-ser: size: %zu, class: %d, type: %d, count: %zu, offset: %zu\n", entity->size, - // entity->pdc_class, entity->pdc_type, entity->count, *offset); - // serialize the data if (entity->pdc_class == PDC_CLS_ITEM) { if (entity->pdc_type == PDC_BULKI) { // BULKI @@ -107,12 +104,9 @@ BULKI_Entity_serialize_to_buffer(BULKI_Entity *entity, void *buffer, size_t *off } } else { - printf("Error: unsupported class type %d\n", entity->pdc_class); + LOG_ERROR("unsupported class type %d\n", entity->pdc_class); return NULL; } - - // printf("POST-ser: size: %zu, class: %d, type: %d, count: %zu, offset: %zu\n", entity->size, - // entity->pdc_class, entity->pdc_type, entity->count, *offset); return buffer; } @@ -219,7 +213,6 @@ deserialize_type_class(uint8_t byte, pdc_c_var_type_t *type, pdc_c_var_class_t * BULKI_Entity * BULKI_Entity_deserialize_from_buffer(void *buffer, size_t *offset) { - // printf("offset: %zu\n", *offset); BULKI_Entity *entity = malloc(sizeof(BULKI_Entity)); // deserialize the size size_t bytes_read; @@ -238,9 +231,6 @@ BULKI_Entity_deserialize_from_buffer(void *buffer, size_t *offset) entity->count = (size_t)count; *offset += bytes_read; - // printf("PRE-DE: size: %zu, class: %d, type: %d, count: %zu, offset: %zu\n", entity->size, - // entity->pdc_class, entity->pdc_type, entity->count, *offset); - // deserialize the data if (entity->pdc_class == PDC_CLS_ITEM) { if (entity->pdc_type == PDC_BULKI) { // BULKI @@ -278,12 +268,9 @@ BULKI_Entity_deserialize_from_buffer(void *buffer, size_t *offset) } } else { - printf("Error: unsupported class type %d\n", entity->pdc_class); + LOG_ERROR("unsupported class type %d\n", entity->pdc_class); return NULL; } - - // printf("POST-DE: size: %zu, class: %d, type: %d, count: %zu, offset: %zu\n", entity->size, - // entity->pdc_class, entity->pdc_type, entity->count, *offset); return entity; } @@ -296,7 +283,6 @@ BULKI_deserialize_from_buffer(void *buffer, size_t *offset) uint64_t totalSize = BULKI_vle_decode_uint(buffer + *offset, &bytes_read); bulki->totalSize = totalSize; *offset += bytes_read; - // printf("totalSize: %zu\n", bulki->totalSize); // deserialize the number of keys uint64_t numKeys = BULKI_vle_decode_uint(buffer + *offset, &bytes_read); @@ -324,9 +310,9 @@ BULKI_deserialize_from_buffer(void *buffer, size_t *offset) uint64_t dataOffset = BULKI_vle_decode_uint(buffer + *offset, &bytes_read); // check the data offset if (((size_t)dataOffset) != *offset) { - printf("Error1: data offset does not match the expected offset. Expected: %zu, Found: %zu, " - "bytes_read: %zu \n", - (size_t)dataOffset, *offset, bytes_read); + LOG_ERROR("Error1: data offset does not match the expected offset. Expected: %zu, Found: %zu, " + "bytes_read: %zu \n", + (size_t)dataOffset, *offset, bytes_read); return NULL; } *offset += bytes_read; @@ -343,13 +329,12 @@ BULKI_deserialize_from_buffer(void *buffer, size_t *offset) } // check the total size dataOffset = BULKI_vle_decode_uint(buffer + *offset, &bytes_read); - // printf("dataOffset: %zu, offset: %zu\n", dataOffset, *offset); // check the data offset if (((size_t)dataOffset) != *offset) { - printf("Error2: data offset does not match the expected offset. Expected: %zu, Found: %zu, " - "bytes_read: %zu\n", - (size_t)dataOffset, *offset, bytes_read); + LOG_ERROR("Error2: data offset does not match the expected offset. Expected: %zu, Found: %zu, " + "bytes_read: %zu\n", + (size_t)dataOffset, *offset, bytes_read); return NULL; } *offset += bytes_read; @@ -382,7 +367,6 @@ BULKI_Entity_deserialize_from_file(FILE *fp) // read the file into the buffer void *buffer = malloc(fsize + 1); fread(buffer, fsize, 1, fp); - // printf("Read %ld bytes\n", fsize); fclose(fp); BULKI_Entity *rst = BULKI_Entity_deserialize(buffer); free(buffer); @@ -398,7 +382,6 @@ BULKI_deserialize_from_file(FILE *fp) // read the file into the buffer void *buffer = malloc(fsize + 1); fread(buffer, fsize, 1, fp); - // printf("Read %ld bytes\n", fsize); fclose(fp); BULKI *rst = BULKI_deserialize(buffer); free(buffer); diff --git a/src/commons/serde/bulki/bulki_serde_test.c b/src/commons/serde/bulki/bulki_serde_test.c index 98d0e94b0..9f1f1076f 100644 --- a/src/commons/serde/bulki/bulki_serde_test.c +++ b/src/commons/serde/bulki/bulki_serde_test.c @@ -1,4 +1,5 @@ #include "bulki_serde.h" +#include "pdc_logger.h" int test_base_type() @@ -39,16 +40,12 @@ test_base_type() size_t size; void * buffer = BULKI_serialize(bulki, &size); - // printf("Serialized data:\n"); - // BULKI_print(bulki); - // Do some I/O if you like FILE *fp = fopen("test_bulki.bin", "wb"); fwrite(buffer, 1, size, fp); fclose(fp); BULKI_free(bulki, 1); - // printf("Freed bulki\n"); // read the file and deserialize fp = fopen("test_bulki.bin", "rb"); @@ -58,21 +55,16 @@ test_base_type() // read the file into the buffer void *buffer2 = malloc(fsize + 1); fread(buffer2, fsize, 1, fp); - // printf("Read %ld bytes\n", fsize); fclose(fp); // Deserialize the buffer BULKI *deserializedBulki = BULKI_deserialize(buffer2); - // printf("Deserialized data:\n"); - // BULKI_print(deserializedBulki); - int equal = BULKI_equal(bulki, deserializedBulki); - printf("bulki == deserializedBulki: %d\n", equal); + LOG_INFO("bulki == deserializedBulki: %d\n", equal); // Free the memory BULKI_free(deserializedBulki, 1); - // printf("Freed deserializedBulki\n"); free(buffer); @@ -98,10 +90,10 @@ test_put_replace() BULKI_Entity *dataEnt = BULKI_get(bulki, BULKI_ENTITY("key1", 1, PDC_STRING, PDC_CLS_ITEM)); int equal = BULKI_Entity_equal(dataEnt, BULKI_ENTITY(&u64value, 1, PDC_UINT64, PDC_CLS_ITEM)); - printf("first value is desired after replacing the original value: %d\n", equal); + LOG_INFO("first value is desired after replacing the original value: %d\n", equal); dataEnt = BULKI_get(bulki, BULKI_ENTITY("key2", 1, PDC_STRING, PDC_CLS_ITEM)); equal = BULKI_Entity_equal(dataEnt, BULKI_ENTITY("value2", 1, PDC_STRING, PDC_CLS_ITEM)); - printf("second value not changed after replace put: %d\n", equal); + LOG_INFO("second value not changed after replace put: %d\n", equal); return equal; } @@ -164,23 +156,15 @@ test_base_array_entitiy() size_t size; void * buffer = BULKI_serialize(bulki2, &size); - // printf("Serialized data:\n"); - // BULKI_print(bulki2); - // Deserialize the buffer BULKI *deserializedBulki = BULKI_deserialize(buffer); - // printf("Deserialized data:\n"); - // BULKI_print(deserializedBulki); - int equal = BULKI_equal(bulki2, deserializedBulki); - printf("bulki2 == deserializedBulki: %d\n", equal); + LOG_INFO("bulki2 == deserializedBulki: %d\n", equal); // Free the memory BULKI_free(deserializedBulki, 1); - // printf("Freed deserializedBulki\n"); BULKI_free(bulki, 1); - // printf("Freed bulki\n"); free(buffer); return equal; @@ -224,23 +208,15 @@ test_embedded_entitiy() size_t size; void * buffer = BULKI_serialize(bulki, &size); - // printf("Serialized data:\n"); - // BULKI_print(bulki); - // Deserialize the buffer BULKI *deserializedBulki = BULKI_deserialize(buffer); - // printf("Deserialized data:\n"); - // BULKI_print(deserializedBulki); - int equal = BULKI_equal(bulki, deserializedBulki); - printf("bulki == deserializedBulki: %d\n", equal); + LOG_INFO("bulki == deserializedBulki: %d\n", equal); // Free the memory BULKI_free(deserializedBulki, 1); - // printf("Freed deserializedBulki\n"); BULKI_free(bulki, 1); - // printf("Freed bulki\n"); free(buffer); return equal; @@ -260,7 +236,7 @@ test_bulki_in_entitiy() int equal = BULKI_Entity_equal(nestEntity, des_nestEntity); - printf("EMPTY BULKI in BULKI Entity = %d \n", equal); + LOG_INFO("EMPTY BULKI in BULKI Entity = %d \n", equal); BULKI_put(bulki, BULKI_ENTITY("key", 1, PDC_STRING, PDC_CLS_ITEM), BULKI_ENTITY("value", 1, PDC_STRING, PDC_CLS_ITEM)); @@ -269,7 +245,7 @@ test_bulki_in_entitiy() des_nestEntity = BULKI_Entity_deserialize(buffer); equal = BULKI_Entity_equal(nestEntity, des_nestEntity); - printf("non-empty base BULKI in BULKI Entity = %d \n", equal); + LOG_INFO("non-empty base BULKI in BULKI Entity = %d \n", equal); BULKI_Entity *secondValue = empty_Bent_Array_Entity(); BULKI_ENTITY_append_BULKI_Entity(secondValue, BULKI_ENTITY("secondValue1", 1, PDC_STRING, PDC_CLS_ITEM)); @@ -281,7 +257,7 @@ test_bulki_in_entitiy() des_nestEntity = BULKI_Entity_deserialize(buffer); equal = BULKI_Entity_equal(nestEntity, des_nestEntity); - printf("non-empty compound BULKI in BULKI Entity with array = %d \n", equal); + LOG_INFO("non-empty compound BULKI in BULKI Entity with array = %d \n", equal); return equal; } @@ -367,11 +343,11 @@ bulki_small_json_serialization_test() int main(int argc, char *argv[]) { - printf("test_base_type RST = %d\n", test_base_type()); - printf("test_put_replace RST = %d\n", test_put_replace()); - printf("test_base_array_entitiy RST = %d\n", test_base_array_entitiy()); - printf("test_embedded_entitiy RST = %d\n", test_embedded_entitiy()); - printf("test_nested_entitiy RST = %d\n", test_bulki_in_entitiy()); - printf("bulki_small_json_serialization_test RST = %d\n", bulki_small_json_serialization_test()); + LOG_INFO("test_base_type RST = %d\n", test_base_type()); + LOG_INFO("test_put_replace RST = %d\n", test_put_replace()); + LOG_INFO("test_base_array_entitiy RST = %d\n", test_base_array_entitiy()); + LOG_INFO("test_embedded_entitiy RST = %d\n", test_embedded_entitiy()); + LOG_INFO("test_nested_entitiy RST = %d\n", test_bulki_in_entitiy()); + LOG_INFO("bulki_small_json_serialization_test RST = %d\n", bulki_small_json_serialization_test()); return 0; } \ No newline at end of file diff --git a/src/commons/utils/include/pdc_private.h b/src/commons/utils/include/pdc_private.h index 8ae8886a8..4118781c7 100644 --- a/src/commons/utils/include/pdc_private.h +++ b/src/commons/utils/include/pdc_private.h @@ -27,6 +27,7 @@ #include "pdc_config.h" #include "pdc_public.h" +#include "pdc_logger.h" #include #include @@ -136,18 +137,13 @@ extern pbool_t err_occurred; */ #define PGOTO_ERROR(ret_val, ...) \ do { \ - fprintf(stderr, "Error in %s:%d\n", __FILE__, __LINE__); \ - fprintf(stderr, " # %s(): ", __func__); \ - fprintf(stderr, __VA_ARGS__); \ - fprintf(stderr, "\n"); \ + LOG_ERROR(__VA_ARGS__); \ PGOTO_DONE(ret_val); \ } while (0) #define PGOTO_ERROR_VOID(...) \ do { \ - fprintf(stderr, "Error in %s:%d\n", __FILE__, __LINE__); \ - fprintf(stderr, " # %s(): ", __func__); \ - fprintf(stderr, "\n"); \ + LOG_ERROR(__VA_ARGS__); \ PGOTO_DONE_VOID; \ } while (0) @@ -176,20 +172,6 @@ extern pbool_t err_occurred; } while (0) #else -/* #define FUNC_ENTER(X) \ */ -/* do { \ */ -/* time_t now; \ */ -/* time(&now); \ */ -/* fprintf(stderr, "%ld enter %s\n", now, __func__); \ */ -/* } while (0) */ - -/* #define FUNC_LEAVE(ret_value) \ */ -/* do { \ */ -/* time_t now; \ */ -/* time(&now); \ */ -/* fprintf(stderr, "%ld leave %s\n", now, __func__); \ */ -/* return (ret_value); \ */ -/* } while (0) */ #define FUNC_ENTER(X) \ do { \ diff --git a/src/commons/utils/pdc_timing.c b/src/commons/utils/pdc_timing.c index 75080dd0d..0adea269a 100644 --- a/src/commons/utils/pdc_timing.c +++ b/src/commons/utils/pdc_timing.c @@ -42,7 +42,7 @@ PDC_timing_init() MPI_Comm_rank(MPI_COMM_WORLD, &rank); gethostname(hostname, HOST_NAME_MAX); if (!(rank % 31)) { - printf("client process rank %d, hostname = %s\n", rank, hostname); + LOG_INFO("client process rank %d, hostname = %s\n", rank, hostname); } MPI_Barrier(MPI_COMM_WORLD); @@ -127,46 +127,46 @@ PDC_timing_report(const char *prefix) MPI_Comm_rank(MPI_COMM_WORLD, &rank); gethostname(hostname, HOST_NAME_MAX); if (!(rank % 32)) { - printf("client process rank %d, hostname = %s\n", rank, hostname); + LOG_INFO("client process rank %d, hostname = %s\n", rank, hostname); } MPI_Reduce(&pdc_timings, &max_timings, sizeof(pdc_timing) / sizeof(double), MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); if (rank == 0) { - printf("PDCbuf_obj_map_rpc = %lf, wait = %lf\n", max_timings.PDCbuf_obj_map_rpc, - max_timings.PDCbuf_obj_map_rpc_wait); - printf("PDCreg_obtain_lock_write_rpc = %lf, wait = %lf\n", max_timings.PDCreg_obtain_lock_write_rpc, - max_timings.PDCreg_obtain_lock_write_rpc_wait); - printf("PDCreg_obtain_lock_read_rpc = %lf, wait = %lf\n", max_timings.PDCreg_obtain_lock_read_rpc, - max_timings.PDCreg_obtain_lock_read_rpc_wait); - - printf("PDCreg_release_lock_write_rpc = %lf, wait = %lf\n", max_timings.PDCreg_release_lock_write_rpc, - max_timings.PDCreg_release_lock_write_rpc_wait); - printf("PDCreg_release_lock_read_rpc = %lf, wait = %lf\n", max_timings.PDCreg_release_lock_read_rpc, - max_timings.PDCreg_release_lock_read_rpc_wait); - printf("PDCbuf_obj_unmap_rpc = %lf, wait = %lf\n", max_timings.PDCbuf_obj_unmap_rpc, - max_timings.PDCbuf_obj_unmap_rpc_wait); - - printf("PDCtransfer_request_start_write = %lf, wait = %lf\n", - max_timings.PDCtransfer_request_start_write_rpc, - max_timings.PDCtransfer_request_start_write_rpc_wait); - printf("PDCtransfer_request_start_read = %lf, wait = %lf\n", - max_timings.PDCtransfer_request_start_read_rpc, - max_timings.PDCtransfer_request_start_read_rpc_wait); - printf("PDCtransfer_request_wait_write = %lf, wait = %lf\n", - max_timings.PDCtransfer_request_wait_write_rpc, - max_timings.PDCtransfer_request_wait_write_rpc_wait); - printf("PDCtransfer_request_wait_read = %lf, wait = %lf\n", - max_timings.PDCtransfer_request_wait_read_rpc, - max_timings.PDCtransfer_request_wait_read_rpc_wait); - printf("PDCtransfer_request_start_all_write = %lf, wait = %lf\n", - max_timings.PDCtransfer_request_start_all_write_rpc, - max_timings.PDCtransfer_request_start_all_write_rpc_wait); - printf("PDCtransfer_request_start_all_read = %lf, wait = %lf\n", - max_timings.PDCtransfer_request_start_all_read_rpc, - max_timings.PDCtransfer_request_start_all_read_rpc_wait); - printf("PDCtransfer_request_wait_write = %lf, wait = %lf\n", - max_timings.PDCtransfer_request_wait_all_rpc, - max_timings.PDCtransfer_request_wait_all_rpc_wait); + LOG_INFO("PDCbuf_obj_map_rpc = %lf, wait = %lf\n", max_timings.PDCbuf_obj_map_rpc, + max_timings.PDCbuf_obj_map_rpc_wait); + LOG_INFO("PDCreg_obtain_lock_write_rpc = %lf, wait = %lf\n", max_timings.PDCreg_obtain_lock_write_rpc, + max_timings.PDCreg_obtain_lock_write_rpc_wait); + LOG_INFO("PDCreg_obtain_lock_read_rpc = %lf, wait = %lf\n", max_timings.PDCreg_obtain_lock_read_rpc, + max_timings.PDCreg_obtain_lock_read_rpc_wait); + + LOG_INFO("PDCreg_release_lock_write_rpc = %lf, wait = %lf\n", + max_timings.PDCreg_release_lock_write_rpc, max_timings.PDCreg_release_lock_write_rpc_wait); + LOG_INFO("PDCreg_release_lock_read_rpc = %lf, wait = %lf\n", max_timings.PDCreg_release_lock_read_rpc, + max_timings.PDCreg_release_lock_read_rpc_wait); + LOG_INFO("PDCbuf_obj_unmap_rpc = %lf, wait = %lf\n", max_timings.PDCbuf_obj_unmap_rpc, + max_timings.PDCbuf_obj_unmap_rpc_wait); + + LOG_INFO("PDCtransfer_request_start_write = %lf, wait = %lf\n", + max_timings.PDCtransfer_request_start_write_rpc, + max_timings.PDCtransfer_request_start_write_rpc_wait); + LOG_INFO("PDCtransfer_request_start_read = %lf, wait = %lf\n", + max_timings.PDCtransfer_request_start_read_rpc, + max_timings.PDCtransfer_request_start_read_rpc_wait); + LOG_INFO("PDCtransfer_request_wait_write = %lf, wait = %lf\n", + max_timings.PDCtransfer_request_wait_write_rpc, + max_timings.PDCtransfer_request_wait_write_rpc_wait); + LOG_INFO("PDCtransfer_request_wait_read = %lf, wait = %lf\n", + max_timings.PDCtransfer_request_wait_read_rpc, + max_timings.PDCtransfer_request_wait_read_rpc_wait); + LOG_INFO("PDCtransfer_request_start_all_write = %lf, wait = %lf\n", + max_timings.PDCtransfer_request_start_all_write_rpc, + max_timings.PDCtransfer_request_start_all_write_rpc_wait); + LOG_INFO("PDCtransfer_request_start_all_read = %lf, wait = %lf\n", + max_timings.PDCtransfer_request_start_all_read_rpc, + max_timings.PDCtransfer_request_start_all_read_rpc_wait); + LOG_INFO("PDCtransfer_request_wait_write = %lf, wait = %lf\n", + max_timings.PDCtransfer_request_wait_all_rpc, + max_timings.PDCtransfer_request_wait_all_rpc_wait); } sprintf(filename, "pdc_client_log_rank_%d.csv", rank); @@ -262,9 +262,9 @@ PDC_server_timing_init() MPI_Comm_rank(MPI_COMM_WORLD, &rank); gethostname(hostname, HOST_NAME_MAX); - printf("server process rank %d, hostname = %s\n", rank, hostname); + LOG_INFO("server process rank %d, hostname = %s\n", rank, hostname); /* - printf("rank = %d, hostname = %s, PDCbuf_obj_map_rpc = %lf, PDCreg_obtain_lock_rpc = %lf, " + LOG_INFO("rank = %d, hostname = %s, PDCbuf_obj_map_rpc = %lf, PDCreg_obtain_lock_rpc = %lf, " "PDCreg_release_lock_write_rpc = " "%lf, PDCreg_release_lock_read_rpc = %lf, PDCbuf_obj_unmap_rpc = %lf, " "region_release_bulk_transfer_cb = %lf\n", diff --git a/src/commons/utils/query_utils.c b/src/commons/utils/query_utils.c index 058639cf6..c1a02372e 100644 --- a/src/commons/utils/query_utils.c +++ b/src/commons/utils/query_utils.c @@ -4,6 +4,7 @@ #include "query_utils.h" #include #include +#include "pdc_logger.h" int _gen_affix_for_token(char *token_str, int affix_type, size_t affix_len, char **out_str) @@ -46,7 +47,7 @@ _gen_affix_for_token(char *token_str, int affix_type, size_t affix_len, char **o affix_str[affix_len + 2] = '\0'; } else { - printf("Invalid affix type %d!\n", affix_type); + LOG_ERROR("Invalid affix type %d!\n", affix_type); return 0; } @@ -81,7 +82,7 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) // "hello" key_ptr_len = _gen_affix_for_token(input->base_tag->name, input->key_query_type, affix_len, &key_ptr); if (key_ptr_len == 0) { - printf("Failed to generate key query!\n"); + LOG_ERROR("Failed to generate key query!\n"); return; } @@ -97,7 +98,7 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) value_ptr[value_ptr_len + 2] = '\0'; if (value_ptr_len == 0) { - printf("Failed to generate value query!\n"); + LOG_ERROR("Failed to generate value query!\n"); return; } } @@ -112,7 +113,7 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) input->base_tag->type = PDC_DOUBLE; } else { - printf("Invalid tag type!\n"); + LOG_ERROR("Invalid tag type!\n"); return; } char *format_str = get_format_by_dtype(input->base_tag->type); @@ -131,7 +132,7 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) snprintf(value_ptr, value_ptr_len + 1, fmt_str, input->range_lo, input->range_hi); } else { - printf("Invalid value query type for integer!\n"); + LOG_ERROR("Invalid value query type for integer!\n"); return; } } @@ -443,7 +444,7 @@ parse_and_run_number_value_query(char *num_val_query, pdc_c_var_type_t num_type, // the string is not ended or started with '~', and if it contains '~', it is a in-between query. split_string(num_val_query, "~", &tokens, &num_tokens); if (num_tokens != 2) { - printf("ERROR: invalid range query: %s\n", num_val_query); + LOG_ERROR("ERROR: invalid range query: %s\n", num_val_query); return -1; } char *lo_tok = tokens[0]; diff --git a/src/commons/utils/string_utils.c b/src/commons/utils/string_utils.c index 32fc37cc8..aa810d3b7 100644 --- a/src/commons/utils/string_utils.c +++ b/src/commons/utils/string_utils.c @@ -3,6 +3,7 @@ // #include "string_utils.h" +#include "pdc_logger.h" #include const char *VISIBLE_ALPHABET = @@ -243,7 +244,7 @@ split_string(const char *str, const char *delim, char ***result, int *result_len // Compile regular expression reti = regcomp(®ex, delim, 0); if (reti) { - fprintf(stderr, "Could not compile regex\n"); + LOG_ERROR("Could not compile regex\n"); return -1; } @@ -352,8 +353,6 @@ stripQuotes(const char *str) if (len >= 2 && str[0] == '"' && str[len - 1] == '"') { // Call substring to remove the first and last character char *stripped = substring(str, 1, len - 1); - // TODO: remove this - printf("str = %s, stripped = %s\n", str, stripped); return stripped; } else { diff --git a/src/commons/utils/thpool.c b/src/commons/utils/thpool.c index 2e3fec47b..a064fe74d 100644 --- a/src/commons/utils/thpool.c +++ b/src/commons/utils/thpool.c @@ -28,6 +28,7 @@ #endif #include "thpool.h" +#include "pdc_logger.h" #ifdef THPOOL_DEBUG #define THPOOL_DEBUG 1 @@ -36,7 +37,7 @@ #endif #if !defined(DISABLE_PRINT) || defined(THPOOL_DEBUG) -#define err(str) fprintf(stderr, str) +#define err(str) LOG_ERROR("%s\n", str) #else #define err(str) #endif @@ -153,7 +154,7 @@ thpool_init(int num_threads) for (n = 0; n < num_threads; n++) { thread_init(thpool_p, &thpool_p->threads[n], n); #if THPOOL_DEBUG - printf("THPOOL_DEBUG: Created thread %d in pool \n", n); + LOG_DEBUG("THPOOL_DEBUG: Created thread %d in pool \n", n); #endif } diff --git a/src/server/dablooms/pdc_dablooms.c b/src/server/dablooms/pdc_dablooms.c index 2be56c884..6a6c287f6 100644 --- a/src/server/dablooms/pdc_dablooms.c +++ b/src/server/dablooms/pdc_dablooms.c @@ -17,6 +17,7 @@ #include "pdc_murmur.h" #include "pdc_dablooms.h" +#include "pdc_logger.h" #define DABLOOMS_VERSION "0.9.1" @@ -81,7 +82,7 @@ bitmap_increment(bitmap_t *bitmap, unsigned int index, long offset) } if (temp == 0x0f) { - fprintf(stderr, "Error, 4 bit int Overflow\n"); + LOG_ERROR("Error, 4 bit int Overflow\n"); return -1; } @@ -107,7 +108,7 @@ bitmap_decrement(bitmap_t *bitmap, unsigned int index, long offset) } if (temp == 0x00) { - fprintf(stderr, "Error, Decrementing zero\n"); + LOG_ERROR("Error, Decrementing zero\n"); return -1; } @@ -183,7 +184,7 @@ counting_bloom_init(unsigned int capacity, double error_rate, long offset) counting_bloom_t *bloom; if ((bloom = PDC_malloc(sizeof(counting_bloom_t))) == NULL) { - fprintf(stderr, "Error, could not realloc a new bloom filter\n"); + LOG_ERROR("Error, could not realloc a new bloom filter\n"); return NULL; } bloom->bitmap = NULL; @@ -294,7 +295,7 @@ new_counting_bloom_from_scale(scaling_bloom_t *bloom) if ((bloom->blooms = realloc(bloom->blooms, (bloom->num_blooms + 1) * sizeof(counting_bloom_t *))) == NULL) { - fprintf(stderr, "Error, could not realloc a new bloom filter\n"); + LOG_ERROR("Error, could not realloc a new bloom filter\n"); return NULL; } @@ -384,7 +385,7 @@ scaling_bloom_init(unsigned int capacity, double error_rate) return NULL; } if ((bloom->bitmap = new_bitmap(sizeof(scaling_bloom_header_t))) == NULL) { - fprintf(stderr, "Error, Could not create bitmap with file\n"); + LOG_ERROR("Error, Could not create bitmap with file\n"); free_scaling_bloom(bloom); return NULL; } @@ -409,7 +410,7 @@ new_scaling_bloom(unsigned int capacity, double error_rate) bloom = scaling_bloom_init(capacity, error_rate); if (!(cur_bloom = new_counting_bloom_from_scale(bloom))) { - fprintf(stderr, "Error, Could not create counting bloom\n"); + LOG_ERROR("Error, Could not create counting bloom\n"); free_scaling_bloom(bloom); return NULL; } diff --git a/src/server/include/pdc_client_server_common.h b/src/server/include/pdc_client_server_common.h index d9f2332b5..5b7a6bf62 100644 --- a/src/server/include/pdc_client_server_common.h +++ b/src/server/include/pdc_client_server_common.h @@ -1206,17 +1206,17 @@ hg_proc_pdc_kvtag_t(hg_proc_t proc, void *data) ret = hg_proc_hg_string_t(proc, &struct_data->name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } if (struct_data->size) { @@ -1247,48 +1247,48 @@ hg_proc_region_info_transfer_t(hg_proc_t proc, void *data) ret = hg_proc_hg_size_t(proc, &struct_data->ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->start_0); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->start_1); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->start_2); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->start_3); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->count_0); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->count_1); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->count_2); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->count_3); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } @@ -1304,47 +1304,47 @@ hg_proc_region_lock_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->meta_server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->access_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->local_reg_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->mapping); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->data_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_size_t(proc, &struct_data->data_unit); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->lock_mode); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1359,7 +1359,7 @@ hg_proc_region_lock_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1374,72 +1374,70 @@ hg_proc_region_transform_and_lock_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->meta_server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->access_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->local_reg_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->mapping); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->data_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->lock_mode); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint8_t(proc, &struct_data->dest_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->transform_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->transform_state); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_bulk_t(proc, &struct_data->local_bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->transform_data_size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); } ret = hg_proc_uint64_t(proc, &struct_data->client_data_ptr); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } @@ -1455,77 +1453,77 @@ hg_proc_region_analysis_and_lock_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->meta_server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->access_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->local_reg_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->mapping); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->data_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->lock_mode); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->analysis_meta_index); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->n_args); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->output_obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->type_extent); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->output_type_extent); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->input_iter); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->output_iter); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1540,57 +1538,57 @@ hg_proc_metadata_query_transfer_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->is_list_all); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->user_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->app_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->obj_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->time_step_from); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->time_step_to); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_size_t(proc, &struct_data->ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->tags); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->k_query); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->vfrom_query); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->vto_query); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1605,22 +1603,22 @@ hg_proc_metadata_query_transfer_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->server_time_elapsed); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->server_memory_consumption); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_bulk_t(proc, &struct_data->bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1635,7 +1633,7 @@ hg_proc_pdc_metadata_transfer_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->user_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->app_name); @@ -1650,49 +1648,49 @@ hg_proc_pdc_metadata_transfer_t(hg_proc_t proc, void *data) } ret = hg_proc_int32_t(proc, &struct_data->time_step); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->cont_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->data_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_size_t(proc, &struct_data->ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->dims0); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->dims1); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->dims2); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->dims3); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->data_location); @@ -1723,48 +1721,48 @@ hg_proc_pdc_metadata_transfer_t(hg_proc_t proc, void *data) // Added to support transforms ret = hg_proc_int32_t(proc, &struct_data->current_state); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->t_storage_order); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->t_dtype); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_size_t(proc, &struct_data->t_ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->t_dims0); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->t_dims1); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->t_dims2); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->t_dims3); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->t_meta_index); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1779,7 +1777,7 @@ hg_proc_send_rpc_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1794,7 +1792,7 @@ hg_proc_send_rpc_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1809,17 +1807,17 @@ hg_proc_metadata_add_tag_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_const_string_t(proc, &struct_data->new_tag); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1834,17 +1832,17 @@ hg_proc_metadata_get_kvtag_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->key); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1859,7 +1857,7 @@ hg_proc_metadata_add_tag_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1874,12 +1872,12 @@ hg_proc_metadata_get_kvtag_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_kvtag_t(proc, &struct_data->kvtag); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } @@ -1894,17 +1892,17 @@ hg_proc_metadata_add_kvtag_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_kvtag_t(proc, &struct_data->kvtag); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1919,17 +1917,17 @@ hg_proc_metadata_update_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->new_metadata); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1944,7 +1942,7 @@ hg_proc_metadata_update_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1959,7 +1957,7 @@ hg_proc_metadata_delete_by_id_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1975,7 +1973,7 @@ hg_proc_metadata_delete_by_id_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -1990,17 +1988,17 @@ hg_proc_metadata_delete_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_string_t(proc, &struct_data->obj_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->time_step); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2015,7 +2013,7 @@ hg_proc_metadata_delete_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2030,17 +2028,17 @@ hg_proc_metadata_query_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_const_string_t(proc, &struct_data->obj_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->time_step); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } @@ -2056,7 +2054,7 @@ hg_proc_metadata_query_out_t(hg_proc_t proc, void *data) ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2071,12 +2069,12 @@ hg_proc_gen_cont_id_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_const_string_t(proc, &struct_data->cont_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } @@ -2092,7 +2090,7 @@ hg_proc_gen_cont_id_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->cont_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2107,17 +2105,17 @@ hg_proc_gen_obj_id_in_t(hg_proc_t proc, void *data) ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->data); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->data_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2132,7 +2130,7 @@ hg_proc_gen_obj_id_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2147,7 +2145,7 @@ hg_proc_server_lookup_remote_server_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2162,7 +2160,7 @@ hg_proc_server_lookup_remote_server_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2177,17 +2175,17 @@ hg_proc_server_lookup_client_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->nserver); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->server_addr); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2202,7 +2200,7 @@ hg_proc_server_lookup_client_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2217,22 +2215,22 @@ hg_proc_client_test_connect_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->nclient); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->is_init); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->client_addr); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2247,7 +2245,7 @@ hg_proc_client_test_connect_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2262,17 +2260,17 @@ hg_proc_notify_io_complete_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->io_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->shm_addr); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2287,7 +2285,7 @@ hg_proc_notify_io_complete_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2302,12 +2300,12 @@ hg_proc_notify_region_update_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->reg_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2322,7 +2320,7 @@ hg_proc_notify_region_update_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2337,7 +2335,7 @@ hg_proc_flush_obj_all_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint8_t(proc, &struct_data->tag); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2352,7 +2350,7 @@ hg_proc_flush_obj_all_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2367,37 +2365,37 @@ hg_proc_obj_reset_dims_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_const_string_t(proc, &struct_data->obj_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->time_step); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->dims0); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->dims1); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->dims2); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2412,7 +2410,7 @@ hg_proc_obj_reset_dims_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2427,7 +2425,7 @@ hg_proc_flush_obj_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2442,7 +2440,7 @@ hg_proc_flush_obj_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2457,7 +2455,7 @@ hg_proc_close_server_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2472,7 +2470,7 @@ hg_proc_close_server_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2488,51 +2486,51 @@ hg_proc_bulk_rpc_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->cnt); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->total); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->seq_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->seq_id2); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->origin); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->op_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->data_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } @@ -2540,7 +2538,7 @@ hg_proc_bulk_rpc_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_bulk_t(proc, &struct_data->bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } } @@ -2556,7 +2554,7 @@ hg_proc_bulk_rpc_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2571,7 +2569,7 @@ hg_proc_get_remote_metadata_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2586,7 +2584,7 @@ hg_proc_get_remote_metadata_out_t(hg_proc_t proc, void *data) ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2601,57 +2599,57 @@ hg_proc_buf_map_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->meta_server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->local_reg_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->remote_obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->local_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->remote_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_size_t(proc, &struct_data->ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_size_t(proc, &struct_data->remote_unit); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_bulk_t(proc, &struct_data->local_bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->remote_region_unit); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->remote_region_nounit); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->local_region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2666,7 +2664,7 @@ hg_proc_buf_map_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2679,52 +2677,42 @@ hg_proc_transfer_request_in_t(hg_proc_t proc, void *data) transfer_request_in_t *struct_data = (transfer_request_in_t *)data; ret = hg_proc_hg_bulk_t(proc, &struct_data->local_bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->remote_region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_dim0); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_dim1); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_dim2); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_hg_size_t(proc, &struct_data->remote_unit); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_int32_t(proc, &struct_data->obj_ndim); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint32_t(proc, &struct_data->meta_server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint8_t(proc, &struct_data->access_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } return ret; @@ -2736,15 +2724,12 @@ hg_proc_transfer_request_out_t(hg_proc_t proc, void *data) { hg_return_t ret; transfer_request_out_t *struct_data = (transfer_request_out_t *)data; - // printf("Output argument: transfer_request for ret @ line %d\n", __LINE__); - ret = hg_proc_uint64_t(proc, &struct_data->metadata_id); + ret = hg_proc_uint64_t(proc, &struct_data->metadata_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } return ret; @@ -2758,7 +2743,6 @@ hg_proc_transfer_request_status_in_t(hg_proc_t proc, void *data) transfer_request_status_in_t *struct_data = (transfer_request_status_in_t *)data; ret = hg_proc_uint64_t(proc, &struct_data->transfer_request_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } return ret; @@ -2773,13 +2757,11 @@ hg_proc_transfer_request_status_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->status); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } return ret; @@ -2793,17 +2775,14 @@ hg_proc_transfer_request_wait_all_in_t(hg_proc_t proc, void *data) transfer_request_wait_all_in_t *struct_data = (transfer_request_wait_all_in_t *)data; ret = hg_proc_hg_bulk_t(proc, &struct_data->local_bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_uint64_t(proc, &struct_data->total_buf_size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } ret = hg_proc_int32_t(proc, &struct_data->n_objs); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } return ret; @@ -2818,7 +2797,6 @@ hg_proc_transfer_request_wait_all_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); return ret; } return ret; @@ -2832,27 +2810,27 @@ hg_proc_transfer_request_all_in_t(hg_proc_t proc, void *data) transfer_request_all_in_t *struct_data = (transfer_request_all_in_t *)data; ret = hg_proc_hg_bulk_t(proc, &struct_data->local_bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->total_buf_size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->n_objs); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->access_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2864,19 +2842,16 @@ hg_proc_transfer_request_all_out_t(hg_proc_t proc, void *data) { hg_return_t ret; transfer_request_all_out_t *struct_data = (transfer_request_all_out_t *)data; - // printf("Output argument: transfer_request_all for status @ line %d\n", __LINE__); - ret = hg_proc_uint64_t(proc, &struct_data->metadata_id); + ret = hg_proc_uint64_t(proc, &struct_data->metadata_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } - // printf("Output argument: transfer_request_all for ret @ line %d\n", __LINE__); ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } - // printf("Output argument: transfer_request_all finishes @ line %d\n", __LINE__); return ret; } @@ -2888,22 +2863,22 @@ hg_proc_transfer_request_metadata_query_in_t(hg_proc_t proc, void *data) transfer_request_metadata_query_in_t *struct_data = (transfer_request_metadata_query_in_t *)data; ret = hg_proc_hg_bulk_t(proc, &struct_data->local_bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->total_buf_size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->n_objs); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->is_write); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2918,19 +2893,19 @@ hg_proc_transfer_request_metadata_query_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->query_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->total_buf_size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2944,17 +2919,17 @@ hg_proc_transfer_request_metadata_query2_in_t(hg_proc_t proc, void *data) transfer_request_metadata_query2_in_t *struct_data = (transfer_request_metadata_query2_in_t *)data; ret = hg_proc_hg_bulk_t(proc, &struct_data->local_bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->total_buf_size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->query_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2969,7 +2944,7 @@ hg_proc_transfer_request_metadata_query2_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -2981,17 +2956,15 @@ hg_proc_transfer_request_wait_in_t(hg_proc_t proc, void *data) { hg_return_t ret; transfer_request_wait_in_t *struct_data = (transfer_request_wait_in_t *)data; - // printf("Input argument: transfer_request_wait for transfer_request_id @ line %d\n", __LINE__); - - ret = hg_proc_int32_t(proc, &struct_data->access_type); + ret = hg_proc_int32_t(proc, &struct_data->access_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->transfer_request_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3003,13 +2976,11 @@ hg_proc_transfer_request_wait_out_t(hg_proc_t proc, void *data) { hg_return_t ret; transfer_request_wait_out_t *struct_data = (transfer_request_wait_out_t *)data; - // printf("Output argument: transfer_request_wait for ret @ line %d\n", __LINE__); - ret = hg_proc_int32_t(proc, &struct_data->ret); + ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } - // printf("Output argument: transfer_request_wait finishes @ line %d\n", __LINE__); return ret; } @@ -3022,22 +2993,22 @@ hg_proc_buf_unmap_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->meta_server_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->remote_obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->remote_reg_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->remote_region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3052,7 +3023,7 @@ hg_proc_buf_unmap_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3067,32 +3038,32 @@ hg_proc_data_server_read_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->nclient); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->nupdate); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->meta); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->cache_percentage); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3107,7 +3078,7 @@ hg_proc_data_server_read_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3122,32 +3093,32 @@ hg_proc_data_server_write_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->nclient); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->nupdate); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->shm_addr); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->meta); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3162,7 +3133,7 @@ hg_proc_data_server_write_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3177,17 +3148,17 @@ hg_proc_data_server_read_check_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->meta); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3202,12 +3173,12 @@ hg_proc_data_server_read_check_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->shm_addr); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3222,17 +3193,17 @@ hg_proc_data_server_write_check_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->meta); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3247,7 +3218,7 @@ hg_proc_data_server_write_check_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3263,27 +3234,27 @@ hg_proc_region_storage_meta_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region_transfer); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->storage_location); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->offset); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3298,17 +3269,17 @@ hg_proc_pdc_histogram_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->dtype); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->nbin); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->incr); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } if (struct_data->nbin > 0) { @@ -3345,38 +3316,38 @@ hg_proc_update_region_loc_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->storage_location); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->offset); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->has_hist); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } if (struct_data->has_hist == 1) { ret = hg_proc_pdc_histogram_t(proc, &struct_data->hist); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } } @@ -3392,7 +3363,7 @@ hg_proc_update_region_loc_out_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3407,7 +3378,7 @@ hg_proc_get_metadata_by_id_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3422,7 +3393,7 @@ hg_proc_get_metadata_by_id_out_t(hg_proc_t proc, void *data) ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->res_meta); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3437,7 +3408,7 @@ hg_proc_pdc_serialized_data_t(hg_proc_t proc, void *data) ret = hg_proc_hg_string_t(proc, &struct_data->buf); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3451,17 +3422,17 @@ hg_proc_get_storage_info_single_out_t(hg_proc_t proc, void *data) get_storage_info_single_out_t *struct_data = (get_storage_info_single_out_t *)data; ret = hg_proc_region_info_transfer_t(proc, &struct_data->region_transfer); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->storage_loc); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->file_offset); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3476,12 +3447,12 @@ hg_proc_get_storage_info_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->req_region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3496,7 +3467,7 @@ hg_proc_pdc_int_send_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->origin); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3511,7 +3482,7 @@ hg_proc_pdc_int_ret_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3526,12 +3497,12 @@ hg_proc_pdc_aggregated_io_to_server_t(hg_proc_t proc, void *data) ret = hg_proc_hg_string_t(proc, &struct_data->buf); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_pdc_metadata_transfer_t(proc, &struct_data->meta); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3546,27 +3517,27 @@ hg_proc_cont_add_del_objs_rpc_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->op); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->cnt); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->origin); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->cont_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_bulk_t(proc, &struct_data->bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3581,7 +3552,7 @@ hg_proc_cont_add_del_objs_rpc_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3596,13 +3567,13 @@ hg_proc_cont_add_tags_rpc_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->cont_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->tags); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3617,27 +3588,27 @@ hg_proc_query_read_obj_name_in_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->client_seq_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->cnt); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->total_size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->origin); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_bulk_t(proc, &struct_data->bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3652,7 +3623,7 @@ hg_proc_query_read_obj_name_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3667,12 +3638,12 @@ hg_proc_container_query_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_string_t(proc, &struct_data->cont_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->hash_value); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3687,7 +3658,7 @@ hg_proc_container_query_out_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->cont_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3702,17 +3673,17 @@ hg_proc_storage_meta_name_query_in_t(hg_proc_t proc, void *data) ret = hg_proc_hg_string_t(proc, &struct_data->obj_name); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->task_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->origin_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3731,17 +3702,17 @@ hg_proc_get_sel_data_rpc_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->origin); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->query_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3756,13 +3727,13 @@ hg_proc_send_nhits_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->query_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->nhits); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3777,73 +3748,73 @@ hg_proc_query_storage_region_transfer_t(hg_proc_t proc, void *data) ret = hg_proc_int32_t(proc, &struct_data->origin); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->total_region); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->op); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->is_done); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->data_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->query_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->manager); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_region_info_transfer_t(proc, &struct_data->region_transfer); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->storage_location); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->offset); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->size); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->has_hist); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } if (struct_data->has_hist == 1) { ret = hg_proc_pdc_histogram_t(proc, &struct_data->hist); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } } @@ -3860,7 +3831,7 @@ hg_proc_dart_get_server_info_in_t(hg_proc_t proc, void *data) ret = hg_proc_uint32_t(proc, &struct_data->serverId); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3874,13 +3845,13 @@ hg_proc_dart_get_server_info_out_t(hg_proc_t proc, void *data) ret = hg_proc_int64_t(proc, &struct_data->indexed_word_count); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->request_count); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; @@ -3893,67 +3864,67 @@ hg_proc_dart_perform_one_server_in_t(hg_proc_t proc, void *data) dart_perform_one_server_in_t *struct_data = (dart_perform_one_server_in_t *)data; ret = hg_proc_int8_t(proc, &struct_data->op_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->hash_algo); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_string_t(proc, &struct_data->attr_key); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->attr_vsize); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint8_t(proc, &struct_data->attr_vtype); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->vnode_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->obj_ref_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_primary_ref); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_secondary_ref); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint64_t(proc, &struct_data->obj_server_ref); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->inserting_suffix); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->timestamp); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_uint32_t(proc, &struct_data->src_client_id); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } if (struct_data->attr_vsize) { @@ -3981,52 +3952,52 @@ hg_proc_dart_perform_one_server_out_t(hg_proc_t proc, void *data) dart_perform_one_server_out_t *struct_data = (dart_perform_one_server_out_t *)data; ret = hg_proc_int8_t(proc, &struct_data->op_type); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int32_t(proc, &struct_data->ret); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_hg_bulk_t(proc, &struct_data->bulk_handle); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->indexed_word_count); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->request_count); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int8_t(proc, &struct_data->has_bulk); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->n_items); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->timestamp); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->server_time_elapsed); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } ret = hg_proc_int64_t(proc, &struct_data->server_memory_consumption); if (ret != HG_SUCCESS) { - // HG_LOG_ERROR("Proc error"); + return ret; } return ret; diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index 339bf23f1..17dec6159 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -34,6 +34,7 @@ #include "pdc_utlist.h" #include "pdc_server.h" #include "pdc_server_data.h" +#include "pdc_logger.h" #include #include @@ -431,24 +432,24 @@ PDC_print_metadata(pdc_metadata_t *a) if (a == NULL) PGOTO_ERROR_VOID("==Empty metadata structure"); - printf("================================\n"); - printf(" data_type = [%d]\n", a->data_type); - printf(" obj_id = %" PRIu64 "\n", a->obj_id); - printf(" cont_id = %" PRIu64 "\n", a->cont_id); - printf(" uid = %d\n", a->user_id); - printf(" app_name = [%s]\n", a->app_name); - printf(" obj_name = [%s]\n", a->obj_name); - printf(" obj_loc = [%s]\n", a->data_location); - printf(" time_step = %d\n", a->time_step); - printf(" tags = [%s]\n", a->tags); - printf(" ndim = %lu\n", a->ndim); - printf(" dims = %" PRIu64 "", a->dims[0]); + LOG_JUST_PRINT("================================\n"); + LOG_JUST_PRINT(" data_type = [%d]\n", a->data_type); + LOG_JUST_PRINT(" obj_id = %" PRIu64 "\n", a->obj_id); + LOG_JUST_PRINT(" cont_id = %" PRIu64 "\n", a->cont_id); + LOG_JUST_PRINT(" uid = %d\n", a->user_id); + LOG_JUST_PRINT(" app_name = [%s]\n", a->app_name); + LOG_JUST_PRINT(" obj_name = [%s]\n", a->obj_name); + LOG_JUST_PRINT(" obj_loc = [%s]\n", a->data_location); + LOG_JUST_PRINT(" time_step = %d\n", a->time_step); + LOG_JUST_PRINT(" tags = [%s]\n", a->tags); + LOG_JUST_PRINT(" ndim = %lu\n", a->ndim); + LOG_JUST_PRINT(" dims = %" PRIu64 "", a->dims[0]); for (i = 1; i < a->ndim; i++) - printf(", %" PRIu64 "", a->dims[i]); + LOG_JUST_PRINT(", %" PRIu64 "", a->dims[i]); // print regiono info DL_FOREACH(a->storage_region_list_head, elt) PDC_print_region_list(elt); - printf("\n================================\n\n"); + LOG_JUST_PRINT("\n================================\n\n"); fflush(stdout); done: @@ -612,25 +613,28 @@ PDC_print_storage_region_list(region_list_t *a) FUNC_ENTER(NULL); - if (a == NULL) + if (a == NULL) { PGOTO_ERROR_VOID("==Empty region_list_t structure"); + } - if (a->ndim > 4) + if (a->ndim > 4) { PGOTO_ERROR_VOID("==Error with ndim %lu", a->ndim); + } + + LOG_JUST_PRINT("================================\n"); + LOG_JUST_PRINT(" ndim = %lu\n", a->ndim); + LOG_JUST_PRINT(" start count\n"); - printf("================================\n"); - printf(" ndim = %lu\n", a->ndim); - printf(" start count\n"); for (i = 0; i < a->ndim; i++) { - printf(" %5" PRIu64 " %5" PRIu64 "\n", a->start[i], a->count[i]); + LOG_JUST_PRINT(" %5" PRIu64 " %5" PRIu64 "\n", a->start[i], a->count[i]); } - printf(" path: %s\n", a->storage_location); - printf(" buf_map: %d\n", a->buf_map_refcount); - printf(" dirty: %d\n", a->reg_dirty_from_buf); - printf(" offset: %" PRIu64 "\n", a->offset); + LOG_JUST_PRINT(" path: %s\n", a->storage_location); + LOG_JUST_PRINT(" buf_map: %d\n", a->buf_map_refcount); + LOG_JUST_PRINT(" dirty: %d\n", a->reg_dirty_from_buf); + LOG_JUST_PRINT(" offset: %" PRIu64 "\n", a->offset); - printf("================================\n\n"); + LOG_JUST_PRINT("================================\n\n"); fflush(stdout); done: @@ -648,27 +652,24 @@ PDC_print_region_list(region_list_t *a) if (a == NULL) PGOTO_ERROR_VOID("==Empty region_list_t structure"); - printf("\n == Region Info ==\n"); - printf(" ndim = %lu\n", a->ndim); + LOG_JUST_PRINT("\n == Region Info ==\n"); + LOG_JUST_PRINT(" ndim = %lu\n", a->ndim); if (a->ndim > 4) PGOTO_ERROR_VOID("Error with dim %lu\n", a->ndim); - - printf(" start count\n"); - /* printf("start stride count\n"); */ for (i = 0; i < a->ndim; i++) { - printf(" %5" PRIu64 " %5" PRIu64 "\n", a->start[i], a->count[i]); + LOG_JUST_PRINT(" %5" PRIu64 " %5" PRIu64 "\n", a->start[i], a->count[i]); } - printf(" Storage location: [%s]\n", a->storage_location); - printf(" Storage offset : %" PRIu64 " \n", a->offset); - printf(" Client IDs: "); + LOG_JUST_PRINT(" Storage location: [%s]\n", a->storage_location); + LOG_JUST_PRINT(" Storage offset : %" PRIu64 " \n", a->offset); + LOG_JUST_PRINT(" Client IDs:"); i = 0; while (1) { - printf("%u, ", a->client_ids[i]); + LOG_JUST_PRINT("%u, ", a->client_ids[i]); i++; if (a->client_ids[i] == 0) break; } - printf("\n =================\n"); + LOG_JUST_PRINT("\n =================\n"); done: fflush(stdout); @@ -1566,10 +1567,7 @@ HG_TEST_RPC_CB(gen_obj_id, handle) #ifdef ENABLE_MPI int server_rank; MPI_Comm_rank(MPI_COMM_WORLD, &server_rank); - /* - printf("server rank %llu generated object with data server ID %u, obj_id = %llu\n", (long long - unsigned) server_rank, (unsigned)in.data.data_server_id, (long long unsigned) out.obj_id); - */ + #endif HG_Respond(handle, NULL, NULL, &out); @@ -1864,7 +1862,7 @@ HG_TEST_RPC_CB(send_rpc, handle) FUNC_ENTER(NULL); HG_Get_input(handle, &in); - fprintf(stderr, "==PDC_Server[]: %s received value from client %d\n", __func__, in.value); + LOG_ERROR("==PDC_Server: received value from client %d\n", in.value); out.value = 1; HG_Respond(handle, NULL, NULL, &out); @@ -1956,7 +1954,7 @@ HG_TEST_RPC_CB(metadata_add_kvtag, handle) PDC_Server_add_kvtag(&in, &out); } else { - printf("==PDC_SERVER[]: received NOOP\n"); + LOG_INFO("==PDC_SERVER[]: received NOOP\n"); out.ret = 1; } @@ -1996,7 +1994,7 @@ HG_TEST_RPC_CB(notify_io_complete, handle) HG_Respond(handle, PDC_Client_work_done_cb, read_info, &out); } else { - printf("==PDC_CLIENT: notify_io_complete_cb() - error with io type!\n"); + LOG_ERROR("==PDC_CLIENT: notify_io_complete_cb() - error with io type!\n"); HG_Respond(handle, NULL, NULL, &out); } @@ -2421,7 +2419,7 @@ transform_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_inf registry[transform_id]->ftnPtr; size_t result = this_transform(buf, bulk_args->in.data_type, ndim, dims, &data_buf, bulk_args->in.dest_type); - printf("==PDC_SERVER: transform returned %ld\n", result); + LOG_INFO("==PDC_SERVER: transform returned %ld\n", result); puts("----------------"); if ((use_transform_size == 0) && dims) @@ -2556,8 +2554,7 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t * _cbs) = registry[analysis_meta_index]->ftnPtr; int result = analysis_ftn(bulk_args->in.input_iter, bulk_args->in.output_iter, &iter_cbs); - printf("==PDC_SERVER: Analysis returned %d\n", result); - puts("----------------\n"); + LOG_INFO("==PDC_SERVER: Analysis returned %d\n", result); } } #ifdef ENABLE_MPI @@ -2634,8 +2631,8 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); if (mpi_rank == 0) { - printf("Analysis avg time = %lf seconds\nIO avg time = %lf\n", averages[2] / mpi_size, - averages[3] / mpi_size); + LOG_INFO("Analysis avg time = %lf seconds\nIO avg time = %lf\n", averages[2] / mpi_size, + averages[3] / mpi_size); } } #endif @@ -2915,12 +2912,6 @@ HG_TEST_RPC_CB(region_release, handle) /* Get info from handle */ hg_info = HG_Get_info(handle); - /* time_t t; */ - /* struct tm tm; */ - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("start region_release: %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ - if (in.access_type == PDC_READ) { // check region is dirty or not, if dirty transfer data request_region = (region_list_t *)malloc(sizeof(region_list_t)); @@ -2944,11 +2935,6 @@ HG_TEST_RPC_CB(region_release, handle) (server_region->size)[0] = size; (server_region->offset)[0] = in.region.start_0; - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("start PDC_Server_data_read_direct: %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, - * tm.tm_sec); */ - ret_value = PDC_Server_data_read_direct(elt->from_obj_id, server_region, data_buf); if (ret_value != SUCCEED) PGOTO_ERROR(HG_OTHER_ERROR, "==PDC SERVER: PDC_Server_data_read_direct() failed"); @@ -3123,14 +3109,6 @@ HG_TEST_RPC_CB(region_release, handle) out.ret = 1; HG_Respond(handle, NULL, NULL, &out); #else - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("start PDC_Server_data_read_from: %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, - * tm.tm_sec); */ -/* - PDC_Server_data_read_from(obj_map_bulk_args->remote_obj_id, remote_reg_info, data_buf, - in.data_unit); -*/ #ifdef PDC_SERVER_CACHE PDC_transfer_request_data_read_from(obj_map_bulk_args->remote_obj_id, 0, NULL, remote_reg_info, data_buf, in.data_unit); @@ -3142,7 +3120,7 @@ HG_TEST_RPC_CB(region_release, handle) size2 = HG_Bulk_get_size(remote_bulk_handle); if (size != size2) { error = 1; - printf("==PDC_SERVER: local size %llu, remote %llu\n", size, size2); + LOG_INFO("==PDC_SERVER: local size %llu, remote %llu\n", size, size2); PGOTO_ERROR(HG_OTHER_ERROR, "===PDC SERVER: HG_TEST_RPC_CB(region_release, " "handle) local and remote bulk size does not match"); } @@ -3175,10 +3153,6 @@ HG_TEST_RPC_CB(region_release, handle) HG_Free_input(handle, &in); HG_Destroy(handle); } - - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("done read: %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ } // write lock release with mapping case // do data tranfer if it is write lock release with mapping. @@ -3315,7 +3289,7 @@ HG_TEST_RPC_CB(region_release, handle) size2 = HG_Bulk_get_size(remote_bulk_handle); if (size != size2) { error = 1; - printf("==PDC_SERVER: local size %llu, remote %llu\n", size, size2); + LOG_INFO("==PDC_SERVER: local size %llu, remote %llu\n", size, size2); /* PGOTO_ERROR(HG_OTHER_ERROR, "===PDC SERVER: HG_TEST_RPC_CB(region_release, * handle) local and remote bulk size does not match"); */ } @@ -3349,9 +3323,6 @@ HG_TEST_RPC_CB(region_release, handle) } } done: - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("done region_release: %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ if (error == 1) { out.ret = 0; HG_Respond(handle, NULL, NULL, &out); @@ -3523,8 +3494,7 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha size = HG_Bulk_get_size(eltt2->local_bulk_handle); if (size != HG_Bulk_get_size(remote_bulk_handle)) PGOTO_ERROR(HG_OTHER_ERROR, - "===PDC SERVER: %s - local and remote bulk size does not match", - __func__); + "===PDC SERVER: local and remote bulk size does not match"); hg_ret = HG_Bulk_transfer(hg_info->context, obj_map_region_release_bulk_transfer_cb, transform_release_bulk_args, HG_BULK_PUSH, hg_info->addr, @@ -3739,7 +3709,7 @@ HG_TEST_RPC_CB(region_transform_release, handle) // do data transfer if it is write lock release with mapping. // ************************************************************ else { - printf("region_release_cb: release obj_id=%" PRIu64 " access_type==WRITE\n", in.obj_id); + LOG_INFO("region_release_cb: release obj_id=%" PRIu64 " access_type==WRITE\n", in.obj_id); request_region = (region_list_t *)malloc(sizeof(region_list_t)); PDC_region_transfer_t_to_list_t(&in.region, request_region); target_obj = PDC_Server_get_obj_region(in.obj_id); @@ -4802,7 +4772,7 @@ HG_TEST_RPC_CB(bulk_rpc, handle) bulk_args->nbytes = HG_Bulk_get_size(origin_bulk_handle); bulk_args->cnt = cnt; - printf("==PDC_SERVER: bulk_rpc_cb, nbytes %lu\n", bulk_args->nbytes); + LOG_INFO("==PDC_SERVER: bulk_rpc_cb, nbytes %lu\n", bulk_args->nbytes); /* Create a new block handle to read the data */ HG_Bulk_create(hg_info->hg_class, 1, NULL, (hg_size_t *)&bulk_args->nbytes, HG_BULK_READWRITE, @@ -5036,7 +5006,7 @@ HG_TEST_RPC_CB(get_metadata_by_id, handle) if (target != NULL) PDC_metadata_t_to_transfer_t(target, &out.res_meta); else { - printf("==PDC_SERVER: no matching metadata of obj_id=%" PRIu64 "\n", in.obj_id); + LOG_INFO("==PDC_SERVER: no matching metadata of obj_id=%" PRIu64 "\n", in.obj_id); out.res_meta.user_id = -1; out.res_meta.obj_id = 0; out.res_meta.cont_id = 0; @@ -5161,13 +5131,13 @@ PDC_find_in_path(char *workingDir, char *application) // Change directory (pushd) to the where we find the application if (chdir(checkPath) == 0) { if (getcwd(checkPath, sizeof(checkPath)) == NULL) { - printf("Path is too large\n"); + LOG_ERROR("Path is too large\n"); } offset = strlen(checkPath); // Change back (popd) to where we started if (chdir(workingDir) != 0) { - printf("Check dir failed\n"); + LOG_ERROR("Check dir failed\n"); } sprintf(&checkPath[offset], "/%s", appName); PGOTO_DONE(strdup(checkPath)); @@ -6222,7 +6192,7 @@ HG_TEST_RPC_CB(send_shm_bulk_rpc, handle) bulk_args->nbytes = HG_Bulk_get_size(origin_bulk_handle); bulk_args->cnt = cnt; - printf("==PDC_SERVER: send_bulk_rpc_cb, nbytes %lu\n", bulk_args->nbytes); + LOG_ERROR("==PDC_SERVER: send_bulk_rpc_cb, nbytes %lu\n", bulk_args->nbytes); /* Create a new bulk handle to read the data */ HG_Bulk_create(hg_info->hg_class, 1, NULL, (hg_size_t *)&bulk_args->nbytes, HG_BULK_READWRITE, @@ -6443,7 +6413,6 @@ HG_TEST_RPC_CB(dart_get_server_info, handle) // Send response to client HG_Respond(handle, NULL, NULL, &out); - /* printf("==PDC_SERVER: dart_get_server_info_cb(): returned %llu\n", out.indexed_word_count); */ // Free input HG_Free_input(handle, &in); // Free handle @@ -6478,23 +6447,18 @@ HG_TEST_RPC_CB(dart_perform_one_server, handle) stopwatch_t server_timer; timer_start(&server_timer); - // printf("==PDC_SERVER: dart_perform_one_server_cb(): key = %s\n", in.attr_key); - PDC_Server_dart_perform_one_server(&in, &out, n_obj_ids_ptr, buf_ptrs); timer_pause(&server_timer); out.server_time_elapsed = (int64_t)timer_delta_us(&server_timer); out.server_memory_consumption = (int64_t)PDC_get_global_mem_usage(); - // printf("perform_server_cb. n_obj_ids_ptr on op_type = %d = %d\n", in.op_type ,*n_obj_ids_ptr); out.op_type = in.op_type; - // printf("out.n_items= %d\n", out.n_items); // No result found if (*n_obj_ids_ptr == 0) { out.bulk_handle = HG_BULK_NULL; out.ret = 0; - // printf("No object ids returned for the query\n"); - ret = HG_Respond(handle, NULL, NULL, &out); + ret = HG_Respond(handle, NULL, NULL, &out); goto done; } @@ -6506,26 +6470,21 @@ HG_TEST_RPC_CB(dart_perform_one_server, handle) hg_ret = HG_Bulk_create(hg_class_g, n_buf, (void **)buf_ptrs, (const hg_size_t *)buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); return EXIT_FAILURE; } // Fill bulk handle and return number of metadata that satisfy the query out.bulk_handle = bulk_handle; out.ret = *n_obj_ids_ptr; - // printf("out.ret = %d\n", out.ret); // FIXME: Memory leak? buf_ptrs is not freed // TODO: To confirm how we can know the bulk data has been sent to client completely // Send bulk handle to client - /* printf("query_partial_cb(): Sending bulk handle to client\n"); */ - /* fflush(stdout); */ - /* HG_Respond(handle, PDC_server_bulk_respond_cb, NULL, &out); */ ret = HG_Respond(handle, NULL, NULL, &out); done: - /* printf("==PDC_SERVER: metadata_index_search_cb(): returned %llu\n", out.ret); */ // Free input HG_Free_input(handle, &in); // Free handle @@ -6878,11 +6837,11 @@ PDC_get_overlap_start_count(uint32_t ndim, uint64_t *start_a, uint64_t *count_a, // Check if they are truly overlapping regions if (PDC_is_contiguous_start_count_overlap(ndim, start_a, count_a, start_b, count_b) != 1) { - printf("== %s: non-overlap regions!\n", __func__); + LOG_INFO("non-overlap regions!\n"); for (i = 0; i < ndim; i++) { - printf("\t\tdim%" PRIu64 " - start_a: %" PRIu64 " count_a: %" PRIu64 ", " - "\t\tstart_b:%" PRIu64 " count_b:%" PRIu64 "\n", - i, start_a[i], count_a[i], start_b[i], count_b[i]); + LOG_INFO("\t\tdim%" PRIu64 " - start_a: %" PRIu64 " count_a: %" PRIu64 ", " + "\t\tstart_b:%" PRIu64 " count_b:%" PRIu64 "\n", + i, start_a[i], count_a[i], start_b[i], count_b[i]); } PGOTO_DONE(FAIL); } @@ -7071,7 +7030,6 @@ serialize(pdc_query_t *root, int *combine_ops, int *cnt, pdc_query_constraint_t FUNC_ENTER(NULL); if (root == NULL) { - /* fprintf(fp, "%d ", MARKER); */ combine_ops[*cnt] = -1; (*cnt)++; PGOTO_DONE_VOID; @@ -7135,85 +7093,55 @@ print_query(pdc_query_t *query) if (query->left == NULL && query->right == NULL) { - printf(" (%" PRIu64 " %s", query->constraint->obj_id, pdcquery_op_char_g[query->constraint->op]); - /* - if (query->constraint->is_range == 1) { - if (query->constraint->type == PDC_FLOAT) - printf(" %.6f %s %.6f) ", *((float *)&query->constraint->value), - pdcquery_op_char_g[query->constraint->op2], *((float - *)&query->constraint->value2)); else if (query->constraint->type == PDC_DOUBLE) printf(" %.6f %s - %.6f) ", *((double *)&query->constraint->value), pdcquery_op_char_g[query->constraint->op2], - *((double *)&query->constraint->value2)); else if (query->constraint->type == PDC_INT) printf(" %d - %s %d) ", *((int *)&query->constraint->value), pdcquery_op_char_g[query->constraint->op2], *((int - *)&query->constraint->value2)); else if (query->constraint->type == PDC_UINT) printf(" %u %s %u) ", - *((unsigned *)&query->constraint->value), pdcquery_op_char_g[query->constraint->op2], *((unsigned - *)&query->constraint->value2)); else if (query->constraint->type == PDC_INT64) printf(" %" PRId64 " - %s %" PRId64 ")", *((int64_t *)&query->constraint->value), - pdcquery_op_char_g[query->constraint->op2], *((int64_t - *)&query->constraint->value2)); else if (query->constraint->type == PDC_UINT64) printf(" %" PRId64 - " %s %" PRId64 ") ", *((uint64_t *)&query->constraint->value), - pdcquery_op_char_g[query->constraint->op2], *((uint64_t - *)&query->constraint->value2)); - } - else { - if (query->constraint->type == PDC_FLOAT) - printf(" %.6f) ", *((float *)&query->constraint->value)); - else if (query->constraint->type == PDC_DOUBLE) - printf(" %.6f) ", *((double *)&query->constraint->value)); - else if (query->constraint->type == PDC_INT) - printf(" %d) ", *((int *)&query->constraint->value)); - else if (query->constraint->type == PDC_UINT) - printf(" %u) ", *((unsigned *)&query->constraint->value)); - else if (query->constraint->type == PDC_INT64) - printf(" %" PRId64 ")", *((int64_t *)&query->constraint->value)); - else if (query->constraint->type == PDC_UINT64) - printf(" %" PRIu64 ") ", *((uint64_t *)&query->constraint->value)); - } - */ + LOG_JUST_PRINT(" (%" PRIu64 " %s", query->constraint->obj_id, + pdcquery_op_char_g[query->constraint->op]); if (query->constraint->is_range == 1) { if (query->constraint->type == PDC_FLOAT) - printf(" %.6f %s %.6f) ", (float)query->constraint->value, - pdcquery_op_char_g[query->constraint->op2], (float)query->constraint->value2); + LOG_JUST_PRINT(" %.6f %s %.6f) ", (float)query->constraint->value, + pdcquery_op_char_g[query->constraint->op2], (float)query->constraint->value2); else if (query->constraint->type == PDC_DOUBLE) - printf(" %.6f %s %.6f) ", (double)query->constraint->value, - pdcquery_op_char_g[query->constraint->op2], (double)query->constraint->value2); + LOG_JUST_PRINT(" %.6f %s %.6f) ", (double)query->constraint->value, + pdcquery_op_char_g[query->constraint->op2], (double)query->constraint->value2); else if (query->constraint->type == PDC_INT) - printf(" %d %s %d) ", (int)query->constraint->value, - pdcquery_op_char_g[query->constraint->op2], (int)query->constraint->value2); + LOG_JUST_PRINT(" %d %s %d) ", (int)query->constraint->value, + pdcquery_op_char_g[query->constraint->op2], (int)query->constraint->value2); else if (query->constraint->type == PDC_UINT) - printf(" %u %s %u) ", (unsigned)query->constraint->value, - pdcquery_op_char_g[query->constraint->op2], (unsigned)query->constraint->value2); + LOG_JUST_PRINT(" %u %s %u) ", (unsigned)query->constraint->value, + pdcquery_op_char_g[query->constraint->op2], + (unsigned)query->constraint->value2); else if (query->constraint->type == PDC_INT64) - printf(" %" PRId64 " %s %" PRId64 ")", (int64_t)query->constraint->value, - pdcquery_op_char_g[query->constraint->op2], (int64_t)query->constraint->value2); + LOG_JUST_PRINT(" %" PRId64 " %s %" PRId64 ")", (int64_t)query->constraint->value, + pdcquery_op_char_g[query->constraint->op2], + (int64_t)query->constraint->value2); else if (query->constraint->type == PDC_UINT64) - printf(" %" PRId64 " %s %" PRId64 ") ", (uint64_t)query->constraint->value, - pdcquery_op_char_g[query->constraint->op2], (uint64_t)query->constraint->value2); + LOG_JUST_PRINT(" %" PRId64 " %s %" PRId64 ") ", (uint64_t)query->constraint->value, + pdcquery_op_char_g[query->constraint->op2], + (uint64_t)query->constraint->value2); } else { if (query->constraint->type == PDC_FLOAT) - printf(" %.6f) ", (float)query->constraint->value); + LOG_JUST_PRINT(" %.6f) ", (float)query->constraint->value); else if (query->constraint->type == PDC_DOUBLE) - printf(" %.6f) ", (double)query->constraint->value); + LOG_JUST_PRINT(" %.6f) ", (double)query->constraint->value); else if (query->constraint->type == PDC_INT) - printf(" %d) ", (int)query->constraint->value); + LOG_JUST_PRINT(" %d) ", (int)query->constraint->value); else if (query->constraint->type == PDC_UINT) - printf(" %u) ", (unsigned)query->constraint->value); + LOG_JUST_PRINT(" %u) ", (unsigned)query->constraint->value); else if (query->constraint->type == PDC_INT64) - printf(" %" PRId64 ")", (int64_t)query->constraint->value); + LOG_JUST_PRINT(" %" PRId64 ")", (int64_t)query->constraint->value); else if (query->constraint->type == PDC_UINT64) - printf(" %" PRIu64 ") ", (uint64_t)query->constraint->value); + LOG_JUST_PRINT(" %" PRIu64 ") ", (uint64_t)query->constraint->value); } PGOTO_DONE_VOID; } - printf("("); + LOG_JUST_PRINT("("); print_query(query->left); - printf(" %s ", pdcquery_combine_op_char_g[query->combine_op]); + LOG_JUST_PRINT(" %s ", pdcquery_combine_op_char_g[query->combine_op]); print_query(query->right); - printf(")"); + LOG_JUST_PRINT(")"); done: FUNC_LEAVE_VOID; @@ -7226,18 +7154,19 @@ PDCquery_print(pdc_query_t *query) FUNC_ENTER(NULL); - printf("Value selection: \n"); + LOG_JUST_PRINT("Value selection: \n"); print_query(query); - printf("\n"); + LOG_JUST_PRINT("\n"); if (query->region) { - printf("Spatial selection: \n"); - printf(" ndim = %lu\n", query->region->ndim); - printf(" start count\n"); + LOG_JUST_PRINT("Spatial selection: \n"); + LOG_JUST_PRINT(" ndim = %lu\n", query->region->ndim); + LOG_JUST_PRINT(" start count\n"); for (i = 0; i < query->region->ndim; i++) { - printf(" %5" PRIu64 " %5" PRIu64 "\n", query->region->offset[i], query->region->size[i]); + LOG_JUST_PRINT(" %5" PRIu64 " %5" PRIu64 "\n", query->region->offset[i], + query->region->size[i]); } } - printf("\n"); + LOG_JUST_PRINT("\n"); fflush(stdout); FUNC_LEAVE_VOID; @@ -7386,22 +7315,22 @@ PDCselection_print(pdc_selection_t *sel) FUNC_ENTER(NULL); - printf("== %" PRIu64 " hits, allocated %" PRIu64 " coordinates!\n", sel->nhits, sel->coords_alloc); - printf("== Coordinates:\n"); + LOG_JUST_PRINT("== %" PRIu64 " hits, allocated %" PRIu64 " coordinates!\n", sel->nhits, + sel->coords_alloc); + LOG_JUST_PRINT("== Coordinates:\n"); if (sel->nhits > 10) { for (i = 0; i < 10; i++) - - printf(" ,%" PRIu64 "", sel->coords[i]); - printf(" , ... "); + LOG_JUST_PRINT(" ,%" PRIu64 "", sel->coords[i]); + LOG_JUST_PRINT(" , ..."); for (i = sel->nhits - 10; i < sel->nhits; i++) - printf(" ,%" PRIu64 "", sel->coords[i]); + LOG_JUST_PRINT(" ,%" PRIu64 "", sel->coords[i]); } else { for (i = 0; i < sel->nhits; i++) - printf(" ,%" PRIu64 "", sel->coords[i]); + LOG_JUST_PRINT(" ,%" PRIu64 "", sel->coords[i]); } - printf("\n\n"); + LOG_JUST_PRINT("\n\n"); FUNC_LEAVE_VOID; } @@ -7413,13 +7342,14 @@ PDCselection_print_all(pdc_selection_t *sel) FUNC_ENTER(NULL); - printf("== %" PRIu64 " hits, allocated %" PRIu64 " coordinates!\n", sel->nhits, sel->coords_alloc); - printf("== Coordinates:\n"); + LOG_JUST_PRINT("== %" PRIu64 " hits, allocated %" PRIu64 " coordinates!\n", sel->nhits, + sel->coords_alloc); + LOG_JUST_PRINT("== Coordinates:\n"); for (i = 0; i < sel->nhits; i++) - printf(" ,%" PRIu64 "", sel->coords[i]); + LOG_JUST_PRINT(" ,%" PRIu64 "", sel->coords[i]); - printf("\n\n"); + LOG_JUST_PRINT("\n\n"); FUNC_LEAVE_VOID; } diff --git a/src/server/pdc_server.c b/src/server/pdc_server.c index e39f4f790..9247005f4 100644 --- a/src/server/pdc_server.c +++ b/src/server/pdc_server.c @@ -57,6 +57,7 @@ #include "pdc_timing.h" #include "pdc_server_region_cache.h" #include "pdc_server_region_transfer_metadata_query.h" +#include "pdc_logger.h" #ifdef PDC_HAS_CRAY_DRC #include @@ -184,7 +185,7 @@ PDC_Server_remote_server_info_init(pdc_remote_server_info_t *info) if (info == NULL) { ret_value = FAIL; - printf("==PDC_SERVER: NULL info, unable to init pdc_remote_server_info_t!\n"); + LOG_ERROR("==PDC_SERVER: NULL info, unable to init pdc_remote_server_info_t!\n"); goto done; } @@ -218,7 +219,7 @@ PDC_Server_destroy_client_info(pdc_client_info_t *info) if (info[i].addr_valid == 1) { hg_ret = HG_Addr_free(hg_class_g, info[i].addr); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER: PDC_Server_destroy_client_info() error with HG_Addr_free\n"); + LOG_ERROR("==PDC_SERVER: PDC_Server_destroy_client_info() error with HG_Addr_free\n"); ret_value = FAIL; goto done; } @@ -245,7 +246,7 @@ PDC_client_info_init(pdc_client_info_t *a) FUNC_ENTER(NULL); if (a == NULL) { - printf("==PDC_SERVER: PDC_client_info_init() NULL input!\n"); + LOG_ERROR("==PDC_SERVER: PDC_client_info_init() NULL input!\n"); ret_value = FAIL; goto done; } @@ -280,8 +281,8 @@ PDC_Server_get_client_addr(const struct hg_cb_info *callback_info) if (pdc_client_info_g && in->is_init == 1) { if (is_debug_g && pdc_server_rank_g == 0) { - printf("==PDC_SERVER[%d]: new application run detected, create new client info\n", - pdc_server_rank_g); + LOG_INFO("==PDC_SERVER[%d]: new application run detected, create new client info\n", + pdc_server_rank_g); fflush(stdout); } @@ -296,7 +297,7 @@ PDC_Server_get_client_addr(const struct hg_cb_info *callback_info) pdc_client_num_g = in->nclient; pdc_client_info_g = (pdc_client_info_t *)calloc(sizeof(pdc_client_info_t), in->nclient); if (pdc_client_info_g == NULL) { - printf("==PDC_SERVER: PDC_Server_get_client_addr - unable to allocate space\n"); + LOG_ERROR("==PDC_SERVER: PDC_Server_get_client_addr - unable to allocate space\n"); ret_value = FAIL; goto done; } @@ -333,7 +334,7 @@ PDC_Server_print_version() FUNC_ENTER(NULL); HG_Version_get(&major, &minor, &patch); - printf("Server running mercury version %u.%u-%u\n", major, minor, patch); + LOG_INFO("Server running mercury version %u.%u-%u\n", major, minor, patch); return; } @@ -358,7 +359,7 @@ PDC_Server_write_addr_to_file(char **addr_strings, int n) snprintf(config_fname, ADDR_MAX, "%s%s", pdc_server_tmp_dir_g, pdc_server_cfg_name_g); FILE *na_config = fopen(config_fname, "w+"); if (!na_config) { - fprintf(stderr, "Could not open config file from: %s\n", config_fname); + LOG_ERROR("Could not open config file from: %s\n", config_fname); goto done; } @@ -392,7 +393,7 @@ remove_directory(const char *dir) // FTS_XDEV - Don't cross filesystem boundaries ftsp = fts_open(files, FTS_NOCHDIR | FTS_PHYSICAL | FTS_XDEV, NULL); if (!ftsp) { - fprintf(stderr, "PDC_SERVER: %s: fts_open failed: %s\n", dir, strerror(curr->fts_errno)); + LOG_ERROR("PDC_SERVER: %s: fts_open failed: %s\n", dir, strerror(curr->fts_errno)); ret = -1; goto done; } @@ -422,8 +423,8 @@ remove_directory(const char *dir) case FTS_SLNONE: case FTS_DEFAULT: if (remove(curr->fts_accpath) < 0) { - fprintf(stderr, "PDC_SERVER: %s: Failed to remove: %s\n", curr->fts_path, - strerror(curr->fts_errno)); + LOG_ERROR("PDC_SERVER: %s: Failed to remove: %s\n", curr->fts_path, + strerror(curr->fts_errno)); ret = -1; } break; @@ -454,7 +455,7 @@ PDC_Server_rm_config_file() snprintf(config_fname, ADDR_MAX, "%s%s", pdc_server_tmp_dir_g, pdc_server_cfg_name_g); if (remove(config_fname) != 0) { - printf("==PDC_SERVER[%d]: Unable to delete the config file[%s]", pdc_server_rank_g, config_fname); + LOG_ERROR("==PDC_SERVER[%d]: Unable to delete the config file[%s]", pdc_server_rank_g, config_fname); ret_value = FAIL; goto done; } @@ -506,7 +507,7 @@ lookup_remote_server_cb(const struct hg_cb_info *callback_info) #endif if (pdc_remote_server_info_g[server_id].addr == NULL) { - printf("==PDC_SERVER[%d]: %s - remote server addr is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: remote server addr is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -543,7 +544,7 @@ PDC_Server_lookup_server_id(int remote_server_id) hg_ret = HG_Addr_lookup(hg_context_g, lookup_remote_server_cb, lookup_args, pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER: Connection to remote server FAILED!\n"); + LOG_ERROR("==PDC_SERVER: Connection to remote server FAILED!\n"); ret_value = FAIL; goto done; } @@ -582,7 +583,8 @@ PDC_Server_lookup_all_servers() continue; if (PDC_Server_lookup_server_id(i) != SUCCEED) { - printf("==PDC_SERVER[%d]: ERROR when lookup remote server %d!\n", pdc_server_rank_g, i); + LOG_ERROR("==PDC_SERVER[%d]: Error when lookup remote server %d!\n", pdc_server_rank_g, + i); ret_value = FAIL; goto done; } @@ -591,8 +593,8 @@ PDC_Server_lookup_all_servers() } if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER[%d]: Successfully established connection to %d other PDC servers\n", - pdc_server_rank_g, pdc_server_size_g - 1); + LOG_INFO("==PDC_SERVER[%d]: Successfully established connection to %d other PDC servers\n", + pdc_server_rank_g, pdc_server_size_g - 1); fflush(stdout); } @@ -621,7 +623,7 @@ PDC_Server_lookup_client_cb(const struct hg_cb_info *callback_info) client_id = server_lookup_args->client_id; if (client_id >= (uint32_t)pdc_client_num_g) { - printf("==PDC_SERVER[%d]: invalid input client id %d\n", pdc_server_rank_g, client_id); + LOG_ERROR("==PDC_SERVER[%d]: invalid input client id %d\n", pdc_server_rank_g, client_id); goto done; } pdc_client_info_g[client_id].addr = callback_info->info.lookup.addr; @@ -650,7 +652,7 @@ PDC_Server_lookup_client(uint32_t client_id) FUNC_ENTER(NULL); if (pdc_client_num_g <= 0) { - printf("==PDC_SERVER[%d]: %s - number of client <= 0!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: number of client <= 0!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -670,7 +672,7 @@ PDC_Server_lookup_client(uint32_t client_id) hg_ret = HG_Addr_lookup(hg_context_g, PDC_Server_lookup_client_cb, &lookup_args, target_addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: Connection to client %d FAILED!\n", pdc_server_rank_g, client_id); + LOG_ERROR("==PDC_SERVER[%d]: Connection to client %d FAILED!\n", pdc_server_rank_g, client_id); ret_value = FAIL; goto done; } @@ -819,7 +821,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) gethostname(hostname, HOSTNAME_LEN - 1); snprintf(na_info_string, NA_STRING_INFO_LEN, "%s://%s:%d", hg_transport, hostname, port); if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[%d]: using %.7s\n", pdc_server_rank_g, na_info_string); + LOG_INFO("==PDC_SERVER[%d]: using %.7s\n", pdc_server_rank_g, na_info_string); // Clean up all the tmp files etc HG_Cleanup(); @@ -838,15 +840,15 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) sleep(1); goto drc_access_again; } - printf("server drc_access() failed (%d, %s)", rc, drc_strerror(-rc)); + LOG_ERROR("server drc_access() failed (%d, %s)", rc, drc_strerror(-rc)); ret_value = FAIL; goto done; } cookie = drc_get_first_cookie(credential_info); if (pdc_server_rank_g == 0) { - printf("# Credential is %u\n", credential); - printf("# Cookie is %u\n", cookie); + LOG_INFO("# Credential is %u\n", credential); + LOG_INFO("# Cookie is %u\n", cookie); fflush(stdout); } sprintf(pdc_auth_key, "%u", cookie); @@ -865,7 +867,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) #endif *hg_class = HG_Init_opt(na_info_string, HG_TRUE, &init_info); if (*hg_class == NULL) { - printf("Error with HG_Init()\n"); + LOG_ERROR("Error with HG_Init()\n"); return FAIL; } @@ -875,7 +877,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) // Create HG context *hg_context = HG_Context_create(*hg_class); if (*hg_context == NULL) { - printf("Error with HG_Context_create()\n"); + LOG_ERROR("Error with HG_Context_create()\n"); return FAIL; } @@ -889,7 +891,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) for (i = 0; i < pdc_server_size_g; i++) { ret_value = PDC_Server_remote_server_info_init(&pdc_remote_server_info_g[i]); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: error with PDC_Server_remote_server_info_init\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_remote_server_info_init\n", pdc_server_rank_g); goto done; } } @@ -920,7 +922,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) hg_thread_pool_init(n_thread, &hg_test_thread_pool_g); hg_thread_pool_init(1, &hg_test_thread_pool_fs_g); if (pdc_server_rank_g == 0) - printf("\n==PDC_SERVER[%d]: Starting server with %d threads...\n", pdc_server_rank_g, n_thread); + LOG_INFO("\n==PDC_SERVER[%d]: Starting server with %d threads...\n", pdc_server_rank_g, n_thread); hg_thread_mutex_init(&hash_table_new_mutex_g); hg_thread_mutex_init(&pdc_client_info_mutex_g); hg_thread_mutex_init(&pdc_metadata_hash_table_mutex_g); @@ -947,12 +949,12 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) hg_thread_mutex_init(&update_remote_server_addr_mutex_g); #else if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[%d]: without multi-thread!\n", pdc_server_rank_g); + LOG_INFO("==PDC_SERVER[%d]: without multi-thread!\n", pdc_server_rank_g); #endif #ifdef PDC_SERVER_CACHE if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[%d]: Read cache enabled!\n", pdc_server_rank_g); + LOG_INFO("==PDC_SERVER[%d]: Read cache enabled!\n", pdc_server_rank_g); #endif // TODO: support restart with different number of servers than previous run @@ -963,7 +965,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) ret_value = PDC_Server_restart(checkpoint_file); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: error with PDC_Server_restart\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_restart\n", pdc_server_rank_g); goto done; } metadata_index_recover(pdc_server_tmp_dir_g, pdc_server_size_g, pdc_server_rank_g); @@ -975,7 +977,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) // Hash table init ret_value = PDC_Server_init_hash_table(); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: error with PDC_Server_init_hash_table\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_init_hash_table\n", pdc_server_rank_g); goto done; } } @@ -1027,7 +1029,7 @@ PDC_Server_destroy_remote_server_info() if (pdc_remote_server_info_g[i].addr_valid == 1) { hg_ret = HG_Addr_free(hg_class_g, pdc_remote_server_info_g[i].addr); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER: PDC_Server_destroy_remote_server_info() error with HG_Addr_free\n"); + LOG_ERROR("==PDC_SERVER: PDC_Server_destroy_remote_server_info() error with HG_Addr_free\n"); ret_value = FAIL; goto done; } @@ -1081,13 +1083,13 @@ PDC_Server_finalize() ret_value = PDC_Server_destroy_client_info(pdc_client_info_g); if (ret_value != SUCCEED) { - printf("==PDC_SERVER: Error with PDC_Server_destroy_client_info\n"); + LOG_ERROR("==PDC_SERVER: Error with PDC_Server_destroy_client_info\n"); goto done; } ret_value = PDC_Server_destroy_remote_server_info(); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_destroy_client_info\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_destroy_client_info\n", pdc_server_rank_g); goto done; } @@ -1167,13 +1169,13 @@ PDC_Server_finalize() hg_ret = HG_Context_destroy(hg_context_g); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: error with HG_Context_destroy\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with HG_Context_destroy\n", pdc_server_rank_g); goto done; } hg_ret = HG_Finalize(hg_class_g); if (hg_ret != HG_SUCCESS) - printf("==PDC_SERVER[%d]: error with HG_Finalize\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with HG_Finalize\n", pdc_server_rank_g); done: free(all_addr_strings_g); @@ -1189,9 +1191,8 @@ PDC_Server_recv_shm_cb(const struct hg_cb_info *callback_info) shm_info = (pdc_shm_info_t *)callback_info->arg; - printf("==PDC_SERVER[%d]: recv shm from %d: [%s], %" PRIu64 "\n", pdc_server_rank_g, shm_info->client_id, - shm_info->shm_addr, shm_info->size); - // TODO + LOG_INFO("==PDC_SERVER[%d]: recv shm from %d: [%s], %" PRIu64 "\n", pdc_server_rank_g, + shm_info->client_id, shm_info->shm_addr, shm_info->size); return HG_SUCCESS; } @@ -1201,7 +1202,6 @@ PDC_Server_checkpoint_cb() { if (pdc_disable_checkpoint_g == 0) PDC_Server_checkpoint(); - return HG_SUCCESS; } @@ -1258,7 +1258,7 @@ PDC_Server_checkpoint() pdc_server_rank_g, pdc_server_rank_g); snprintf(checkpoint_file_local, ADDR_MAX, "/tmp/metadata_checkpoint.%d", pdc_server_rank_g); if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER[%4d]: Checkpoint file [%s]\n", pdc_server_rank_g, checkpoint_file); + LOG_INFO("==PDC_SERVER[%4d]: Checkpoint file [%s]\n", pdc_server_rank_g, checkpoint_file); fflush(stdout); } @@ -1268,7 +1268,7 @@ PDC_Server_checkpoint() file = fopen(checkpoint_file, "w+"); if (file == NULL) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file open error", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file open error", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -1346,25 +1346,8 @@ PDC_Server_checkpoint() } if (n_write_region != n_region) - fprintf(stderr, "==PDC_SERVER[%d]: %s - ERROR with number of regions", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with number of regions", pdc_server_rank_g); } -#if 0 - // Write storage region info - data_server_region_t *region = NULL; - region = PDC_Server_get_obj_region(elt->obj_id); - if (region) { - DL_COUNT(region->region_storage_head, region_elt, n_region); - fwrite(&n_region, sizeof(int), 1, file); - DL_FOREACH(region->region_storage_head, region_elt) - { - fwrite(region_elt, sizeof(region_list_t), 1, file); - } - } - else { - fwrite(&n_region, sizeof(int), 1, file); - } -#endif metadata_size++; region_count += n_region; } // End for metadata entry linked list @@ -1395,7 +1378,7 @@ PDC_Server_checkpoint() #ifdef PDC_TIMING gettimeofday(&pdc_timer_end_rank, 0); checkpoint_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end_rank); - printf("==PDC_SERVER[%4d]: write to tmpfs took %7.2fs\n", pdc_server_rank_g, checkpoint_time); + LOG_INFO("==PDC_SERVER[%4d]: write to tmpfs took %7.2fs\n", pdc_server_rank_g, checkpoint_time); #endif // Copy from /tmp to target under $PDC_TMPDIR snprintf(cmd, 4096, "mv %s %s", checkpoint_file_local, checkpoint_file); @@ -1417,20 +1400,20 @@ PDC_Server_checkpoint() #endif #ifdef PDC_TIMING - printf("==PDC_SERVER[%4d]: checkpointed %10d objects, with %10d regions, took %7.2fs\n", - pdc_server_rank_g, metadata_size, region_count, checkpoint_time_rank); + LOG_INFO("==PDC_SERVER[%4d]: checkpointed %10d objects, with %10d regions, took %7.2fs\n", + pdc_server_rank_g, metadata_size, region_count, checkpoint_time_rank); gettimeofday(&pdc_timer_end, 0); checkpoint_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); fflush(stdout); if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[ ALL]: total checkpoint time = %.6f\n", checkpoint_time); + LOG_ERROR("==PDC_SERVER[ ALL]: total checkpoint time = %.6f\n", checkpoint_time); #endif if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER[ ALL]: checkpointed %10d objects, with %10d regions \n", all_metadata_size, - all_region_count); + LOG_INFO("==PDC_SERVER[ ALL]: checkpointed %10d objects, with %10d regions \n", all_metadata_size, + all_region_count); fflush(stdout); } @@ -1479,32 +1462,31 @@ PDC_Server_restart(char *filename) // init hash table ret_value = PDC_Server_init_hash_table(); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - PDC_Server_init_hash_table FAILED!", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_init_hash_table FAILED!", pdc_server_rank_g); ret_value = FAIL; goto done; } FILE *file = fopen(filename, "r"); if (file == NULL) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file open FAILED [%s]!", pdc_server_rank_g, __func__, - filename); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file open FAILED [%s]!", pdc_server_rank_g, filename); ret_value = FAIL; goto done; } char *slurm_jobid = getenv("SLURM_JOB_ID"); if (slurm_jobid == NULL) { - printf("Error getting slurm job id from SLURM_JOB_ID!\n"); + LOG_ERROR("Error getting slurm job id from SLURM_JOB_ID!\n"); } if (fread(&n_cont, sizeof(int), 1, file) != 1) { - printf("Read failed for n_count\n"); + LOG_ERROR("Read failed for n_count\n"); } all_cont = n_cont; while (n_cont > 0) { hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for hash_key\n"); + LOG_ERROR("Read failed for hash_key\n"); } total_mem_usage_g += sizeof(uint32_t); @@ -1512,14 +1494,14 @@ PDC_Server_restart(char *filename) cont_entry = (pdc_cont_hash_table_entry_t *)malloc(sizeof(pdc_cont_hash_table_entry_t)); total_mem_usage_g += sizeof(pdc_cont_hash_table_entry_t); if (fread(cont_entry, sizeof(pdc_cont_hash_table_entry_t), 1, file) != 1) { - printf("Read failed for cont_entry\n"); + LOG_ERROR("Read failed for cont_entry\n"); } #ifdef ENABLE_MULTITHREAD hg_thread_mutex_lock(&pdc_container_hash_table_mutex_g); #endif if (hash_table_insert(container_hash_table_g, hash_key, cont_entry) != 1) { - printf("==PDC_SERVER[%d]: %s - hash table insert failed\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: hash table insert failed\n", pdc_server_rank_g); ret_value = FAIL; } #ifdef ENABLE_MULTITHREAD @@ -1530,16 +1512,16 @@ PDC_Server_restart(char *filename) } // End while if (fread(&n_entry, sizeof(int), 1, file) != 1) { - printf("Read failed for n_entry\n"); + LOG_ERROR("Read failed for n_entry\n"); } while (n_entry > 0) { if (fread(&count, sizeof(int), 1, file) != 1) { - printf("Read failed for count\n"); + LOG_ERROR("Read failed for count\n"); } hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for hash_key\n"); + LOG_ERROR("Read failed for hash_key\n"); } total_mem_usage_g += sizeof(uint32_t); @@ -1554,7 +1536,7 @@ PDC_Server_restart(char *filename) metadata = (pdc_metadata_t *)calloc(sizeof(pdc_metadata_t), count); for (i = 0; i < count; i++) { if (fread(metadata + i, sizeof(pdc_metadata_t), 1, file) != 1) { - printf("Read failed for metadata\n"); + LOG_ERROR("Read failed for metadata\n"); } (metadata + i)->storage_region_list_head = NULL; @@ -1569,37 +1551,36 @@ PDC_Server_restart(char *filename) // Read kv tags if (fread(&n_kvtag, sizeof(int), 1, file) != 1) { - printf("Read failed for n_kvtag\n"); + LOG_ERROR("Read failed for n_kvtag\n"); } for (j = 0; j < n_kvtag; j++) { pdc_kvtag_list_t *kvtag_list = (pdc_kvtag_list_t *)calloc(1, sizeof(pdc_kvtag_list_t)); kvtag_list->kvtag = (pdc_kvtag_t *)malloc(sizeof(pdc_kvtag_t)); if (fread(&key_len, sizeof(int), 1, file) != 1) { - printf("Read failed for key_len\n"); + LOG_ERROR("Read failed for key_len\n"); } kvtag_list->kvtag->name = malloc(key_len); if (fread((void *)(kvtag_list->kvtag->name), key_len, 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->name\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->name\n"); } if (fread(&kvtag_list->kvtag->size, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->size\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->size\n"); } if (fread(&kvtag_list->kvtag->type, sizeof(int8_t), 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->type\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->type\n"); } kvtag_list->kvtag->value = malloc(kvtag_list->kvtag->size); if (fread(kvtag_list->kvtag->value, kvtag_list->kvtag->size, 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->value\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->value\n"); } DL_APPEND((metadata + i)->kvtag_list_head, kvtag_list); } if (fread(&n_region, sizeof(int), 1, file) != 1) { - printf("Read failed for n_region\n"); + LOG_ERROR("Read failed for n_region\n"); } if (n_region < 0) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file region number ERROR!", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file region number ERROR!", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -1612,24 +1593,24 @@ PDC_Server_restart(char *filename) for (j = 0; j < n_region; j++) { region_list = (region_list_t *)malloc(sizeof(region_list_t)); if (fread(region_list, sizeof(region_list_t), 1, file) != 1) { - printf("Read failed for region_list\n"); + LOG_ERROR("Read failed for region_list\n"); } int has_hist = 0; if (fread(&has_hist, sizeof(int), 1, file) != 1) { - printf("Read failed for has_list\n"); + LOG_ERROR("Read failed for has_list\n"); } if (has_hist == 1) { region_list->region_hist = (pdc_histogram_t *)malloc(sizeof(pdc_histogram_t)); if (fread(®ion_list->region_hist->dtype, sizeof(int), 1, file) != 1) { - printf("Read failed for region_list->region_hist->dtype\n"); + LOG_ERROR("Read failed for region_list->region_hist->dtype\n"); } if (fread(®ion_list->region_hist->nbin, sizeof(int), 1, file) != 1) { - printf("Read failed for region_list->region_hist->nbin\n"); + LOG_ERROR("Read failed for region_list->region_hist->nbin\n"); } if (region_list->region_hist->nbin == 0) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file histogram size is 0!", - pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file histogram size is 0!", + pdc_server_rank_g); } region_list->region_hist->range = @@ -1639,14 +1620,14 @@ PDC_Server_restart(char *filename) if (fread(region_list->region_hist->range, sizeof(double), region_list->region_hist->nbin * 2, file) != 1) { - printf("Read failed for region_list->region_hist->range\n"); + LOG_ERROR("Read failed for region_list->region_hist->range\n"); } if (fread(region_list->region_hist->bin, sizeof(uint64_t), region_list->region_hist->nbin, file) != 1) { - printf("Read failed for region_list->region_hist->bin\n"); + LOG_ERROR("Read failed for region_list->region_hist->bin\n"); } if (fread(®ion_list->region_hist->incr, sizeof(double), 1, file) != 1) { - printf("Read failed for region_list->region_hist->incr\n"); + LOG_ERROR("Read failed for region_list->region_hist->incr\n"); } } @@ -1703,7 +1684,7 @@ PDC_Server_restart(char *filename) // Add to hash list and bloom filter ret_value = PDC_Server_hash_table_list_insert(entry, elt); if (ret_value != SUCCEED) { - printf("==PDC_SERVER: error with hash table recovering from checkpoint file\n"); + LOG_ERROR("==PDC_SERVER: error with hash table recovering from checkpoint file\n"); goto done; } } @@ -1711,7 +1692,7 @@ PDC_Server_restart(char *filename) } if (fread(&n_objs, sizeof(int), 1, file) != 1) { - printf("Read failed for n_objs\n"); + LOG_ERROR("Read failed for n_objs\n"); } for (i = 0; i < n_objs; ++i) { @@ -1720,28 +1701,27 @@ PDC_Server_restart(char *filename) new_obj_reg->fd = -1; new_obj_reg->storage_location = (char *)malloc(sizeof(char) * ADDR_MAX); if (fread(&new_obj_reg->obj_id, sizeof(uint64_t), 1, file) != 1) { - printf("Read failed for obj_id\n"); + LOG_ERROR("Read failed for obj_id\n"); } if (fread(&n_region, sizeof(int), 1, file) != 1) { - printf("Read failed for n_region\n"); + LOG_ERROR("Read failed for n_region\n"); } DL_APPEND(dataserver_region_g, new_obj_reg); for (j = 0; j < n_region; j++) { region_list_t *new_region_list = (region_list_t *)malloc(sizeof(region_list_t)); if (fread(new_region_list, sizeof(region_list_t), 1, file) != 1) { - printf("Read failed for new_region_list\n"); + LOG_ERROR("Read failed for new_region_list\n"); } DL_APPEND(new_obj_reg->region_storage_head, new_region_list); } } if (fread(&checkpoint_size, sizeof(uint64_t), 1, file) != 1) { - printf("Read failed for checkpoint size\n"); + LOG_ERROR("Read failed for checkpoint size\n"); } - /* printf("checkpoint size for metadata query = %lu\n", checkpoint_size); */ checkpoint_buf = (char *)malloc(checkpoint_size); if (fread(checkpoint_buf, checkpoint_size, 1, file) != 1) { - printf("Read failed for checkpoint buf\n"); + LOG_ERROR("Read failed for checkpoint buf\n"); } transfer_request_metadata_query_init(pdc_server_size_g, checkpoint_buf); free(checkpoint_buf); @@ -1758,9 +1738,9 @@ PDC_Server_restart(char *filename) #endif if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER[0]: Server restarted from saved session, " - "successfully loaded %d containers, %d objects, %d regions...\n", - all_cont, all_nobj, all_n_region); + LOG_INFO("==PDC_SERVER[0]: Server restarted from saved session, " + "successfully loaded %d containers, %d objects, %d regions...\n", + all_cont, all_nobj, all_n_region); } done: @@ -1861,7 +1841,6 @@ PDC_Server_loop(hg_context_t *hg_context) if (pdc_disable_checkpoint_g == 0 && checkpoint_interval % PDC_CHECKPOINT_CHK_OP_INTERVAL == 0) { cur_time = clock(); double elapsed_time = ((double)(cur_time - last_checkpoint_time)) / CLOCKS_PER_SEC; - /* fprintf(stderr, "PDC_SERVER: loop elapsed time %.2f\n", elapsed_time); */ // Do not checkpoint too often, has a min time interval between checkpoints if (elapsed_time > PDC_CHECKPOINT_MIN_INTERVAL_SEC) { PDC_Server_checkpoint(); @@ -1966,22 +1945,23 @@ PDC_print_IO_stats() #endif if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER[0]: IO STATS (MIN, AVG, MAX)\n" - " #fwrite %4d, Tfwrite (%6.2f, %6.2f, %6.2f), %.0f MB\n" - " #fread %4d, Tfread (%6.2f, %6.2f, %6.2f), %.0f MB\n" - " #fopen %4d, Tfopen (%6.2f, %6.2f, %6.2f)\n" - " Tfsync (%6.2f, %6.2f, %6.2f)\n" - " Ttotal_IO (%6.2f, %6.2f, %6.2f)\n" - " Ttotal_IO_elapsed (%6.2f, %6.2f, %6.2f)\n" - " Tregion_update (%6.2f, %6.2f, %6.2f)\n" - " Tget_region (%6.2f, %6.2f, %6.2f)\n" - " #read_bb %4d, size %d MB\n", - n_fwrite_g, write_time_min, write_time_avg, write_time_max, fwrite_total_MB, n_fread_g, - read_time_min, read_time_avg, read_time_max, fread_total_MB, n_fopen_g, open_time_min, - open_time_avg, open_time_max, fsync_time_min, fsync_time_avg, fsync_time_max, total_io_min, - total_io_avg, total_io_max, io_elapsed_time_min, io_elapsed_time_avg, io_elapsed_time_max, - update_time_min, update_time_avg, update_time_max, get_info_time_min, get_info_time_avg, - get_info_time_max, n_read_from_bb_g, read_from_bb_size_g); + LOG_JUST_PRINT("==PDC_SERVER[0]: IO STATS (MIN, AVG, MAX)\n" + " #fwrite %4d, Tfwrite (%6.2f, %6.2f, %6.2f), %.0f MB\n" + " #fread %4d, Tfread (%6.2f, %6.2f, %6.2f), %.0f MB\n" + " #fopen %4d, Tfopen (%6.2f, %6.2f, %6.2f)\n" + " Tfsync (%6.2f, %6.2f, %6.2f)\n" + " Ttotal_IO (%6.2f, %6.2f, %6.2f)\n" + " Ttotal_IO_elapsed (%6.2f, %6.2f, %6.2f)\n" + " Tregion_update (%6.2f, %6.2f, %6.2f)\n" + " Tget_region (%6.2f, %6.2f, %6.2f)\n" + " #read_bb %4d, size %d MB\n", + n_fwrite_g, write_time_min, write_time_avg, write_time_max, fwrite_total_MB, n_fread_g, + read_time_min, read_time_avg, read_time_max, fread_total_MB, n_fopen_g, open_time_min, + open_time_avg, open_time_max, fsync_time_min, fsync_time_avg, fsync_time_max, + total_io_min, total_io_avg, total_io_max, io_elapsed_time_min, io_elapsed_time_avg, + io_elapsed_time_max, update_time_min, update_time_avg, update_time_max, + get_info_time_min, get_info_time_avg, get_info_time_max, n_read_from_bb_g, + read_from_bb_size_g); } } #endif @@ -2149,7 +2129,7 @@ PDC_Server_get_env() if (is_debug_env != NULL) { is_debug_g = atoi(is_debug_env); if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[%d]: PDC_DEBUG set to %d!\n", pdc_server_rank_g, is_debug_g); + LOG_INFO("==PDC_SERVER[%d]: PDC_DEBUG set to %d!\n", pdc_server_rank_g, is_debug_g); } tmp_env_char = getenv("PDC_GEN_HIST"); @@ -2163,34 +2143,34 @@ PDC_Server_get_env() tmp_env_char = getenv("PDC_USE_FASTBIT_IDX"); if (tmp_env_char != NULL) { use_fastbit_idx_g = 1; - printf("==PDC_SERVER[%d]: using FastBit for data indexing and querying\n"); + LOG_INFO("==PDC_SERVER[%d]: using FastBit for data indexing and querying\n"); } tmp_env_char = getenv("PDC_USE_ROCKSDB"); if (tmp_env_char != NULL && strcmp(tmp_env_char, "1") == 0) { use_rocksdb_g = 1; if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[%d]: using RocksDB for kvtag\n"); + LOG_INFO("==PDC_SERVER[%d]: using RocksDB for kvtag\n"); } tmp_env_char = getenv("PDC_USE_SQLITE3"); if (tmp_env_char != NULL && strcmp(tmp_env_char, "1") == 0) { use_sqlite3_g = 1; if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[%d]: using SQLite3 for kvtag\n", pdc_server_rank_g); + LOG_INFO("==PDC_SERVER[%d]: using SQLite3 for kvtag\n", pdc_server_rank_g); } tmp_env_char = getenv("PDC_DISABLE_CHECKPOINT"); if (tmp_env_char != NULL && strcmp(tmp_env_char, "TRUE") == 0) { pdc_disable_checkpoint_g = 1; if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[0]: checkpoint disabled!\n"); + LOG_INFO("==PDC_SERVER[0]: checkpoint disabled!\n"); } if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER[%d]: using [%s] as tmp dir, %d OSTs, %d OSTs per data file, %d%% to BB\n", - pdc_server_rank_g, pdc_server_tmp_dir_g, lustre_total_ost_g, pdc_nost_per_file_g, - write_to_bb_percentage_g); + LOG_INFO("==PDC_SERVER[%d]: using [%s] as tmp dir, %d OSTs, %d OSTs per data file, %d%% to BB\n", + pdc_server_rank_g, pdc_server_tmp_dir_g, lustre_total_ost_g, pdc_nost_per_file_g, + write_to_bb_percentage_g); } } @@ -2233,7 +2213,7 @@ server_run(int argc, char *argv[]) port = pdc_server_rank_g % 32 + 7000; ret = PDC_Server_init(port, &hg_class_g, &hg_context_g); if (ret != SUCCEED || hg_class_g == NULL || hg_context_g == NULL) { - printf("==PDC_SERVER[%d]: Error with Mercury init\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with Mercury init\n", pdc_server_rank_g); goto done; } // Register Mercury RPC/bulk @@ -2248,7 +2228,7 @@ server_run(int argc, char *argv[]) char *lookup_on_demand = getenv("PDC_LOOKUP_ON_DEMAND"); if (lookup_on_demand != NULL) { if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[0]: will lookup other PDC servers on demand\n"); + LOG_INFO("==PDC_SERVER[0]: will lookup other PDC servers on demand\n"); } else PDC_Server_lookup_all_servers(); @@ -2256,7 +2236,7 @@ server_run(int argc, char *argv[]) // Write server addrs to the config file for client to read from if (pdc_server_rank_g == 0) if (PDC_Server_write_addr_to_file(all_addr_strings_g, pdc_server_size_g) != SUCCEED) - printf("==PDC_SERVER[%d]: Error with write config file\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with write config file\n", pdc_server_rank_g); #ifdef ENABLE_ROCKSDB if (use_rocksdb_g) { @@ -2285,7 +2265,7 @@ server_run(int argc, char *argv[]) rocksdb_g = rocksdb_open(options, rocksdb_path, &err); assert(!err); if (pdc_server_rank_g == 0) - printf("==PDC_SERVER[%d]: RocksDB initialized\n", pdc_server_rank_g); + LOG_INFO("==PDC_SERVER[%d]: RocksDB initialized\n", pdc_server_rank_g); } #endif @@ -2302,27 +2282,27 @@ server_run(int argc, char *argv[]) "value_int INTEGER, value_float REAL, value_double REAL, value_blob BLOB);", 0, 0, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); // Create indexes sqlite3_exec(sqlite3_db_g, "CREATE INDEX index_name ON objects(name);", 0, 0, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); sqlite3_exec(sqlite3_db_g, "CREATE INDEX index_value_int ON objects(value_int);", 0, 0, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); sqlite3_exec(sqlite3_db_g, "CREATE INDEX index_value_text ON objects(value_text);", 0, 0, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); sqlite3_exec(sqlite3_db_g, "CREATE INDEX index_value_float ON objects(value_float);", 0, 0, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); sqlite3_exec(sqlite3_db_g, "CREATE INDEX index_value_double ON objects(value_double);", 0, 0, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); } #endif @@ -2337,12 +2317,12 @@ server_run(int argc, char *argv[]) if (pdc_server_rank_g == 0) { #ifdef PDC_TIMING - printf("==PDC_SERVER[%d]: total startup time = %.6f\n", pdc_server_rank_g, server_init_time); + LOG_INFO("==PDC_SERVER[%d]: total startup time = %.6f\n", pdc_server_rank_g, server_init_time); #endif #ifdef ENABLE_MPI - printf("==PDC_SERVER[%d]: Server ready!\n\n\n", pdc_server_rank_g); + LOG_INFO("==PDC_SERVER[%d]: Server ready!\n\n\n", pdc_server_rank_g); #else - printf("==PDC_SERVER[%d]: Server ready (no MPI)!\n\n\n", pdc_server_rank_g); + LOG_INFO("==PDC_SERVER[%d]: Server ready (no MPI)!\n\n\n", pdc_server_rank_g); #endif } fflush(stdout); @@ -2365,7 +2345,7 @@ server_run(int argc, char *argv[]) struct stat st; snprintf(rocksdb_fname, ADDR_MAX, "/tmp/PDC_rocksdb_%d", pdc_server_rank_g); stat(rocksdb_fname, &st); - printf("==PDC_SERVER[%d]: RocksDB file size %lu\n", pdc_server_rank_g, st.st_size); + LOG_INFO("==PDC_SERVER[%d]: RocksDB file size %lu\n", pdc_server_rank_g, st.st_size); rocksdb_close(rocksdb_g); } @@ -2377,8 +2357,8 @@ server_run(int argc, char *argv[]) struct stat st; snprintf(sqlite3_fname, ADDR_MAX, "/tmp/PDC_sqlite3_%d", pdc_server_rank_g); stat(sqlite3_fname, &st); - printf("==PDC_SERVER[%d]: SQLite3 max memory usage: %llu, DB file size %lu\n", pdc_server_rank_g, - sqlite3_memory_highwater(0), st.st_size); + LOG_INFO("==PDC_SERVER[%d]: SQLite3 max memory usage: %llu, DB file size %lu\n", pdc_server_rank_g, + sqlite3_memory_highwater(0), st.st_size); sqlite3_close(sqlite3_db_g); } #endif diff --git a/src/server/pdc_server_analysis/pdc_server_analysis.c b/src/server/pdc_server_analysis/pdc_server_analysis.c index 8e2609bac..773db7c1e 100644 --- a/src/server/pdc_server_analysis/pdc_server_analysis.c +++ b/src/server/pdc_server_analysis/pdc_server_analysis.c @@ -58,6 +58,7 @@ #include "pdc_server.h" #include "pdc_analysis_pkg.h" #include "pdc_analysis.h" +#include "pdc_logger.h" #ifdef PDC_HAS_CRAY_DRC #include @@ -118,7 +119,7 @@ PDC_Server_instantiate_data_iterator(obj_data_iterator_in_t *in, obj_data_iterat thisIter->storage_order = (_pdc_major_type_t)((in->storageinfo >> 8) & 0xFF); region_reference = PDC_Server_get_obj_region(in->object_id); if (region_reference == NULL) { - printf("==PDC_ANALYSIS_SERVER: Unable to locate object region (id=%" PRIu64 ")\n", in->object_id); + LOG_ERROR("==PDC_ANALYSIS_SERVER: Unable to locate object region (id=%" PRIu64 ")\n", in->object_id); /* The most likely cause of this condition is that the client never * created an object mapping which would move the client data to the data-server. * We now have the option to either fail, or to create a new temporary region. @@ -126,45 +127,9 @@ PDC_Server_instantiate_data_iterator(obj_data_iterator_in_t *in, obj_data_iterat * data-server temp so that the client can update the locus info. */ out->server_region_id = -1; - -#if 0 -#ifdef ENABLE_MULTITHREAD - hg_thread_mutex_lock(&create_region_struct_mutex_g); -#endif - - new_obj_reg = (data_server_region_t *)malloc(sizeof(struct data_server_region_t)); - if(new_obj_reg == NULL) { -#ifdef ENABLE_MULTITHREAD - // Unlock before we bail out... - hg_thread_mutex_unlock(&create_region_struct_mutex_g); -#endif - PGOTO_ERROR(NULL, "PDC_Server_instantiate_data_iterator() allocation of new object region failed"); - } - new_obj_reg->obj_id = in->object_id; - new_obj_reg->region_lock_head = NULL; - new_obj_reg->region_buf_map_head = NULL; - new_obj_reg->region_lock_request_head = NULL; - new_obj_reg->obj_data_ptr = malloc(thisIter->totalElements * thisIter->element_size); - if (new_obj_reg->obj_data_ptr != NULL) { - DL_APPEND(dataserver_region_g, new_obj_reg); - } - else { -#ifdef ENABLE_MULTITHREAD - // Unlock before we bail out... - hg_thread_mutex_unlock(&create_region_struct_mutex_g); -#endif - free(new_obj_reg); - PGOTO_ERROR(NULL, "PDC_Server_instantiate_data_iterator() allocation of object data failed"); - } -#ifdef ENABLE_MULTITHREAD - hg_thread_mutex_unlock(&create_region_struct_mutex_g); -#endif - out->server_region_id = in->object_id; - printf("==PDC_ANALYSIS_SERVER: Created a temp data container for id=%ld\n", in->object_id); -#endif /* #if 0 */ } else { - printf("==PDC_ANALYSIS_SERVER: Found object region for id=%" PRIu64 "\n", in->object_id); + LOG_INFO("==PDC_ANALYSIS_SERVER: Found object region for id=%" PRIu64 "\n", in->object_id); out->server_region_id = in->object_id; } @@ -209,7 +174,7 @@ PDC_Server_get_ftn_reference(char *ftn) /* We need the in_process address of the function */ if ((appHandle = dlopen(0, RTLD_NOW)) == NULL) { char *this_error = dlerror(); - fprintf(stderr, "dlopen failed: %s\n", this_error); + LOG_ERROR("dlopen failed: %s\n", this_error); fflush(stderr); return NULL; } @@ -255,7 +220,7 @@ PDCobj_data_getNextBlock(pdcid_t iter, void **nextBlock, size_t *dims) if ((thisIter->srcNext = PDC_Server_get_region_data_ptr(thisIter->objectId)) == NULL) thisIter->srcNext = malloc(thisIter->totalElements * thisIter->element_size); if ((thisIter->srcStart = thisIter->srcNext) == NULL) { - printf("==PDC_ANALYSIS_SERVER: Unable to allocate iterator storage\n"); + LOG_ERROR("==PDC_ANALYSIS_SERVER: Unable to allocate iterator storage\n"); return 0; } thisIter->srcNext += thisIter->startOffset + thisIter->skipCount; diff --git a/src/server/pdc_server_metadata.c b/src/server/pdc_server_metadata.c index debc61694..04c3df74e 100644 --- a/src/server/pdc_server_metadata.c +++ b/src/server/pdc_server_metadata.c @@ -51,6 +51,7 @@ #include "mercury_hash_table.h" #include "pdc_malloc.h" #include "string_utils.h" +#include "pdc_logger.h" #define BLOOM_TYPE_T counting_bloom_t #define BLOOM_NEW new_counting_bloom @@ -310,7 +311,7 @@ find_metadata_by_id(uint64_t obj_id) } } // if (metadata_hash_table_g != NULL) else { - printf("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); + LOG_INFO("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); goto done; } @@ -456,7 +457,7 @@ PDC_Server_init_hash_table() // Metadata hash table metadata_hash_table_g = hash_table_new(PDC_Server_metadata_int_hash, PDC_Server_metadata_int_equal); if (metadata_hash_table_g == NULL) { - printf("==PDC_SERVER: metadata_hash_table_g init error! Exit...\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g init error! Exit...\n"); goto done; } hash_table_register_free_functions(metadata_hash_table_g, PDC_Server_metadata_int_hash_key_free, @@ -465,7 +466,7 @@ PDC_Server_init_hash_table() // Container hash table container_hash_table_g = hash_table_new(PDC_Server_metadata_int_hash, PDC_Server_metadata_int_equal); if (container_hash_table_g == NULL) { - printf("==PDC_SERVER: container_hash_table_g init error! Exit...\n"); + LOG_ERROR("==PDC_SERVER: container_hash_table_g init error! Exit...\n"); goto done; } hash_table_register_free_functions(container_hash_table_g, PDC_Server_metadata_int_hash_key_free, @@ -493,7 +494,7 @@ PDC_Server_remove_from_bloom(pdc_metadata_t *metadata, BLOOM_TYPE_T *bloom) FUNC_ENTER(NULL); if (bloom == NULL) { - printf("==PDC_SERVER: PDC_Server_remove_from_bloom(): bloom pointer is NULL\n"); + LOG_ERROR("==PDC_SERVER: PDC_Server_remove_from_bloom(): bloom pointer is NULL\n"); ret_value = FAIL; goto done; } @@ -503,7 +504,7 @@ PDC_Server_remove_from_bloom(pdc_metadata_t *metadata, BLOOM_TYPE_T *bloom) ret_value = BLOOM_REMOVE(bloom, combined_string, strlen(combined_string)); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_remove_from_bloom() - error\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_remove_from_bloom() - error\n", pdc_server_rank_g); goto done; } @@ -535,7 +536,7 @@ PDC_Server_add_to_bloom(pdc_metadata_t *metadata, BLOOM_TYPE_T *bloom) ret_value = BLOOM_ADD(bloom, combined_string, strlen(combined_string)); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_add_to_bloom() - error \n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_add_to_bloom() - error \n", pdc_server_rank_g); goto done; } @@ -574,7 +575,7 @@ PDC_Server_bloom_init(pdc_hash_table_entry_head *entry) entry->bloom = (BLOOM_TYPE_T *)BLOOM_NEW(capacity, error_rate); if (!entry->bloom) { - fprintf(stderr, "ERROR: Could not create bloom filter\n"); + LOG_ERROR("ERROR: Could not create bloom filter\n"); ret_value = -1; goto done; } @@ -608,16 +609,16 @@ PDC_Server_hash_table_list_insert(pdc_hash_table_entry_head *head, pdc_metadata_ } ret_value = PDC_Server_add_to_bloom(new, head->bloom); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_hash_table_list_insert() - error add to bloom\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_hash_table_list_insert() - error add to bloom\n", + pdc_server_rank_g); goto done; } } else if (head->n_obj >= CREATE_BLOOM_THRESHOLD || head->bloom != NULL) { ret_value = PDC_Server_add_to_bloom(new, head->bloom); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_hash_table_list_insert() - error add to bloom\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_hash_table_list_insert() - error add to bloom\n", + pdc_server_rank_g); goto done; } } @@ -659,7 +660,7 @@ PDC_Server_hash_table_list_init(pdc_hash_table_entry_head *entry, uint32_t *hash // Insert to hash table ret = hash_table_insert(metadata_hash_table_g, hash_key, entry); if (ret != 1) { - fprintf(stderr, "PDC_Server_hash_table_list_init(): Error with hash table insert!\n"); + LOG_ERROR("PDC_Server_hash_table_list_init(): Error with hash table insert!\n"); ret_value = FAIL; goto done; } @@ -699,7 +700,7 @@ PDC_Server_add_tag_metadata(metadata_add_tag_in_t *in, metadata_add_tag_out_t *o hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (hash_key == NULL) { - printf("==PDC_SERVER: Cannot allocate hash_key!\n"); + LOG_ERROR("==PDC_SERVER: Cannot allocate hash_key!\n"); goto done; } total_mem_usage_g += sizeof(uint32_t); @@ -740,26 +741,26 @@ PDC_Server_add_tag_metadata(metadata_add_tag_in_t *in, metadata_add_tag_out_t *o } // end if (target != NULL) else { // Object not found for deletion request - printf("==PDC_SERVER: add tag target not found 1!\n"); + LOG_ERROR("==PDC_SERVER: add tag target not found 1!\n"); out->ret = -1; } } // end if lookup_value != NULL else { - printf("==PDC_SERVER: add tag target not found 2!\n"); + LOG_ERROR("==PDC_SERVER: add tag target not found 2!\n"); out->ret = -1; } } // if (metadata_hash_table_g != NULL) else { - printf("==PDC_SERVER: metadata_hash_table_g not initilized!\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initilized!\n"); ret_value = FAIL; out->ret = -1; goto done; } if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - error \n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error \n", pdc_server_rank_g); goto done; } @@ -819,7 +820,7 @@ PDC_Server_update_metadata(metadata_update_in_t *in, metadata_update_out_t *out) hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (hash_key == NULL) { - printf("==PDC_SERVER: Cannot allocate hash_key!\n"); + LOG_ERROR("==PDC_SERVER: Cannot allocate hash_key!\n"); goto done; } total_mem_usage_g += sizeof(uint32_t); @@ -885,7 +886,7 @@ PDC_Server_update_metadata(metadata_update_in_t *in, metadata_update_out_t *out) } // if (metadata_hash_table_g != NULL) else { - printf("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); ret_value = -1; out->ret = -1; goto done; @@ -1017,7 +1018,7 @@ PDC_Server_delete_metadata_by_id(metadata_delete_by_id_in_t *in, metadata_delete } // while } // if (metadata_hash_table_g != NULL) else { - printf("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); ret_value = FAIL; out->ret = -1; goto done; @@ -1085,7 +1086,7 @@ PDC_delete_metadata_from_hash_table(metadata_delete_in_t *in, metadata_delete_ou hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (hash_key == NULL) { - printf("==PDC_SERVER: Cannot allocate hash_key!\n"); + LOG_ERROR("==PDC_SERVER: Cannot allocate hash_key!\n"); goto done; } total_mem_usage_g += sizeof(uint32_t); @@ -1133,21 +1134,21 @@ PDC_delete_metadata_from_hash_table(metadata_delete_in_t *in, metadata_delete_ou } // if (lookup_value != NULL) else { // Object not found for deletion request - printf("==PDC_SERVER: delete target not found!\n"); + LOG_ERROR("==PDC_SERVER: delete target not found!\n"); ret_value = -1; out->ret = -1; } } // if lookup_value != NULL else { - printf("==PDC_SERVER: delete target not found!\n"); + LOG_ERROR("==PDC_SERVER: delete target not found!\n"); ret_value = -1; out->ret = -1; } } // if (metadata_hash_table_g != NULL) else { - printf("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); ret_value = -1; out->ret = -1; goto done; @@ -1218,7 +1219,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out) metadata = (pdc_metadata_t *)PDC_malloc(sizeof(pdc_metadata_t)); if (metadata == NULL) { - printf("Cannot allocate pdc_metadata_t!\n"); + LOG_ERROR("Cannot allocate pdc_metadata_t!\n"); goto done; } @@ -1253,7 +1254,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out) hash_key = (uint32_t *)PDC_malloc(sizeof(uint32_t)); if (hash_key == NULL) { - printf("Cannot allocate hash_key!\n"); + LOG_ERROR("Cannot allocate hash_key!\n"); goto done; } total_mem_usage_g += sizeof(uint32_t); @@ -1263,7 +1264,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out) pdc_metadata_t * found_identical; if (debug_flag == 1) - printf("checking hash table with key=%d\n", *hash_key); + LOG_DEBUG("checking hash table with key=%d\n", *hash_key); #ifdef ENABLE_MULTITHREAD // Obtain lock for hash table @@ -1276,12 +1277,12 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out) // Is this hash value exist in the Hash table? if (lookup_value != NULL) { if (debug_flag == 1) - printf("lookup_value not NULL!\n"); + LOG_DEBUG("lookup_value not NULL!\n"); // Check if there exist metadata identical to current one found_identical = find_identical_metadata(lookup_value, metadata); if (found_identical != NULL) { - printf("==PDC_SERVER[%d]: Found identical metadata with name %s!\n", pdc_server_rank_g, - metadata->obj_name); + LOG_ERROR("==PDC_SERVER[%d]: Found identical metadata with name %s!\n", pdc_server_rank_g, + metadata->obj_name); out->obj_id = 0; free(metadata); goto done; @@ -1293,7 +1294,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out) else { // First entry for current hasy_key, init linked list, and insert to hash table if (debug_flag == 1) { - printf("lookup_value is NULL! Init linked list\n"); + LOG_DEBUG("lookup_value is NULL! Init linked list\n"); } fflush(stdout); @@ -1309,7 +1310,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out) } } else { - printf("metadata_hash_table_g not initialized!\n"); + LOG_ERROR("metadata_hash_table_g not initialized!\n"); goto done; } @@ -1398,13 +1399,13 @@ PDC_Server_print_all_containers() while (hash_table_iter_has_more(&hash_table_iter)) { pair = hash_table_iter_next(&hash_table_iter); cont_entry = pair.value; - printf("Container [%s]:", cont_entry->cont_name); + LOG_JUST_PRINT("Container [%s]:", cont_entry->cont_name); for (i = 0; i < cont_entry->n_obj; i++) { if (cont_entry->obj_ids[i] != 0) { - printf("%" PRIu64 ", ", cont_entry->obj_ids[i]); + LOG_JUST_PRINT("%" PRIu64 ", ", cont_entry->obj_ids[i]); } } - printf("\n"); + LOG_JUST_PRINT("\n"); } FUNC_LEAVE(ret_value); @@ -1438,8 +1439,8 @@ PDC_Server_metadata_duplicate_check() #endif if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER: Bloom filter says maybe %d times out of %d\n", all_maybe, all_total); - printf("==PDC_SERVER: Metadata duplicate check with %d hash entries ", all_entry); + LOG_INFO("==PDC_SERVER: Bloom filter says maybe %d times out of %d\n", all_maybe, all_total); + LOG_INFO("==PDC_SERVER: Metadata duplicate check with %d hash entries ", all_entry); } fflush(stdout); @@ -1475,10 +1476,10 @@ PDC_Server_metadata_duplicate_check() #endif if (pdc_server_rank_g == 0) { if (all_dup_obj > 0) { - printf(" ...Found duplicates!\n"); + LOG_INFO(" ...Found duplicates!\n"); } else { - printf(" ...No duplicates found!\n"); + LOG_INFO(" ...No duplicates found!\n"); } } @@ -1577,7 +1578,7 @@ PDC_Server_get_partial_query_result(metadata_query_transfer_in_t *in, uint32_t * *n_meta = iter; } // if (metadata_hash_table_g != NULL) else { - printf("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); ret_value = FAIL; goto done; } @@ -1676,10 +1677,9 @@ sqlite_query_kvtag_callback(void *data, int argc, char **argv, char **colName) } (*query_data->obj_ids)[query_data->nobj] = id; query_data->nobj += 1; - /* printf("SQLite3 found %s = %llu\n", colName[0], id); */ } else { - printf("SQLite3 found nothing\n"); + LOG_INFO("SQLite3 found nothing\n"); return 0; } @@ -1721,19 +1721,16 @@ PDC_Server_query_kvtag_rocksdb(pdc_kvtag_t *in, uint32_t *n_meta, uint64_t **obj (*obj_ids)[iter++] = obj_id; } - /* printf("==PDC_SERVER[%d]: rocksdb iter [%s] [%d], len %d\n", pdc_server_rank_g, tmp.name, - * *((int*)tmp.value), tmp.size); */ rocksdb_iter_next(rocksdb_iter); } *n_meta = iter; // Debug - /* printf("==PDC_SERVER[%d]: rocksdb found %d objids \n", pdc_server_rank_g, iter); */ if (rocksdb_iter) rocksdb_iter_destroy(rocksdb_iter); #else - printf("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -1828,17 +1825,14 @@ PDC_Server_query_kvtag_sqlite(pdc_kvtag_t *in, uint32_t *n_meta, uint64_t **obj_ query_data.nalloc = alloc_size; query_data.obj_ids = obj_ids; - // debug - /* printf("==PDC_SERVER[%d]: constructed SQL [%s]\n", pdc_server_rank_g, sql); */ - // Construct a SQL query sqlite3_exec(sqlite3_db_g, sql, sqlite_query_kvtag_callback, &query_data, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); *n_meta = query_data.nobj; #else - printf("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -1868,10 +1862,10 @@ PDC_Server_query_kvtag_someta(pdc_kvtag_t *in, uint32_t *n_meta, uint64_t **obj_ DL_FOREACH(head->metadata, elt) { #ifdef PDC_DEBUG_OUTPUT - printf("==PDC_SERVER: Matching kvtag [\"%s\":\"%s\"] of object %s on condition in->key: " - "%s, in->value: %s ", - (char *)kvtag_list_elt->kvtag->name, (char *)kvtag_list_elt->kvtag->value, - elt->obj_name, in->name, in->value); + LOG_DEBUG("==PDC_SERVER: Matching kvtag [\"%s\":\"%s\"] of object %s on condition in->key: " + "%s, in->value: %s ", + (char *)kvtag_list_elt->kvtag->name, (char *)kvtag_list_elt->kvtag->value, + elt->obj_name, in->name, in->value); #endif DL_FOREACH(elt->kvtag_list_head, kvtag_list_elt) { @@ -1896,11 +1890,11 @@ PDC_Server_query_kvtag_someta(pdc_kvtag_t *in, uint32_t *n_meta, uint64_t **obj_ } // End looping metadata hash table *n_meta = iter; #ifdef PDC_DEBUG_OUTPUT - printf("==PDC_SERVER[%d]: found %d objids \n", pdc_server_rank_g, iter); + LOG_DEBUG("==PDC_SERVER[%d]: found %d objids \n", pdc_server_rank_g, iter); #endif } // if (metadata_hash_table_g != NULL) else { - printf("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); ret_value = FAIL; } @@ -1921,27 +1915,27 @@ PDC_Server_get_kvtag_query_result(pdc_kvtag_t *in /*FIXME: query input should be *obj_ids = (void *)calloc(alloc_size, sizeof(uint64_t)); char *v_query = (char *)in->value; - printf("==PDC_SERVER[%d] before stripQuotes: Querying kvtag with key [%s], value [%s]\n", - pdc_server_rank_g, in->name, (char *)in->value); + LOG_INFO("==PDC_SERVER[%d] before stripQuotes: Querying kvtag with key [%s], value [%s]\n", + pdc_server_rank_g, in->name, (char *)in->value); if (is_string_query(v_query)) { in->value = stripQuotes(v_query); in->type = PDC_STRING; } - printf("==PDC_SERVER[%d] after stripQuotes: Querying kvtag with key [%s], value [%s]\n", - pdc_server_rank_g, in->name, (char *)in->value); + LOG_INFO("==PDC_SERVER[%d] after stripQuotes: Querying kvtag with key [%s], value [%s]\n", + pdc_server_rank_g, in->name, (char *)in->value); if (use_rocksdb_g == 1) { ret_value = PDC_Server_query_kvtag_rocksdb(in, n_meta, obj_ids, alloc_size); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_query_kvtag_rocksdb!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_query_kvtag_rocksdb!\n", pdc_server_rank_g); goto done; } } else if (use_sqlite3_g) { ret_value = PDC_Server_query_kvtag_sqlite(in, n_meta, obj_ids, alloc_size); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_query_kvtag_sqlite!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_query_kvtag_sqlite!\n", pdc_server_rank_g); goto done; } } // End if SQLite3 @@ -1949,7 +1943,7 @@ PDC_Server_get_kvtag_query_result(pdc_kvtag_t *in /*FIXME: query input should be // SoMeta backend ret_value = PDC_Server_query_kvtag_someta(in, n_meta, obj_ids, alloc_size); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_query_kvtag_someta!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_query_kvtag_someta!\n", pdc_server_rank_g); goto done; } } @@ -1999,13 +1993,13 @@ PDC_Server_search_with_name_timestep(const char *obj_name, uint32_t hash_key, ui } } else { - printf("metadata_hash_table_g not initialized!\n"); + LOG_ERROR("metadata_hash_table_g not initialized!\n"); ret_value = -1; goto done; } if (*out == NULL) - printf("==PDC_SERVER[%d]: Queried object with name [%s] not found! \n", pdc_server_rank_g, name); + LOG_ERROR("==PDC_SERVER[%d]: Queried object with name [%s] not found! \n", pdc_server_rank_g, name); done: fflush(stdout); @@ -2051,13 +2045,13 @@ PDC_Server_search_with_name_hash(const char *obj_name, uint32_t hash_key, pdc_me } } else { - printf("metadata_hash_table_g not initialized!\n"); + LOG_ERROR("metadata_hash_table_g not initialized!\n"); ret_value = -1; goto done; } if (*out == NULL) - printf("==PDC_SERVER[%d]: Queried object with name [%s] not found! \n", pdc_server_rank_g, name); + LOG_ERROR("==PDC_SERVER[%d]: Queried object with name [%s] not found! \n", pdc_server_rank_g, name); done: fflush(stdout); @@ -2098,7 +2092,7 @@ PDC_Server_get_local_metadata_by_id(uint64_t obj_id, pdc_metadata_t **res_meta_p } } else { - printf("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); + LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initialized!\n"); ret_value = FAIL; *res_meta_ptr = NULL; goto done; @@ -2131,8 +2125,8 @@ PDC_Server_get_metadata_by_id_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: PDC_Server_get_metadata_by_id_cb - error HG_Get_output\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_get_metadata_by_id_cb - error HG_Get_output\n", + pdc_server_rank_g); goto done; } @@ -2142,7 +2136,7 @@ PDC_Server_get_metadata_by_id_cb(const struct hg_cb_info *callback_info) PDC_transfer_t_to_metadata_t(&output.res_meta, meta); } else { - printf("==PDC_SERVER[%d]: %s - no valid metadata is retrieved\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: no valid metadata is retrieved\n", pdc_server_rank_g); goto done; } @@ -2152,7 +2146,7 @@ PDC_Server_get_metadata_by_id_cb(const struct hg_cb_info *callback_info) cb_args->cb(cb_args->args, PDC_POSIX); } else { - printf("==PDC_SERVER[%d]: %s NULL callback ptr\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL callback ptr\n", pdc_server_rank_g); goto done; } @@ -2182,7 +2176,7 @@ PDC_Server_get_metadata_by_id_with_cb(uint64_t obj_id, perr_t (*cb)(), void *arg // Metadata object is local, no need to send update RPC ret_value = PDC_Server_get_local_metadata_by_id(obj_id, &res_meta_ptr); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_get_local_metadata_by_id FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_get_local_metadata_by_id FAILED!\n", pdc_server_rank_g); goto done; } @@ -2192,8 +2186,8 @@ PDC_Server_get_metadata_by_id_with_cb(uint64_t obj_id, perr_t (*cb)(), void *arg } else { if (PDC_Server_lookup_server_id(server_id) != SUCCEED) { - printf("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, - server_id); + LOG_ERROR("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, + server_id); ret_value = FAIL; goto done; } @@ -2210,7 +2204,7 @@ PDC_Server_get_metadata_by_id_with_cb(uint64_t obj_id, perr_t (*cb)(), void *arg hg_ret = HG_Forward(get_metadata_by_id_handle, PDC_Server_get_metadata_by_id_cb, &cb_args, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - Could not forward\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Could not forward\n", pdc_server_rank_g); res_meta_ptr = NULL; HG_Destroy(get_metadata_by_id_handle); return FAIL; @@ -2268,7 +2262,7 @@ PDC_Server_create_container(gen_cont_id_in_t *in, gen_cont_id_out_t *out) else { hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (hash_key == NULL) { - printf("Cannot allocate hash_key!\n"); + LOG_ERROR("Cannot allocate hash_key!\n"); ret_value = FAIL; goto done; } @@ -2290,7 +2284,7 @@ PDC_Server_create_container(gen_cont_id_in_t *in, gen_cont_id_out_t *out) #endif // Insert to hash table if (hash_table_insert(container_hash_table_g, hash_key, entry) != 1) { - printf("==PDC_SERVER[%d]: %s - hash table insert failed\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: hash table insert failed\n", pdc_server_rank_g); ret_value = FAIL; } else @@ -2298,8 +2292,7 @@ PDC_Server_create_container(gen_cont_id_in_t *in, gen_cont_id_out_t *out) } } else { - printf("==PDC_SERVER[%d]: %s - container_hash_table_g not initialized!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: container_hash_table_g not initialized!\n", pdc_server_rank_g); goto done; } @@ -2358,21 +2351,20 @@ PDC_Server_delete_container_by_name(gen_cont_id_in_t *in, gen_cont_id_out_t *out if (lookup_value != NULL) { // Check if there exist metadata identical to current one - printf("==PDC_SERVER[%d]: Found existing container with same hash value, name=%s!\n", - pdc_server_rank_g, lookup_value->cont_name); + LOG_INFO("==PDC_SERVER[%d]: Found existing container with same hash value, name=%s!\n", + pdc_server_rank_g, lookup_value->cont_name); out->cont_id = 0; goto done; } else { // Check if there exist metadata identical to current one - printf("==PDC_SERVER[%d]: Did not found existing container with same hash value, name=%s!\n", - pdc_server_rank_g, lookup_value->cont_name); + LOG_ERROR("==PDC_SERVER[%d]: Did not found existing container with same hash value, name=%s!\n", + pdc_server_rank_g, lookup_value->cont_name); ret_value = FAIL; } } else { - printf("==PDC_SERVER[%d]: %s - container_hash_table_g not initialized!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: container_hash_table_g not initialized!\n", pdc_server_rank_g); goto done; } @@ -2393,7 +2385,7 @@ PDC_Server_find_container_by_name(const char *cont_name, pdc_cont_hash_table_ent FUNC_ENTER(NULL); if (NULL == cont_name || NULL == out) { - printf("==PDC_SERVER[%d]: %s - input is NULL! \n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: input is NULL! \n", pdc_server_rank_g); goto done; } @@ -2409,13 +2401,13 @@ PDC_Server_find_container_by_name(const char *cont_name, pdc_cont_hash_table_ent } } else { - printf("container_hash_table_g not initialized!\n"); + LOG_ERROR("container_hash_table_g not initialized!\n"); ret_value = -1; goto done; } if (*out == NULL) - printf("==PDC_SERVER[%d]: container [%s] not found! \n", pdc_server_rank_g, cont_name); + LOG_ERROR("==PDC_SERVER[%d]: container [%s] not found! \n", pdc_server_rank_g, cont_name); done: fflush(stdout); @@ -2443,7 +2435,7 @@ PDC_Server_find_container_by_id(uint64_t cont_id, pdc_cont_hash_table_entry_t ** FUNC_ENTER(NULL); if (NULL == out) { - printf("==PDC_SERVER[%d]: %s - input is NULL! \n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: input is NULL! \n", pdc_server_rank_g); goto done; } @@ -2465,8 +2457,7 @@ PDC_Server_find_container_by_id(uint64_t cont_id, pdc_cont_hash_table_entry_t ** } } else { - printf("==PDC_SERVER[%d]: %s - container_hash_table_g not initialized!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: container_hash_table_g not initialized!\n", pdc_server_rank_g); ret_value = FAIL; out = NULL; goto done; @@ -2502,13 +2493,13 @@ PDC_Server_container_add_objs(int n_obj, uint64_t *obj_ids, uint64_t cont_id) realloc_size *= (sizeof(uint64_t) * 2); if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: realloc from %d to %ld!\n", pdc_server_rank_g, - cont_entry->n_allocated, realloc_size / sizeof(uint64_t)); + LOG_DEBUG("==PDC_SERVER[%d]: realloc from %d to %ld!\n", pdc_server_rank_g, + cont_entry->n_allocated, realloc_size / sizeof(uint64_t)); } cont_entry->obj_ids = (uint64_t *)PDC_realloc(cont_entry->obj_ids, realloc_size); if (NULL == cont_entry->obj_ids) { - printf("==PDC_SERVER[%d]: %s - ERROR with realloc!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with realloc!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -2524,15 +2515,14 @@ PDC_Server_container_add_objs(int n_obj, uint64_t *obj_ids, uint64_t cont_id) // Debug prints if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: add %d objects to container %" PRIu64 ", total %d !\n", - pdc_server_rank_g, n_obj, cont_id, cont_entry->n_obj - cont_entry->n_deleted); + LOG_DEBUG("==PDC_SERVER[%d]: add %d objects to container %" PRIu64 ", total %d !\n", + pdc_server_rank_g, n_obj, cont_id, cont_entry->n_obj - cont_entry->n_deleted); } // TODO: find duplicates } else { - printf("==PDC_SERVER[%d]: %s - container %" PRIu64 " not found!\n", pdc_server_rank_g, __func__, - cont_id); + LOG_ERROR("==PDC_SERVER[%d]: container %" PRIu64 " not found!\n", pdc_server_rank_g, cont_id); ret_value = FAIL; goto done; } @@ -2565,16 +2555,15 @@ PDC_Server_container_del_objs(int n_obj, uint64_t *obj_ids, uint64_t cont_id) } } // Debug print - printf("==PDC_SERVER[%d]: successfully deleted %d objects!\n", pdc_server_rank_g, n_deletes); + LOG_DEBUG("==PDC_SERVER[%d]: successfully deleted %d objects!\n", pdc_server_rank_g, n_deletes); if (n_deletes != n_obj) { - printf("==PDC_SERVER[%d]: %s - %d objects are not found to be deleted!\n", pdc_server_rank_g, - __func__, n_obj - n_deletes); + LOG_INFO("==PDC_SERVER[%d]: %d objects are not found to be deleted!\n", pdc_server_rank_g, + n_obj - n_deletes); } } else { - printf("==PDC_SERVER[%d]: %s - container %" PRIu64 " not found!\n", pdc_server_rank_g, __func__, - cont_id); + LOG_ERROR("==PDC_SERVER[%d]: container %" PRIu64 " not found!\n", pdc_server_rank_g, cont_id); ret_value = FAIL; goto done; } @@ -2601,8 +2590,7 @@ PDC_Server_container_add_tags(uint64_t cont_id, char *tags) } } else { - printf("==PDC_SERVER[%d]: %s - container %" PRIu64 " not found!\n", pdc_server_rank_g, __func__, - cont_id); + LOG_ERROR("==PDC_SERVER[%d]: container %" PRIu64 " not found!\n", pdc_server_rank_g, cont_id); ret_value = FAIL; goto done; } @@ -2685,23 +2673,24 @@ PDC_Server_get_storage_meta_by_names(query_read_names_args_t *args) // FIXME: currently assumes timestep 0 PDC_Server_search_with_name_timestep(obj_name, PDC_get_hash_by_name(obj_name), 0, &meta); if (meta == NULL) { - printf("==PDC_SERVER[%d]: No metadata with name [%s] found!\n", pdc_server_rank_g, obj_name); + LOG_ERROR("==PDC_SERVER[%d]: No metadata with name [%s] found!\n", pdc_server_rank_g, obj_name); continue; } ret_value = PDC_copy_all_storage_meta(meta, &(all_storage_meta[i]), &(all_nregion[i])); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: error when getting storage meta for [%s]!\n", pdc_server_rank_g, - obj_name); + LOG_ERROR("==PDC_SERVER[%d]: Error when getting storage meta for [%s]!\n", pdc_server_rank_g, + obj_name); continue; } total_region += all_nregion[i]; if (all_storage_meta[i]->storage_location[1] != 'g') { - printf("==PDC_SERVER[%d]: error with storage meta for [%s], obj_id %" PRIu64 ", loc [%s], offset " - "%" PRIu64 "\n", - pdc_server_rank_g, obj_name, all_storage_meta[i]->obj_id, - all_storage_meta[i]->storage_location, all_storage_meta[i]->offset); + LOG_ERROR("==PDC_SERVER[%d]: Error with storage meta for [%s], obj_id %" PRIu64 + ", loc [%s], offset " + "%" PRIu64 "\n", + pdc_server_rank_g, obj_name, all_storage_meta[i]->obj_id, + all_storage_meta[i]->storage_location, all_storage_meta[i]->offset); fflush(stdout); } @@ -2710,7 +2699,8 @@ PDC_Server_get_storage_meta_by_names(query_read_names_args_t *args) // Now the storage meta is stored in all_storage_meta; client_id = args->client_id; if (PDC_Server_lookup_client(client_id) != SUCCEED) { - printf("==PDC_SERVER[%d]: Error getting client %d addr via lookup\n", pdc_server_rank_g, client_id); + LOG_ERROR("==PDC_SERVER[%d]: Error getting client %d addr via lookup\n", pdc_server_rank_g, + client_id); ret_value = FAIL; goto done; } @@ -2737,20 +2727,20 @@ PDC_Server_get_storage_meta_by_names(query_read_names_args_t *args) /* Register memory */ hg_ret = HG_Bulk_create(hg_class_g, nbuf, buf_ptrs, buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } if (pdc_client_info_g[client_id].addr == NULL) { - printf("==PDC_SERVER[%d]: Error with client %d addr\n", pdc_server_rank_g, client_id); + LOG_ERROR("==PDC_SERVER[%d]: Error with client %d addr\n", pdc_server_rank_g, client_id); goto done; } hg_ret = HG_Create(hg_context_g, pdc_client_info_g[client_id].addr, send_client_storage_meta_rpc_register_id_g, &rpc_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create handle\n"); + LOG_ERROR("Could not create handle\n"); ret_value = FAIL; goto done; } @@ -2763,7 +2753,7 @@ PDC_Server_get_storage_meta_by_names(query_read_names_args_t *args) hg_ret = HG_Forward(rpc_handle, PDC_check_int_ret_cb, NULL, &bulk_rpc_in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not forward call\n"); + LOG_ERROR("Could not forward call\n"); ret_value = FAIL; goto done; } @@ -2834,18 +2824,17 @@ PDC_Server_add_kvtag_rocksdb(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t sprintf(rocksdb_key, "%lu`%s", in->obj_id, in->kvtag.name); char *err = NULL; // Debug - /* printf("Put [%s] [%d], len%lu\n", in->kvtag.name, *((int*)in->kvtag.value), in->kvtag.size); */ rocksdb_put(rocksdb_g, writeoptions, rocksdb_key, strlen(rocksdb_key) + 1, in->kvtag.value, in->kvtag.size, &err); if (err != NULL) { - printf("==PDC_SERVER[%d]: error with rocksdb_put %s, [%s]!\n", pdc_server_rank_g, in->kvtag.name, - err); + LOG_ERROR("==PDC_SERVER[%d]: Error with rocksdb_put %s, [%s]!\n", pdc_server_rank_g, in->kvtag.name, + err); ret_value = FAIL; } else out->ret = 1; #else - printf("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -2877,23 +2866,21 @@ PDC_Server_add_kvtag_sqlite3(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t in->obj_id, in->kvtag.name, *((double *)in->kvtag.value)); } else { - printf("==PDC_SERVER[%d]: datatype not supported %d!\n", pdc_server_rank_g, in->kvtag.type); + LOG_ERROR("==PDC_SERVER[%d]: datatype not supported %d!\n", pdc_server_rank_g, in->kvtag.type); ret_value = FAIL; goto done; } - // debug - /* printf("==PDC_SERVER[%d]: constructed SQL [%s]\n", pdc_server_rank_g, sql); */ sqlite3_exec(sqlite3_db_g, sql, NULL, 0, &errMessage); if (errMessage) - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); else out->ret = 1; done: #else - printf("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -2931,8 +2918,8 @@ PDC_Server_add_kvtag_someta(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t out->ret = 1; } else { - printf("==PDC_SERVER[%d]: add tag target %" PRIu64 " not found!\n", pdc_server_rank_g, - in->obj_id); + LOG_ERROR("==PDC_SERVER[%d]: add tag target %" PRIu64 " not found!\n", pdc_server_rank_g, + in->obj_id); ret_value = FAIL; out->ret = -1; } @@ -2958,7 +2945,6 @@ PDC_Server_add_kvtag(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t *out) #endif out->ret = -1; - // printf("==SERVER[%d]: PDC_add_kvtag::in.obj_id = %llu \n ", pdc_server_rank_g, obj_id); #ifdef ENABLE_MULTITHREAD // Obtain lock for hash table @@ -2969,21 +2955,21 @@ PDC_Server_add_kvtag(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t *out) if (use_rocksdb_g == 1) { ret_value = PDC_Server_add_kvtag_rocksdb(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_add_kvtag_rocksdb!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_add_kvtag_rocksdb!\n", pdc_server_rank_g); goto done; } } // End if rocksdb else if (use_sqlite3_g == 1) { ret_value = PDC_Server_add_kvtag_sqlite3(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_add_kvtag_sqlite3!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_add_kvtag_sqlite3!\n", pdc_server_rank_g); goto done; } } // End if sqlite3 else { ret_value = PDC_Server_add_kvtag_someta(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_add_kvtag_someta!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_add_kvtag_someta!\n", pdc_server_rank_g); goto done; } } @@ -3058,7 +3044,6 @@ sqlite_get_kvtag_callback(void *data, int argc, char **argv, char **colName) *int_tmp = atoi(argv[i]); out->value = (void *)int_tmp; out->size = sizeof(int); - /* printf("SQLite3 found %s = %d\n", colName[i], int_tmp); */ break; } else if (0 == strcmp(colName[i], "value_real")) { @@ -3066,7 +3051,6 @@ sqlite_get_kvtag_callback(void *data, int argc, char **argv, char **colName) *float_tmp = (float)atof(argv[i]); out->value = (void *)float_tmp; out->size = sizeof(float); - /* printf("SQLite3 found %s = %f\n", colName[i], float_tmp); */ break; } else if (0 == strcmp(colName[i], "value_double")) { @@ -3074,18 +3058,15 @@ sqlite_get_kvtag_callback(void *data, int argc, char **argv, char **colName) *double_tmp = atof(argv[i]); out->value = (void *)double_tmp; out->size = sizeof(double); - /* printf("SQLite3 found %s = %f\n", colName[i], double_tmp); */ break; } else if (0 == strcmp(colName[i], "value_text")) { out->value = strdup(argv[i]); - /* printf("SQLite3 found %s = %s\n", colName[i], argv[i]); */ - out->size = strlen(argv[i]) + 1; + out->size = strlen(argv[i]) + 1; break; } else { out->value = NULL; - /* printf("SQLite3 found nothing\n"); */ return 0; } } @@ -3108,7 +3089,7 @@ PDC_Server_get_kvtag_rocksdb(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out size_t len; char * value = rocksdb_get(rocksdb_g, readoptions, rocksdb_key, strlen(rocksdb_key) + 1, &len, &err); if (value == NULL) { - printf("==PDC_SERVER[%d]: error with rocksdb_get %s, [%s]!\n", pdc_server_rank_g, in->key, err); + LOG_ERROR("==PDC_SERVER[%d]: Error with rocksdb_get %s, [%s]!\n", pdc_server_rank_g, in->key, err); ret_value = FAIL; } out->kvtag.name = in->key; @@ -3116,7 +3097,7 @@ PDC_Server_get_kvtag_rocksdb(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out out->kvtag.value = value; out->ret = 1; #else - printf("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -3135,10 +3116,9 @@ PDC_Server_get_kvtag_sqlite3(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out "objid = %llu AND name = \'%s\';", in->obj_id, in->key); - /* printf("==PDC_SERVER[%d]: get kvtag [%s]!\n", pdc_server_rank_g, in->key); */ sqlite3_exec(sqlite3_db_g, sql, sqlite_get_kvtag_callback, &out->kvtag, &errMessage); if (errMessage) { - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); } else { // size and value is filled in sqlite_get_kvtag_callback @@ -3146,7 +3126,7 @@ PDC_Server_get_kvtag_sqlite3(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out out->ret = 1; } #else - printf("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -3222,14 +3202,14 @@ PDC_Server_get_kvtag(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out_t *out) if (use_rocksdb_g == 1) { ret_value = PDC_Server_get_kvtag_rocksdb(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_get_kvtag_rocksdb!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_get_kvtag_rocksdb!\n", pdc_server_rank_g); goto done; } } else if (use_sqlite3_g == 1) { ret_value = PDC_Server_get_kvtag_sqlite3(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_get_kvtag_sqlite3!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_get_kvtag_sqlite3!\n", pdc_server_rank_g); goto done; } } @@ -3237,7 +3217,7 @@ PDC_Server_get_kvtag(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out_t *out) // Someta ret_value = PDC_Server_get_kvtag_someta(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_get_kvtag_someta!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_get_kvtag_someta!\n", pdc_server_rank_g); goto done; } } @@ -3313,13 +3293,14 @@ PDC_Server_del_kvtag_rocksdb(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t sprintf(rocksdb_key, "%lu`%s", in->obj_id, in->key); rocksdb_delete(rocksdb_g, writeoptions, rocksdb_key, strlen(rocksdb_key) + 1, &err); if (err != NULL) { - printf("==PDC_SERVER[%d]: error with rocksdb_delete [%s], [%s]!\n", pdc_server_rank_g, in->key, err); + LOG_ERROR("==PDC_SERVER[%d]: Error with rocksdb_delete [%s], [%s]!\n", pdc_server_rank_g, in->key, + err); ret_value = FAIL; } else out->ret = 1; #else - printf("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled rocksdb but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -3338,13 +3319,13 @@ PDC_Server_del_kvtag_sqlite3(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t sqlite3_exec(sqlite3_db_g, sql, NULL, 0, &errMessage); if (errMessage) { - printf("==PDC_SERVER[%d]: error from SQLite %s!\n", pdc_server_rank_g, errMessage); + LOG_ERROR("==PDC_SERVER[%d]: Error from SQLite %s!\n", pdc_server_rank_g, errMessage); ret_value = FAIL; } else out->ret = 1; #else - printf("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: enabled SQLite3 but PDC is not compiled with it!\n", pdc_server_rank_g); ret_value = FAIL; #endif @@ -3375,8 +3356,7 @@ PDC_Server_del_kvtag_someta(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t else { ret_value = FAIL; out->ret = -1; - printf("==PDC_SERVER[%d]: %s - failed to find requested kvtag [%s]\n", pdc_server_rank_g, - __func__, in->key); + LOG_ERROR("==PDC_SERVER[%d]: failed to find requested kvtag [%s]\n", pdc_server_rank_g, in->key); } } else { @@ -3388,8 +3368,7 @@ PDC_Server_del_kvtag_someta(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t else { ret_value = FAIL; out->ret = -1; - printf("==PDC_SERVER[%d]: %s - failed to find requested kvtag [%s]\n", pdc_server_rank_g, - __func__, in->key); + LOG_ERROR("==PDC_SERVER[%d]: failed to find requested kvtag [%s]\n", pdc_server_rank_g, in->key); } } @@ -3423,21 +3402,21 @@ PDC_Server_del_kvtag(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t *out) if (use_rocksdb_g) { ret_value = PDC_Server_del_kvtag_rocksdb(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_del_kvtag_rocksdb!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_del_kvtag_rocksdb!\n", pdc_server_rank_g); goto done; } } else if (use_sqlite3_g) { ret_value = PDC_Server_del_kvtag_sqlite3(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_del_kvtag_sqlite3!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_del_kvtag_sqlite3!\n", pdc_server_rank_g); goto done; } } else { ret_value = PDC_Server_del_kvtag_someta(in, out); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: Error with PDC_Server_del_kvtag_someta!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_del_kvtag_someta!\n", pdc_server_rank_g); goto done; } } diff --git a/src/server/pdc_server_metadata_index.c b/src/server/pdc_server_metadata_index.c index 828a6ef2f..102c9d50d 100644 --- a/src/server/pdc_server_metadata_index.c +++ b/src/server/pdc_server_metadata_index.c @@ -1,6 +1,7 @@ #include "pdc_server_metadata_index.h" #include "idioms_local_index.h" #include "idioms_persistence.h" +#include "pdc_logger.h" art_tree *art_key_prefix_tree_g = NULL; art_tree *art_key_suffix_tree_g = NULL; @@ -86,22 +87,19 @@ PDC_Server_dart_perform_one_server(dart_perform_one_server_in_t *in, dart_perfor idioms_local_index_delete(idioms_g, idx_record); } else { - // printf("attr_key=%s, attr_val=%s, attr_vsize=%d, attr_dtype=%d\n", attr_key, attr_val, attr_vsize, - // attr_dtype); - idx_record->num_obj_ids = 0; idioms_local_index_search(idioms_g, idx_record); *n_obj_ids_ptr = idx_record->num_obj_ids; *buf_ptrs = idx_record->obj_ids; if (attr_key[0] == '*') { - printf("server_id = %d, attr_key=%s, attr_val=%s, attr_vsize=%d, attr_dtype=%d\n", - midx_server_id_g, attr_key, attr_val, attr_vsize, attr_dtype); - printf("result = "); + LOG_INFO("server_id = %d, attr_key=%s, attr_val=%s, attr_vsize=%d, attr_dtype=%d\n", + midx_server_id_g, attr_key, attr_val, attr_vsize, attr_dtype); + LOG_INFO("result ="); for (int i = 0; i < *n_obj_ids_ptr; i++) { - printf("%" PRIu64 " ", idx_record->obj_ids[i]); + LOG_INFO("%" PRIu64 " ", idx_record->obj_ids[i]); } - printf("\n"); + LOG_INFO("\n"); } out->n_items = (*n_obj_ids_ptr); diff --git a/src/server/pdc_server_metadata_index_test.c b/src/server/pdc_server_metadata_index_test.c index 43b659225..9e6813bc2 100644 --- a/src/server/pdc_server_metadata_index_test.c +++ b/src/server/pdc_server_metadata_index_test.c @@ -154,9 +154,9 @@ query_result_from_kvtag(char *key_value_query, int8_t op_type) assert(PDC_Server_dart_perform_one_server(input, output, &n_obj_ids, &buf_ptr) == SUCCEED); NLF_LOG_INFO("Query %s Successful! %d Results: ", key_value_query, n_obj_ids); for (int i = 0; i < n_obj_ids; i++) { - printf("%llu, ", buf_ptr[i]); + LOG_JUST_PRINT("%llu, ", buf_ptr[i]); } - printf("\n\n"); + LOG_JUST_PRINT("\n\n"); } void diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index ca01af2c1..a9e0d1fc4 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -59,6 +59,7 @@ #include "pdc_hist_pkg.h" #include "pdc_timing.h" #include "pdc_region.h" +#include "pdc_logger.h" // Global object region info list in local data server data_server_region_t * dataserver_region_g = NULL; @@ -115,7 +116,7 @@ fill_storage_path(char *storage_location, pdcid_t obj_id) PDC_Server_set_lustre_stripe(storage_location, stripe_count, stripe_size); if (is_debug_g == 1 && pdc_server_rank_g == 0) { - printf("storage_location is %s\n", storage_location); + LOG_DEBUG("storage_location is %s\n", storage_location); } #endif return 0; @@ -167,7 +168,7 @@ PDC_Server_set_lustre_stripe(const char *path, int stripe_count, int stripe_size tmp); if (system(cmd) < 0) { - printf("==PDC_SERVER: Fail to set Lustre stripe parameters [%s]\n", tmp); + LOG_ERROR("==PDC_SERVER: Fail to set Lustre stripe parameters [%s]\n", tmp); ret_value = FAIL; goto done; } @@ -194,7 +195,7 @@ is_region_identical(region_list_t *a, region_list_t *b) FUNC_ENTER(NULL); if (a == NULL || b == NULL) { - printf("==PDC_SERVER: is_region_identical() - passed NULL value!\n"); + LOG_ERROR("==PDC_SERVER: is_region_identical() - passed NULL value!\n"); ret_value = -1; goto done; } @@ -232,8 +233,8 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock PDC_region_transfer_t_to_list_t(&(mapped_region->remote_region), request_region); res_meta = find_metadata_by_id(mapped_region->remote_obj_id); if (res_meta == NULL || res_meta->region_lock_head == NULL) { - printf("==PDC_SERVER[%d]: PDC_Server_region_lock_status - metadata/region_lock is NULL!\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_region_lock_status - metadata/region_lock is NULL!\n", + pdc_server_rank_g); fflush(stdout); ret_value = FAIL; goto done; @@ -245,7 +246,7 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock if (is_region_identical(request_region, elt) == 1) { *lock_status = 1; elt->reg_dirty_from_buf = 1; - /* printf("%s: set reg_dirty_from_buf \n", __func__); */ + elt->bulk_handle = mapped_region->remote_bulk_handle; elt->addr = mapped_region->remote_addr; elt->from_obj_id = mapped_region->from_obj_id; @@ -276,7 +277,7 @@ PDC_Server_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock_statu PDC_Server_local_region_lock_status(mapped_region, lock_status); } else { - printf("lock is located in a different server, work not finished yet\n"); + LOG_INFO("lock is located in a different server, work not finished yet\n"); fflush(stdout); } @@ -461,15 +462,6 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han if (ndim >= 3) { request_region->start[2] = in->region.start_2; request_region->count[2] = in->region.count_2; - - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("%02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ - /* printf("==PDC_SERVER[%d]: locking region (%llu, %llu, %llu), (%llu, %llu, %llu)\n", - * pdc_server_rank_g, */ - /* request_region->start[0], - * request_region->start[1], request_region->start[2], */ - /* request_region->count[0], request_region->count[1], request_region->count[2]); */ } if (ndim >= 4) { request_region->start[3] = in->region.start_3; @@ -527,7 +519,6 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han if (PDC_is_same_region_list(tmp, request_region) == 1) { request_region->reg_dirty_from_buf = 1; hg_atomic_incr32(&(request_region->buf_map_refcount)); - /* printf("%s: set reg_dirty_from_buf and buf_map_refcount\n", __func__); */ } } free(tmp); @@ -547,7 +538,7 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han done: /* t = time(NULL); */ /* tm = *localtime(&t); */ - /* printf("Done locking region %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ + /* fflush(stdout); */ if (error == 1) { out->ret = 0; @@ -614,7 +605,6 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) /* struct tm tm; */ /* t = time(NULL); */ /* tm = *localtime(&t); */ - /* printf("start PDC_Data_Server_region_release %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ ndim = in->region.ndim; @@ -633,11 +623,6 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) if (ndim >= 3) { request_region.start[2] = in->region.start_2; request_region.count[2] = in->region.count_2; - - /* time_t func_time=time(NULL); \ */ - /* struct tm tm_time; \ */ - /* func_time = time(NULL);tm_time = *localtime(&func_time);\ */ - /* printf("%02d:%02d:%02d: %s\n", tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec, __func__);\ */ } if (ndim >= 4) { request_region.start[3] = in->region.start_3; @@ -647,7 +632,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) { ret_value = FAIL; - printf("==PDC_SERVER[%d]: requested release object does not exist\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: requested release object does not exist\n", pdc_server_rank_g); goto done; } // Find the lock region in the list and remove it @@ -671,7 +656,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) // Request release lock region not found if (found == 0) { ret_value = FAIL; - printf("==PDC_SERVER[%d]: requested release region/object does not exist\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: requested release region/object does not exist\n", pdc_server_rank_g); goto done; } out->ret = 1; @@ -679,7 +664,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) done: /* t = time(NULL); */ /* tm = *localtime(&t); */ - /* printf("done PDC_Data_Server_region_release %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ + /* fflush(stdout); */ FUNC_LEAVE(ret_value); @@ -701,7 +686,7 @@ static int region_list_cmp(region_list_t *a, region_list_t *b) { if (a->ndim != b->ndim) { - printf(" region_list_cmp(): not equal ndim! \n"); + LOG_ERROR(" region_list_cmp(): not equal ndim! \n"); return -1; } @@ -727,7 +712,7 @@ region_list_path_offset_cmp(region_list_t *a, region_list_t *b) { int ret_value; if (NULL == a || NULL == b) { - printf(" %s - NULL input!\n", __func__); + LOG_ERROR("NULL input!\n"); return -1; } @@ -750,7 +735,7 @@ static int region_list_cmp_by_client_id(region_list_t *a, region_list_t *b) { if (a->ndim != b->ndim) { - printf(" region_list_cmp_by_client_id(): not equal ndim! \n"); + LOG_ERROR(" region_list_cmp_by_client_id(): not equal ndim! \n"); return -1; } @@ -933,8 +918,8 @@ server_send_buf_unmap_addr_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &out); if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: server_send_buf_unmap_addr_rpc_cb - error with HG_Get_output\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: server_send_buf_unmap_addr_rpc_cb - error with HG_Get_output\n", + pdc_server_rank_g); goto done; } @@ -974,7 +959,7 @@ buf_unmap_lookup_remote_server_cb(const struct hg_cb_info *callback_info) pdc_remote_server_info_g[server_id].addr_valid = 1; if (pdc_remote_server_info_g[server_id].addr == NULL) { - printf("==PDC_SERVER[%d]: %s - remote server addr is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: remote server addr is NULL\n", pdc_server_rank_g); error = 1; goto done; } @@ -1055,8 +1040,8 @@ server_send_buf_unmap_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: server_send_buf_unmap_rpc_cb() - error with HG_Get_output\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: server_send_buf_unmap_rpc_cb() - error with HG_Get_output\n", + pdc_server_rank_g); tranx_args->ret = -1; goto done; } @@ -1153,70 +1138,6 @@ PDC_Meta_Server_buf_unmap(buf_unmap_in_t *in, hg_handle_t *handle) FUNC_LEAVE(ret_value); } -/* - * This is a light-weighted buf map. We are creating the file descriptor for writing an object. - * data_server_region_t is used here for storage_location and fd only. - * Write and read functions will use these information - */ - -/* -perr_t register_data_server_region (pdcid_t obj_id) { - data_server_region_t *new_obj_reg = NULL; - - new_obj_reg = PDC_Server_get_obj_region(in->remote_obj_id); - if (new_obj_reg == NULL) { - new_obj_reg = (data_server_region_t *)malloc(sizeof(struct data_server_region_t)); - - new_obj_reg->obj_id = in->remote_obj_id; - new_obj_reg->region_lock_head = NULL; - new_obj_reg->region_buf_map_head = NULL; - new_obj_reg->region_lock_request_head = NULL; - new_obj_reg->region_storage_head = NULL; - - // Generate a location for data storage for data server to write - user_specified_data_path = getenv("PDC_DATA_LOC"); - if (user_specified_data_path != NULL) - data_path = user_specified_data_path; - else { - data_path = getenv("SCRATCH"); - if (data_path == NULL) - data_path = "."; - } - // Data path prefix will be $SCRATCH/pdc_data/$obj_id/ - snprintf(storage_location, ADDR_MAX, "%.200s/pdc_data/%" PRIu64 "/server%d/s%04d.bin", data_path, - in->remote_obj_id, pdc_server_rank_g, pdc_server_rank_g); - PDC_mkdir(storage_location); - - new_obj_reg->fd = open(storage_location, O_RDWR | O_CREAT, 0666); - if (new_obj_reg->fd == -1) { - printf("==PDC_SERVER[%d]: open %s failed\n", pdc_server_rank_g, storage_location); - goto done; - } - - new_obj_reg->storage_location = strdup(storage_location); - DL_APPEND(dataserver_region_g, new_obj_reg); - } - return SUCCESS; -} - - -perr_t -unregister_data_server_region(pdcid_t obj_id) -{ - data_server_region_t *new_obj_reg = NULL; - - new_obj_reg = PDC_Server_get_obj_region(in->remote_obj_id); - - if (new_obj_reg == NULL) { - DL_FOREACH(region->region_storage_head, elt) - { - } - free(new_obj_reg->storage_location); - close(new_obj_reg->fd); - } - return SUCCESS; -} -*/ region_buf_map_t * PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_list_t *request_region, void *data_ptr) @@ -1275,12 +1196,12 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis PDC_Server_set_lustre_stripe(storage_location, stripe_count, stripe_size); if (is_debug_g == 1 && pdc_server_rank_g == 0) { - printf("storage_location is %s\n", storage_location); + LOG_INFO("storage_location is %s\n", storage_location); } #endif new_obj_reg->fd = open(storage_location, O_RDWR | O_CREAT, 0666); if (new_obj_reg->fd == -1) { - printf("==PDC_SERVER[%d]: open %s failed\n", pdc_server_rank_g, storage_location); + LOG_ERROR("==PDC_SERVER[%d]: open %s failed\n", pdc_server_rank_g, storage_location); goto done; } new_obj_reg->storage_location = strdup(storage_location); @@ -1363,7 +1284,6 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis { if (PDC_is_same_region_list(elt_reg, request_region) == 1) { hg_atomic_incr32(&(elt_reg->buf_map_refcount)); - /* printf("%s: set buf_map_refcount\n", __func__); */ } } ret_value = buf_map_ptr; @@ -1520,8 +1440,8 @@ server_send_buf_map_addr_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &out); if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: server_send_buf_map_addr_rpc_cb - error with HG_Get_output\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: server_send_buf_map_addr_rpc_cb - error with HG_Get_output\n", + pdc_server_rank_g); goto done; } @@ -1560,7 +1480,7 @@ buf_map_lookup_remote_server_cb(const struct hg_cb_info *callback_info) pdc_remote_server_info_g[server_id].addr_valid = 1; if (pdc_remote_server_info_g[server_id].addr == NULL) { - printf("==PDC_SERVER[%d]: %s - remote server addr is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: remote server addr is NULL\n", pdc_server_rank_g); error = 1; goto done; } @@ -1640,8 +1560,8 @@ server_send_buf_map_rpc_cb(const struct hg_cb_info *callback_info) ret_value = HG_Get_output(handle, &out); if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: server_send_buf_map_rpc_cb - error with HG_Get_output\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: server_send_buf_map_rpc_cb - error with HG_Get_output\n", + pdc_server_rank_g); tranx_args->ret = -1; goto done; } @@ -1670,12 +1590,6 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ FUNC_ENTER(NULL); - /* time_t t; */ - /* struct tm tm; */ - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("start PDC_Meta_Server_buf_map %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ - // dataserver and metadata server is on the same node if ((uint32_t)pdc_server_rank_g == in->meta_server_id) { target_meta = find_metadata_by_id(in->remote_obj_id); @@ -1748,11 +1662,6 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ } done: - - /* t = time(NULL); */ - /* tm = *localtime(&t); */ - /* printf("done PDC_Meta_Server_buf_map %02d:%02d:%02d\n", tm.tm_hour, tm.tm_min, tm.tm_sec); */ - if (error == 1) { HG_Free_input(*handle, in); HG_Destroy(*handle); @@ -1762,101 +1671,6 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ FUNC_LEAVE(ret_value); } -// TODO: currently only support merging regions that are cut in one dimension -/* - * Merge multiple region to contiguous ones - * - * \param list[IN] Pointer of the regions in a list - * \param merged[OUT] Merged list (new) - * - * \return Non-negative on success/Negative on failure - */ -/* -static perr_t PDC_Server_merge_region_list_naive(region_list_t *list, region_list_t **merged) -{ - perr_t ret_value = FAIL; - - - // print all regions - region_list_t *elt, *elt_elt; - region_list_t *tmp_merge; - uint32_t i; - int count, pos, pos_pos, tmp_pos; - int *is_merged; - - DL_SORT(list, region_list_cmp); - DL_COUNT(list, elt, count); - - is_merged = (int*)calloc(sizeof(int), count); - - DL_FOREACH(list, elt) { - PDC_print_region_list(elt); - } - - // Init merged head - pos = 0; - DL_FOREACH(list, elt) { - if (is_merged[pos] != 0) { - pos++; - continue; - } - - // First region that has not been merged - tmp_merge = (region_list_t*)malloc(sizeof(region_list_t)); - if (NULL == tmp_merge) { - printf("==PDC_SERVER: ERROR allocating for region_list_t!\n"); - ret_value = FAIL; - goto done; - } - PDC_init_region_list(tmp_merge); - - // Add the client id to the client_ids[] arrary - tmp_pos = 0; - tmp_merge->client_ids[tmp_pos] = elt->client_ids[0]; - tmp_pos++; - - tmp_merge->ndim = list->ndim; - for (i = 0; i < list->ndim; i++) { - tmp_merge->start[i] = elt->start[i]; - tmp_merge->count[i] = elt->count[i]; - } - is_merged[pos] = 1; - - DL_APPEND(*merged, tmp_merge); - - // Check for all other regions in the list and see it any can be merged - pos_pos = 0; - DL_FOREACH(list, elt_elt) { - if (is_merged[pos_pos] != 0) { - pos_pos++; - continue; - } - - // check if current elt_elt can be merged to elt - for (i = 0; i < list->ndim; i++) { - if (elt_elt->start[i] == tmp_merge->start[i] + tmp_merge->count[i]) { - tmp_merge->count[i] += elt_elt->count[i]; - is_merged[pos_pos] = 1; - tmp_merge->client_ids[tmp_pos] = elt_elt->client_ids[0]; - tmp_pos++; - break; - } - } - pos_pos++; - } - - pos++; - } - - ret_value = SUCCEED; - -done: - fflush(stdout); - free(is_merged); - FUNC_LEAVE(ret_value); -} -*/ - /* * Callback function for the region update, gets output from client * @@ -1880,8 +1694,8 @@ PDC_Server_notify_region_update_cb(const struct hg_cb_info *callback_info) /* Get output from client */ ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: PDC_Server_notify_region_update_cb - error with HG_Get_output\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_notify_region_update_cb - error with HG_Get_output\n", + pdc_server_rank_g); update_args->ret = -1; goto done; } @@ -1903,9 +1717,9 @@ PDC_Server_notify_region_update_to_client(uint64_t obj_id, uint64_t reg_id, int3 FUNC_ENTER(NULL); if (client_id >= pdc_client_num_g) { - printf("==PDC_SERVER[%d]: PDC_SERVER_notify_region_update_to_client() - " - "client_id %d invalid)\n", - pdc_server_rank_g, client_id); + LOG_ERROR("==PDC_SERVER[%d]: PDC_SERVER_notify_region_update_to_client() - " + "client_id %d invalid)\n", + pdc_server_rank_g, client_id); ret_value = FAIL; goto done; } @@ -1913,21 +1727,21 @@ PDC_Server_notify_region_update_to_client(uint64_t obj_id, uint64_t reg_id, int3 if (pdc_client_info_g || pdc_client_info_g[client_id].addr_valid == 0) { ret_value = PDC_Server_lookup_client(client_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER: PDC_Server_notify_region_update_to_client() - \ + LOG_ERROR("==PDC_SERVER: PDC_Server_notify_region_update_to_client() - \ PDC_Server_lookup_client failed)\n"); return FAIL; } } if (pdc_client_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER: pdc_client_info_g is NULL\n"); + LOG_ERROR("==PDC_SERVER: pdc_client_info_g is NULL\n"); return FAIL; } hg_ret = HG_Create(hg_context_g, pdc_client_info_g[client_id].addr, notify_region_update_register_id_g, ¬ify_region_update_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "PDC_Server_notify_region_update_to_client(): Could not HG_Create()\n"); + LOG_ERROR("PDC_Server_notify_region_update_to_client(): Could not HG_Create()\n"); ret_value = FAIL; goto done; } @@ -1939,7 +1753,7 @@ PDC_Server_notify_region_update_to_client(uint64_t obj_id, uint64_t reg_id, int3 hg_ret = HG_Forward(notify_region_update_handle, PDC_Server_notify_region_update_cb, &update_args, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "PDC_Server_notify_region_update_to_client(): Could not start HG_Forward()\n"); + LOG_ERROR("PDC_Server_notify_region_update_to_client(): Could not start HG_Forward()\n"); ret_value = FAIL; goto done; } @@ -1962,21 +1776,21 @@ PDC_Server_close_shm(region_list_t *region, int is_remove) } if (region == NULL || region->buf == NULL) { - printf("==PDC_SERVER[%d]: %s - NULL input\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL input\n", pdc_server_rank_g); ret_value = FAIL; goto done; } /* remove the mapped memory segment from the address space of the process */ if (munmap(region->buf, region->data_size) == -1) { - printf("==PDC_SERVER[%d]: %s - unmap failed\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: unmap failed\n", pdc_server_rank_g); ret_value = FAIL; goto done; } /* close the shared memory segment as if it was a file */ if (close(region->shm_fd) == -1) { - printf("==PDC_SERVER[%d]: close shm_fd failed\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: close shm_fd failed\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -1986,7 +1800,7 @@ PDC_Server_close_shm(region_list_t *region, int is_remove) if (shm_unlink(region->shm_addr) == -1) { ret_value = FAIL; goto done; - printf("==PDC_SERVER[%d]: Error removing %s\n", pdc_server_rank_g, region->shm_addr); + LOG_ERROR("==PDC_SERVER[%d]: Error removing %s\n", pdc_server_rank_g, region->shm_addr); } } @@ -2001,116 +1815,6 @@ PDC_Server_close_shm(region_list_t *region, int is_remove) FUNC_LEAVE(ret_value); } -/* - * Callback function for IO complete notification send to client, gets output from client - * - * \param callback_info[IN] Mercury callback info - * - * \return Non-negative on success/Negative on failure - */ -/* -static hg_return_t -PDC_Server_notify_io_complete_cb(const struct hg_cb_info *callback_info) -{ - hg_return_t ret_value; - - FUNC_ENTER(NULL); - - server_lookup_args_t *lookup_args = (server_lookup_args_t *)callback_info->arg; - hg_handle_t handle = callback_info->info.forward.handle; - - // Get output from server - notify_io_complete_out_t output; - - ret_value = HG_Get_output(handle, &output); - if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: %s - to client %" PRIu32 " " - "- error with HG_Get_output\n", - pdc_server_rank_g, __func__, lookup_args->client_id); - lookup_args->ret_int = -1; - goto done; - } - - lookup_args->ret_int = output.ret; - -done: - HG_Free_output(handle, &output); - FUNC_LEAVE(ret_value); -} -*/ -/* - * Callback function for IO complete notification send to client - * - * \param client_id[IN] Target client's MPI rank - * \param obj_id[IN] Object ID - * \param shm_addr[IN] Server's shared memory address - * \param io_typ[IN] IO type (read/write) - * - * \return Non-negative on success/Negative on failure - */ -/* -static perr_t PDC_Server_notify_io_complete_to_client(uint32_t client_id, uint64_t obj_id, - char* shm_addr, PDC_access_t io_type) -{ - char tmp_shm[ADDR_MAX]; - perr_t ret_value = SUCCEED; - hg_return_t hg_ret = HG_SUCCESS; - server_lookup_args_t lookup_args; - hg_handle_t notify_io_complete_handle; - - FUNC_ENTER(NULL); - - if (client_id >= (uint32_t)pdc_client_num_g) { - printf("==PDC_SERVER[%d]: %s - client_id %d invalid\n", pdc_server_rank_g, __func__, client_id); - ret_value = FAIL; - goto done; - } - - if (pdc_client_info_g[client_id].addr_valid != 1) { - ret_value = PDC_Server_lookup_client(client_id); - if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - PDC_Server_lookup_client failed\n", pdc_server_rank_g, __func__); - goto done; - } - } - - hg_ret = HG_Create(hg_context_g, pdc_client_info_g[client_id].addr, - notify_io_complete_register_id_g, ¬ify_io_complete_handle); - if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: %s - HG_Create failed\n", pdc_server_rank_g, __func__); - ret_value = FAIL; - goto done; - } - - // Fill input structure - notify_io_complete_in_t in; - in.obj_id = obj_id; - in.io_type = io_type; - if (shm_addr[0] == 0) { - snprintf(tmp_shm, ADDR_MAX, "%d", client_id * 10); - in.shm_addr = tmp_shm; - } - else - in.shm_addr = shm_addr; - - lookup_args.client_id = client_id; - hg_ret = HG_Forward(notify_io_complete_handle, PDC_Server_notify_io_complete_cb, &lookup_args, &in); - if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: %s - HG_Forward failed\n", pdc_server_rank_g, __func__); - ret_value = FAIL; - goto done; - } - -done: - fflush(stdout); - hg_ret = HG_Destroy(notify_io_complete_handle); - if (hg_ret != HG_SUCCESS) - printf("==PDC_SERVER[%d]: %s - HG_Destroy failed\n", pdc_server_rank_g, __func__); - - FUNC_LEAVE(ret_value); -} -*/ - // Generic function to check the return value (RPC receipt) is 1 hg_return_t PDC_Server_notify_client_multi_io_complete_cb(const struct hg_cb_info *callback_info) @@ -2125,13 +1829,12 @@ PDC_Server_notify_client_multi_io_complete_cb(const struct hg_cb_info *callback_ ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: %s - Error with HG_Get_output\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Error with HG_Get_output\n", pdc_server_rank_g); goto done; } if (output.ret != 1) { - printf("==PDC_SERVER[%d]: %s - Return value [%d] is NOT expected\n", pdc_server_rank_g, __func__, - output.ret); + LOG_ERROR("==PDC_SERVER[%d]: Return value [%d] is NOT expected\n", pdc_server_rank_g, output.ret); } // TODO: Cache to BB if needed @@ -2165,7 +1868,7 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id FUNC_ENTER(NULL); if (client_id >= (uint32_t)pdc_client_num_g) { - printf("==PDC_SERVER[%d]: %s - client_id %d invalid\n", pdc_server_rank_g, __func__, client_id); + LOG_ERROR("==PDC_SERVER[%d]: client_id %d invalid\n", pdc_server_rank_g, client_id); ret_value = FAIL; goto done; } @@ -2173,7 +1876,7 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id while (pdc_client_info_g[client_id].addr_valid != 1) { ret_value = PDC_Server_lookup_client(client_id); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - lookup client failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: lookup client failed!\n", pdc_server_rank_g); goto done; } } @@ -2181,7 +1884,7 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_ret = HG_Create(hg_context_g, pdc_client_info_g[client_id].addr, notify_client_multi_io_complete_rpc_register_id_g, &rpc_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create handle\n"); + LOG_ERROR("Could not create handle\n"); ret_value = FAIL; goto done; } @@ -2204,7 +1907,7 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_ret = HG_Bulk_create(hg_class_g, n_completed * 2, buf_ptrs, buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -2224,7 +1927,7 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id /* Forward call to remote addr */ hg_ret = HG_Forward(rpc_handle, PDC_Server_notify_client_multi_io_complete_cb, bulk_args, &bulk_rpc_in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not forward call\n"); + LOG_ERROR("Could not forward call\n"); ret_value = FAIL; goto done; } @@ -2280,13 +1983,13 @@ PDC_Server_cache_region_to_BB(region_list_t *region) bb_data_path = "."; } sprintf(pdc_cache_file_path_g, "%s/PDCcacheBB.%d", bb_data_path, pdc_server_rank_g); - printf("==PDC_SERVER[%d]: %s - No PDC_BB_LOC specified, use [%s]!\n", pdc_server_rank_g, __func__, - bb_data_path); + LOG_ERROR("==PDC_SERVER[%d]: No PDC_BB_LOC specified, use [%s]!\n", pdc_server_rank_g, + bb_data_path); } pdc_cache_file_ptr_g = fopen(pdc_cache_file_path_g, "ab"); if (NULL == pdc_cache_file_ptr_g) { - printf("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, pdc_cache_file_path_g); + LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, pdc_cache_file_path_g); ret_value = FAIL; goto done; } @@ -2297,12 +2000,11 @@ PDC_Server_cache_region_to_BB(region_list_t *region) offset = ftell(pdc_cache_file_ptr_g); // Actual write (append) - printf("==PDC_SERVER[%d]: %s - appending %" PRIu64 " bytes to BB\n", pdc_server_rank_g, __func__, - region->data_size); + LOG_ERROR("==PDC_SERVER[%d]: appending %" PRIu64 " bytes to BB\n", pdc_server_rank_g, region->data_size); write_bytes = fwrite(region->buf, 1, region->data_size, pdc_cache_file_ptr_g); if (write_bytes != region->data_size) { - printf("==PDC_SERVER[%d]: fwrite to [%s] FAILED, size %" PRIu64 ", actual writeen %" PRIu64 "!\n", - pdc_server_rank_g, region->storage_location, region->data_size, write_bytes); + LOG_ERROR("==PDC_SERVER[%d]: fwrite to [%s] FAILED, size %" PRIu64 ", actual writeen %" PRIu64 "!\n", + pdc_server_rank_g, region->storage_location, region->data_size, write_bytes); ret_value = FAIL; goto done; } @@ -2313,8 +2015,8 @@ PDC_Server_cache_region_to_BB(region_list_t *region) double region_write_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); server_write_time_g += region_write_time; if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: fwrite %" PRIu64 " bytes, %.2fs\n", pdc_server_rank_g, write_bytes, - region_write_time); + LOG_ERROR("==PDC_SERVER[%d]: fwrite %" PRIu64 " bytes, %.2fs\n", pdc_server_rank_g, write_bytes, + region_write_time); } #endif @@ -2327,7 +2029,7 @@ PDC_Server_cache_region_to_BB(region_list_t *region) // Update storage meta ret_value = PDC_Server_update_region_storagelocation_offset(region, PDC_UPDATE_CACHE); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: failed to update region storage info!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: failed to update region storage info!\n", pdc_server_rank_g); goto done; } @@ -2353,8 +2055,7 @@ PDC_cache_region_to_bb_cb(const struct hg_cb_info *callback_info) out = (server_read_check_out_t *)callback_info->arg; ret = PDC_Server_cache_region_to_BB(out->region); if (ret != SUCCEED) - printf("==PDC_SERVER[%d]: %s - Error with PDC_Server_cache_region_to_BB\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_cache_region_to_BB\n", pdc_server_rank_g); if (out != NULL) { free(out); @@ -2397,18 +2098,18 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * #endif if (NULL == io_target) { - printf("==PDC_SERVER[%d]: %s - No existing io request with same obj_id %" PRIu64 " found!\n", - pdc_server_rank_g, __func__, meta.obj_id); + LOG_ERROR("==PDC_SERVER[%d]: No existing io request with same obj_id %" PRIu64 " found!\n", + pdc_server_rank_g, meta.obj_id); out->ret = -1; goto done; } if (is_debug_g) { - printf("==PDC_SERVER[%d]: Read check Obj [%s] id=%" PRIu64 " region: start(%" PRIu64 ", %" PRIu64 - ") " - "size(%" PRIu64 ", %" PRIu64 ") \n", - pdc_server_rank_g, meta.obj_name, meta.obj_id, r_target.start[0], r_target.start[1], - r_target.count[0], r_target.count[1]); + LOG_ERROR("==PDC_SERVER[%d]: Read check Obj [%s] id=%" PRIu64 " region: start(%" PRIu64 ", %" PRIu64 + ") " + "size(%" PRIu64 ", %" PRIu64 ") \n", + pdc_server_rank_g, meta.obj_name, meta.obj_id, r_target.start[0], r_target.start[1], + r_target.count[0], r_target.count[1]); } int found_region = 0; @@ -2423,7 +2124,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * if (region_elt->is_data_ready == 1) { out->shm_addr = calloc(sizeof(char), ADDR_MAX); if (strlen(region_elt->shm_addr) == 0) - printf("==PDC_SERVER[%d]: %s - found shm_addr is NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: found shm_addr is NULL!\n", pdc_server_rank_g); else strcpy(out->shm_addr, region_elt->shm_addr); out->region = region_elt; @@ -2438,8 +2139,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * } if (found_region == 0) { - printf("==PDC_SERVER[%d]: %s - No io request with same region found!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: No io request with same region found!\n", pdc_server_rank_g); PDC_print_region_list(&r_target); out->ret = -1; goto done; @@ -2485,7 +2185,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check // If not found, create and insert one to the list if (NULL == io_target) { - printf("==PDC_SERVER: No existing io request with same obj_id found!\n"); + LOG_ERROR("==PDC_SERVER: No existing io request with same obj_id found!\n"); out->ret = -1; ret_value = SUCCEED; goto done; @@ -2510,7 +2210,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check } if (found_region == 0) { - printf("==PDC_SERVER[%d]: No existing IO request of requested region found!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: No existing IO request of requested region found!\n", pdc_server_rank_g); out->ret = -1; ret_value = SUCCEED; goto done; @@ -2545,8 +2245,8 @@ PDC_Server_data_read_to_shm(region_list_t *region_list_head) // POSIX read for now ret_value = PDC_Server_regions_io(region_list_head, PDC_POSIX); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: error reading data from storage and create shared memory\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error reading data from storage and create shared memory\n", + pdc_server_rank_g); goto done; } @@ -2571,7 +2271,7 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * *n_loc = 0; target_meta = find_metadata_by_id(obj_id); if (target_meta == NULL) { - printf("==PDC_SERVER[%d]: find_metadata_by_id FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: find_metadata_by_id FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -2583,15 +2283,14 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * *n_loc += 1; } if (*n_loc > PDC_MAX_OVERLAP_REGION_NUM) { - printf("==PDC_SERVER[%d]: %s- exceeding PDC_MAX_OVERLAP_REGION_NUM regions!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: exceeding PDC_MAX_OVERLAP_REGION_NUM regions!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } } // DL_FOREACH if (*n_loc == 0) { - printf("==PDC_SERVER[%d]: %s - no overlapping storage region found\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: no overlapping storage region found\n", pdc_server_rank_g); PDC_print_region_list(region); ret_value = FAIL; goto done; @@ -2654,7 +2353,7 @@ PDC_Server_update_storage_meta(int *n_updated) meta_list_elt, n_updated); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - update storage info FAILED!", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: update storage info FAILED!\n", pdc_server_rank_g); goto done; } @@ -2686,7 +2385,7 @@ PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *cal if (n_check_write_finish_returned_g >= pdc_buffered_bulk_update_total_g) { ret_value = PDC_Server_update_storage_meta(&n_updated); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - FAILED to update storage meta\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: FAILED to update storage meta\n", pdc_server_rank_g); goto done; } @@ -2739,7 +2438,7 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) FUNC_ENTER(NULL); if (regions_head == NULL) { - printf("==PDC_SERVER[%d]: %s - NULL input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -2753,14 +2452,12 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) region_meta = region_elt->meta; // All requests should point to the same metadata if (region_meta == NULL) { - printf("==PDC_SERVER[%d]: %s - request region has NULL metadata!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: request region has NULL metadata!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } else if (region_meta->obj_id != region_meta_prev->obj_id) { - printf("==PDC_SERVER[%d]: %s - request regions are of different object!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: request regions are of different object!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -2769,9 +2466,9 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) // nrequest_per_server should be less than PDC_SERVER_MAX_PROC_PER_NODE // and should be the same across all servers. if (nrequest_per_server > PDC_SERVER_MAX_PROC_PER_NODE) { - printf("==PDC_SERVER[%d]: %s - more requests than expected! " - "Increase PDC_SERVER_MAX_PROC_PER_NODE!\n", - pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: more requests than expected! " + "Increase PDC_SERVER_MAX_PROC_PER_NODE!\n", + pdc_server_rank_g); fflush(stdout); } else { @@ -2824,7 +2521,7 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) server_idx = i / nrequest_per_server; // server_idx should be [0, pdc_server_size_g) if (server_idx < 0 || server_idx >= pdc_server_size_g) { - printf("==PDC_SERVER[%d]: %s - ERROR with server idx count!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with server idx count!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -2834,14 +2531,13 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) ret_value = PDC_Server_get_local_storage_location_of_region(region_meta->obj_id, &req_region, &overlap_cnt, overlap_regions_2d); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - unable to get local storage location!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: unable to get local storage location!\n", pdc_server_rank_g); goto done; } if (overlap_cnt > PDC_MAX_OVERLAP_REGION_NUM) { - printf("==PDC_SERVER[%d]: %s - found %d storage locations than PDC_MAX_OVERLAP_REGION_NUM!\n", - pdc_server_rank_g, __func__, overlap_cnt); + LOG_ERROR("==PDC_SERVER[%d]: found %d storage locations than PDC_MAX_OVERLAP_REGION_NUM!\n", + pdc_server_rank_g, overlap_cnt); overlap_cnt = PDC_MAX_OVERLAP_REGION_NUM; fflush(stdout); @@ -2960,17 +2656,16 @@ PDC_Server_regions_io(region_list_t *region_list_head, _pdc_io_plugin_t plugin) if (plugin == PDC_POSIX) { ret_value = PDC_Server_posix_one_file_io(region_list_head); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s-error with PDC_Server_posix_one_file_io\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: %s-error with PDC_Server_posix_one_file_io\n", pdc_server_rank_g); goto done; } } else if (plugin == PDC_DAOS) { - printf("DAOS plugin in under development, switch to POSIX instead.\n"); + LOG_ERROR("DAOS plugin in under development, using POSIX.\n"); ret_value = PDC_Server_posix_one_file_io(region_list_head); } else { - printf("==PDC_SERVER: unsupported IO plugin!\n"); + LOG_ERROR("==PDC_SERVER: unsupported IO plugin!\n"); ret_value = FAIL; goto done; } @@ -3024,15 +2719,14 @@ PDC_Server_data_write_from_shm(region_list_t *region_list_head) // Open shared memory and map to data buf region_elt->shm_fd = shm_open(region_elt->shm_addr, O_RDONLY, 0666); if (region_elt->shm_fd == -1) { - printf("==PDC_SERVER[%d]: %s - Shared memory open failed [%s]!\n", pdc_server_rank_g, __func__, - region_elt->shm_addr); + LOG_ERROR("==PDC_SERVER[%d]: Shared memory open failed [%s]!\n", pdc_server_rank_g, + region_elt->shm_addr); ret_value = FAIL; goto done; } region_elt->buf = mmap(0, region_elt->data_size, PROT_READ, MAP_SHARED, region_elt->shm_fd, 0); if (region_elt->buf == MAP_FAILED) { - // printf("==PDC_SERVER[%d]: Map failed: %s\n", pdc_server_rank_g, strerror(errno)); // close and unlink? ret_value = FAIL; goto done; @@ -3042,7 +2736,7 @@ PDC_Server_data_write_from_shm(region_list_t *region_list_head) // POSIX write ret_value = PDC_Server_regions_io(region_list_head, PDC_POSIX); if (ret_value != SUCCEED) { - printf("==PDC_SERVER: PDC_Server_regions_io ERROR!\n"); + LOG_ERROR("==PDC_SERVER: PDC_Server_regions_io ERROR!\n"); goto done; } @@ -3099,7 +2793,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) buffer_read_request_num_g++; } else { - printf("==PDC_SERVER: PDC_Server_data_io_via_shm - invalid IO type received from client!\n"); + LOG_ERROR("==PDC_SERVER: PDC_Server_data_io_via_shm - invalid IO type received from client!\n"); ret_value = FAIL; goto done; } @@ -3137,7 +2831,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) // write and read are separate lists io_list_target = (pdc_data_server_io_list_t *)calloc(1, sizeof(pdc_data_server_io_list_t)); if (NULL == io_list_target) { - printf("==PDC_SERVER: ERROR allocating pdc_data_server_io_list_t!\n"); + LOG_ERROR("==PDC_SERVER: ERROR allocating pdc_data_server_io_list_t!\n"); ret_value = FAIL; goto done; } @@ -3181,9 +2875,9 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) io_list_target->count++; if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: received %d/%d data %s requests of [%s]\n", pdc_server_rank_g, - io_list_target->count, io_list_target->total, io_info->io_type == PDC_READ ? "read" : "write", - io_info->meta.obj_name); + LOG_ERROR("==PDC_SERVER[%d]: received %d/%d data %s requests of [%s]\n", pdc_server_rank_g, + io_list_target->count, io_list_target->total, + io_info->io_type == PDC_READ ? "read" : "write", io_info->meta.obj_name); fflush(stdout); } @@ -3209,7 +2903,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) // append current request region to the io list region_list_t *new_region = (region_list_t *)calloc(1, sizeof(region_list_t)); if (new_region == NULL) { - printf("==PDC_SERVER: ERROR allocating new_region!\n"); + LOG_ERROR("==PDC_SERVER: ERROR allocating new_region!\n"); ret_value = FAIL; goto done; } @@ -3218,8 +2912,8 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) DL_APPEND(io_list_target->region_list_head, new_region); if (is_debug_g == 1) { DL_COUNT(io_list_target->region_list_head, region_elt, count); - printf("==PDC_SERVER[%d]: Added 1 to IO request list, obj_id=%" PRIu64 ", %d total\n", - pdc_server_rank_g, new_region->meta->obj_id, count); + LOG_DEBUG("==PDC_SERVER[%d]: Added 1 to IO request list, obj_id=%" PRIu64 ", %d total\n", + pdc_server_rank_g, new_region->meta->obj_id, count); PDC_print_region_list(new_region); } } @@ -3229,8 +2923,8 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) buffer_write_request_total_g != 0) { if (is_debug_g) { - printf("==PDC_SERVER[%d]: received all %d requests, starts writing.\n", pdc_server_rank_g, - buffer_write_request_total_g); + LOG_ERROR("==PDC_SERVER[%d]: received all %d requests, starts writing.\n", pdc_server_rank_g, + buffer_write_request_total_g); fflush(stdout); } @@ -3258,8 +2952,8 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) // If BB is enabled, then overwrite with BB path with the right number of servers if (write_to_bb_percentage_g > 0) { if (strcmp(io_list_elt->bb_path, "") == 0 || io_list_elt->bb_path[0] == 0) { - printf("==PDC_SERVER[%d]: Error with BB path [%s]!\n", pdc_server_rank_g, - io_list_elt->bb_path); + LOG_ERROR("==PDC_SERVER[%d]: Error with BB path [%s]!\n", pdc_server_rank_g, + io_list_elt->bb_path); } else { if (pdc_server_rank_g % 2 == 0) { @@ -3286,7 +2980,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) } ret_value = PDC_Server_data_write_from_shm(io_list_elt->region_list_head); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_data_write_from_shm FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_data_write_from_shm FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3302,13 +2996,13 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) current_read_from_cache_cnt_g = 0; total_read_from_cache_cnt_g = buffer_read_request_total_g * cache_percentage_g / 100; if (pdc_server_rank_g == 0) { - printf("==PDC_SERVER[%d]: cache percentage %d%% read_from_cache %d/%d\n", pdc_server_rank_g, - cache_percentage_g, current_read_from_cache_cnt_g, total_read_from_cache_cnt_g); + LOG_ERROR("==PDC_SERVER[%d]: cache percentage %d%% read_from_cache %d/%d\n", pdc_server_rank_g, + cache_percentage_g, current_read_from_cache_cnt_g, total_read_from_cache_cnt_g); } if (is_debug_g) { - printf("==PDC_SERVER[%d]: received all %d requests, starts reading.\n", pdc_server_rank_g, - buffer_read_request_total_g); + LOG_ERROR("==PDC_SERVER[%d]: received all %d requests, starts reading.\n", pdc_server_rank_g, + buffer_read_request_total_g); } DL_FOREACH(pdc_data_server_read_list_head_g, io_list_elt) { @@ -3329,7 +3023,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) } ret_value = PDC_Server_data_read_to_shm(io_list_elt->region_list_head); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_data_read_to_shm FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_data_read_to_shm FAILED!\n", pdc_server_rank_g); goto done; } } @@ -3359,7 +3053,7 @@ PDC_Server_update_local_region_storage_loc(region_list_t *region, uint64_t obj_i FUNC_ENTER(NULL); if (region == NULL) { - printf("==PDC_SERVER[%d]: %s - NULL input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3367,7 +3061,7 @@ PDC_Server_update_local_region_storage_loc(region_list_t *region, uint64_t obj_i // Find object metadata target_meta = find_metadata_by_id(obj_id); if (target_meta == NULL) { - printf("==PDC_SERVER[%d]: %s - FAIL to get storage metadata\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: FAIL to get storage metadata\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3388,8 +3082,7 @@ PDC_Server_update_local_region_storage_loc(region_list_t *region, uint64_t obj_i region_elt->region_hist = region->region_hist; } else { - printf("==PDC_SERVER[%d]: %s - error with update type %d!\n", pdc_server_rank_g, __func__, - type); + LOG_ERROR("==PDC_SERVER[%d]: error with update type %d!\n", pdc_server_rank_g, type); break; } @@ -3408,7 +3101,7 @@ PDC_Server_update_local_region_storage_loc(region_list_t *region, uint64_t obj_i // Create the region list new_region = (region_list_t *)calloc(1, sizeof(region_list_t)); if (PDC_region_list_t_deep_cp(region, new_region) != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - deep copy FAILED!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: deep copy FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3449,7 +3142,7 @@ PDC_Server_update_region_loc_cb(const struct hg_cb_info *callback_info) /* Get output from server*/ ret_value = HG_Get_output(handle, &output); if (ret_value != HG_SUCCESS || output.ret != 20171031) { - printf("==PDC_SERVER[%d]: %s - error HG_Get_output\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error HG_Get_output\n", pdc_server_rank_g); lookup_args->ret_int = -1; goto done; } @@ -3477,20 +3170,20 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) FUNC_ENTER(NULL); if (region == NULL) { - printf("==PDC_SERVER[%d] %s - NULL region!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d] NULL region!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } if (region->storage_location[0] == 0) { - printf("==PDC_SERVER[%d]: %s - NULL input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } region_meta = region->meta; if (region_meta == NULL) { - printf("==PDC_SERVER[%d]: %s - region meta is NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: region meta is NULL!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3502,16 +3195,15 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) ret_value = PDC_Server_update_local_region_storage_loc(region, region_meta->obj_id, type); update_local_region_count_g++; if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - update_local_region_storage FAILED!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: update_local_region_storage FAILED!\n", pdc_server_rank_g); goto done; } } else { if (PDC_Server_lookup_server_id(server_id) != SUCCEED) { - printf("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, - server_id); + LOG_ERROR("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, + server_id); ret_value = FAIL; goto done; } @@ -3519,14 +3211,14 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) hg_ret = HG_Create(hg_context_g, pdc_remote_server_info_g[server_id].addr, update_region_loc_register_id_g, &update_region_loc_handle); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: %s - HG_Create FAILED!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Create FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: Sending updated region loc to server %d\n", pdc_server_rank_g, - server_id); + LOG_DEBUG("==PDC_SERVER[%d]: Sending updated region loc to server %d\n", pdc_server_rank_g, + server_id); fflush(stdout); } @@ -3544,15 +3236,14 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) } if (in.hist.nbin == 0) { - printf("==PDC_SERVER[%d]: %s - ERROR sending hist to server %d with 0 bins\n", pdc_server_rank_g, - __func__, server_id); + LOG_ERROR("==PDC_SERVER[%d]: ERROR sending hist to server %d with 0 bins\n", pdc_server_rank_g, + server_id); } lookup_args.rpc_handle = update_region_loc_handle; hg_ret = HG_Forward(update_region_loc_handle, PDC_Server_update_region_loc_cb, &lookup_args, &in); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: %s - HG_Forward() to server %d FAILED\n", pdc_server_rank_g, __func__, - server_id); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward() to server %d FAILED\n", pdc_server_rank_g, server_id); HG_Destroy(update_region_loc_handle); ret_value = FAIL; goto done; @@ -3579,7 +3270,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ // Sanity check if (NULL == region || region->storage_location[0] == 0 || NULL == region->meta) { - printf("==PDC_SERVER[%d]: %s - invalid region data!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: invalid region data!\n", pdc_server_rank_g); PDC_print_region_list(region); ret_value = FAIL; goto done; @@ -3594,7 +3285,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ bulk_data->buf_sizes = (hg_size_t *)calloc(sizeof(hg_size_t), PDC_BULK_XFER_INIT_NALLOC); if (NULL == buf_ptrs_1d || NULL == bulk_data->buf_sizes) { - printf("==PDC_SERVER[%d]: %s - calloc FAILED!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: calloc FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3617,7 +3308,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ // TODO: Need to expand the space when more than initial allocated int idx = bulk_data->idx; if (idx >= bulk_data->n_alloc) { - printf("==PDC_SERVER[%d]: %s- need to alloc larger!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: need to alloc larger!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3625,7 +3316,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ // get obj_id obj_id = region->meta->obj_id; if (obj_id == 0) { - printf("==PDC_SERVER[%d]: %s - invalid metadata from region!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: invalid metadata from region!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3635,7 +3326,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ // Check if current region has the same obj_id if (0 != *obj_id_ptr) { if (bulk_data->obj_id != obj_id) { - printf("==PDC_SERVER[%d]: %s - region has a different obj id!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: region has a different obj id!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3672,7 +3363,7 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk FUNC_ENTER(NULL); if (NULL == bulk_ptrs || cnt == 0 || NULL == bulk_ptrs[0]) { - printf("==PDC_SERVER[%d]: %s invalid input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: invalid input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -3695,7 +3386,7 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk // The bulk data are regions of same obj_id, and the corresponding metadata must be local target_meta = find_metadata_by_id(obj_id); if (target_meta == NULL) { - printf("==PDC_SERVER[%d]: %s - FAIL to get storage metadata\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: FAIL to get storage metadata\n", pdc_server_rank_g); ret_value = FAIL; goto done; @@ -3718,8 +3409,8 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk region_elt->offset = new_region->offset; update_success = 1; - printf("==PDC_SERVER[%d]: overwrite existing region location/offset\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: overwrite existing region location/offset\n", + pdc_server_rank_g); fflush(stdout); free(new_region); break; @@ -3748,19 +3439,20 @@ update_storage_meta_bulk_rpc_cb(const struct hg_cb_info *callback_info) // Sent the bulk handle with rpc and get a response ret = HG_Get_output(handle, &bulk_rpc_ret); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not get output\n"); + LOG_ERROR("Could not get output\n"); goto done; } /* Get output parameters, 9999 corresponds to the one set in update_storage_meta_bulk_cb */ if (bulk_rpc_ret.ret != 9999) - printf("==PDC_SERVER[%d]: update storage meta bulk rpc returned value error!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: update storage meta bulk rpc returned value error!\n", + pdc_server_rank_g); fflush(stdout); ret = HG_Free_output(handle, &bulk_rpc_ret); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not free output\n"); + LOG_ERROR("Could not free output\n"); goto done; } @@ -3770,7 +3462,7 @@ update_storage_meta_bulk_rpc_cb(const struct hg_cb_info *callback_info) /* Free memory handle */ ret = HG_Bulk_free(cb_args->bulk_handle); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not free bulk data handle\n"); + LOG_ERROR("Could not free bulk data handle\n"); goto done; } @@ -3820,8 +3512,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) ret_value = PDC_Server_update_region_storage_meta_bulk_local( (update_region_storage_meta_bulk_t **)all_meta, all_meta_cnt + 1); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - update_region_storage_meta_bulk_local FAILED!\n", - pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: update_region_storage_meta_bulk_local FAILED!\n", pdc_server_rank_g); goto done; } update_local_region_count_g += all_meta_cnt; @@ -3833,7 +3524,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) free(all_meta); } #else - printf("%s - is not supposed to be called without MPI enabled!\n", __func__); + LOG_ERROR("is not supposed to be called without MPI enabled!\n"); #endif fflush(stdout); FUNC_LEAVE(ret_value); @@ -3866,8 +3557,7 @@ PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * b (update_region_storage_meta_bulk_t **)bulk_data->buf_ptrs, bulk_data->idx); update_local_region_count_g++; if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - update_region_storage_meta_bulk_local FAILED!\n", - pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: update_region_storage_meta_bulk_local FAILED!\n", pdc_server_rank_g); goto done; } meta_list_target->is_updated = 1; @@ -3877,8 +3567,8 @@ PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * b } // end of if else { if (PDC_Server_lookup_server_id(server_id) != SUCCEED) { - printf("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, - server_id); + LOG_ERROR("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, + server_id); ret_value = FAIL; goto done; } @@ -3887,7 +3577,7 @@ PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * b hg_ret = HG_Create(hg_context_g, pdc_remote_server_info_g[server_id].addr, bulk_rpc_register_id_g, &rpc_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create handle\n"); + LOG_ERROR("Could not create handle\n"); ret_value = FAIL; goto done; } @@ -3896,7 +3586,7 @@ PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * b hg_ret = HG_Bulk_create(hg_class_g, bulk_data->idx, bulk_data->buf_ptrs, bulk_data->buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -3916,7 +3606,7 @@ PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * b /* Forward call to remote addr */ hg_ret = HG_Forward(rpc_handle, update_storage_meta_bulk_rpc_cb, cb_args, &bulk_rpc_in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not forward call\n"); + LOG_ERROR("Could not forward call\n"); ret_value = FAIL; goto done; } @@ -3966,7 +3656,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re *total_read_bytes = 0; if (ndim > 3 || ndim <= 0) { - printf("==PDC_SERVER[%d]: dim=%" PRIu32 " unsupported yet!", pdc_server_rank_g, ndim); + LOG_ERROR("==PDC_SERVER[%d]: dim=%" PRIu32 " unsupported yet!", pdc_server_rank_g, ndim); ret_value = FAIL; goto done; } @@ -3982,7 +3672,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re // Get the actual start and count of region in storage if (PDC_get_overlap_start_count(ndim, req_start, req_count, storage_start, storage_count, overlap_start, overlap_count) != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_get_overlap_start_count FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_get_overlap_start_count FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4032,8 +3722,8 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re } if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: read storage offset %" PRIu64 ", buf_offset %" PRIu64 "\n", - pdc_server_rank_g, storage_offset, buf_offset); + LOG_DEBUG("==PDC_SERVER[%d]: read storage offset %" PRIu64 ", buf_offset %" PRIu64 "\n", + pdc_server_rank_g, storage_offset, buf_offset); } read_bytes = fread(buf + buf_offset, 1, total_bytes, fp); @@ -4042,8 +3732,8 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re gettimeofday(&pdc_timer_end1, 0); double region_read_time1 = PDC_get_elapsed_time_double(&pdc_timer_start1, &pdc_timer_end1); if (is_debug_g) { - printf("==PDC_SERVER[%d]: fseek + fread %" PRIu64 " bytes, %.2fs\n", pdc_server_rank_g, - read_bytes, region_read_time1); + LOG_ERROR("==PDC_SERVER[%d]: fseek + fread %" PRIu64 " bytes, %.2fs\n", pdc_server_rank_g, + read_bytes, region_read_time1); fflush(stdout); } #endif @@ -4051,17 +3741,16 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re n_contig_MB += read_bytes / 1048576.0; n_contig_read++; if (read_bytes != total_bytes) { - printf("==PDC_SERVER[%d]: %s - fread failed actual read bytes %" PRIu64 ", should be %" PRIu64 - "\n", - pdc_server_rank_g, __func__, read_bytes, total_bytes); + LOG_ERROR("==PDC_SERVER[%d]: read failed actual read bytes %" PRIu64 ", should be %" PRIu64 "\n", + pdc_server_rank_g, read_bytes, total_bytes); ret_value = FAIL; goto done; } *total_read_bytes += read_bytes; if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: Read entire storage region, size=%" PRIu64 "\n", pdc_server_rank_g, - read_bytes); + LOG_DEBUG("==PDC_SERVER[%d]: Read entire storage region, size=%" PRIu64 "\n", pdc_server_rank_g, + read_bytes); } } // end if else { @@ -4079,7 +3768,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re n_contig_MB += read_bytes / 1048576.0; n_contig_read++; if (read_bytes != overlap_count[0]) { - printf("==PDC_SERVER[%d]: %s - fread failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: fread failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4099,21 +3788,22 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re buf_serialize_offset = buf_offset + i * req_count[0] + j * req_count[0] * req_count[1]; if (is_debug_g == 1) { - printf("Read to buf offset: %" PRIu64 "\n", buf_serialize_offset); + LOG_DEBUG("Read to buf offset: %" PRIu64 "\n", buf_serialize_offset); } read_bytes = fread(buf + buf_serialize_offset, 1, overlap_count[0], fp); n_contig_MB += read_bytes / 1048576.0; n_contig_read++; if (read_bytes != overlap_count[0]) { - printf("==PDC_SERVER[%d]: %s - fread failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: fread failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } *total_read_bytes += read_bytes; if (is_debug_g == 1) { - printf("z: %" PRIu64 ", j: %" PRIu64 ", Read data size=%" PRIu64 ": [%.*s]\n", j, i, - overlap_count[0], (int)overlap_count[0], (char *)buf + buf_serialize_offset); + LOG_DEBUG("z: %" PRIu64 ", j: %" PRIu64 ", Read data size=%" PRIu64 ": [%.*s]\n", j, + i, overlap_count[0], (int)overlap_count[0], + (char *)buf + buf_serialize_offset); } } // for each row } @@ -4124,7 +3814,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re fread_total_MB += n_contig_MB; if (total_bytes != *total_read_bytes) { - printf("==PDC_SERVER[%d]: %s - read size error!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: read size error!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4139,7 +3829,7 @@ void PDC_init_bulk_xfer_data_t(bulk_xfer_data_t *a) { if (NULL == a) { - printf("==%s: NULL input!\n", __func__); + LOG_ERROR("NULL input!\n"); return; } a->buf_ptrs = NULL; @@ -4179,7 +3869,7 @@ PDC_Server_read_one_region(region_list_t *read_region) if (read_region->access_type != PDC_READ || read_region->n_overlap_storage_region == 0 || read_region->overlap_storage_regions == NULL) { - printf("==PDC_SERVER[%d]: %s - Error with input\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Error with input\n", pdc_server_rank_g); PDC_print_region_list(read_region); goto done; } @@ -4188,7 +3878,7 @@ PDC_Server_read_one_region(region_list_t *read_region) snprintf(read_region->shm_addr, ADDR_MAX, "/PDC%d_%d", pdc_server_rank_g, rand()); ret_value = PDC_create_shm_segment(read_region); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - Error with shared memory creation\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Error with shared memory creation\n", pdc_server_rank_g); goto done; } is_shm_created = 1; @@ -4200,12 +3890,12 @@ PDC_Server_read_one_region(region_list_t *read_region) { if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: Found overlapping storage regions %d\n", pdc_server_rank_g, - n_storage_regions); + LOG_DEBUG("==PDC_SERVER[%d]: Found overlapping storage regions %d\n", pdc_server_rank_g, + n_storage_regions); } if (region_elt->storage_location[0] == 0) { - printf("==PDC_SERVER[%d]: empty overlapping storage location \n", pdc_server_rank_g); + LOG_DEBUG("==PDC_SERVER[%d]: empty overlapping storage location \n", pdc_server_rank_g); PDC_print_storage_region_list(region_elt); fflush(stdout); continue; @@ -4226,8 +3916,8 @@ PDC_Server_read_one_region(region_list_t *read_region) fp_read = fopen(region_elt->storage_location, "rb"); if (fp_read == NULL) { - printf("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, - read_region->storage_location); + LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, + read_region->storage_location); continue; } n_fopen_g++; @@ -4246,7 +3936,7 @@ PDC_Server_read_one_region(region_list_t *read_region) region_elt->offset, read_region->buf, &read_bytes); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: error with PDC_Server_read_overlap_regions\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_read_overlap_regions\n", pdc_server_rank_g); fclose(fp_read); fp_read = NULL; continue; @@ -4259,8 +3949,8 @@ PDC_Server_read_one_region(region_list_t *read_region) #ifdef ENABLE_TIMING if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: Read data total size %" PRIu64 ", fopen time: %.3f\n", pdc_server_rank_g, - total_read_bytes, fopen_time); + LOG_ERROR("==PDC_SERVER[%d]: Read data total size %" PRIu64 ", fopen time: %.3f\n", pdc_server_rank_g, + total_read_bytes, fopen_time); fflush(stdout); } #endif @@ -4320,7 +4010,7 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) FUNC_ENTER(NULL); if (NULL == region_list_head) { - printf("==PDC_SERVER[%d]: %s - NULL input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4340,8 +4030,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) continue; ret_value = PDC_Server_get_storage_location_of_region_mpi(region_elt); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_get_storage_location_of_region failed!\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_get_storage_location_of_region failed!\n", + pdc_server_rank_g); goto done; } } @@ -4358,7 +4048,7 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) { if (region_elt->access_type == PDC_READ) { if (region_elt->is_io_done == 1 && region_elt->is_shm_closed != 1) { - printf("==PDC_SERVER[%d]: found cached data!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: found cached data!\n", pdc_server_rank_g); if (region_elt->access_type == PDC_READ && current_read_from_cache_cnt_g < total_read_from_cache_cnt_g) @@ -4371,8 +4061,7 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) snprintf(region_elt->shm_addr, ADDR_MAX, "/PDC%d_%d", pdc_server_rank_g, rand()); ret_value = PDC_create_shm_segment(region_elt); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - Error with shared memory creation\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: Error with shared memory creation\n", pdc_server_rank_g); continue; } @@ -4388,8 +4077,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) fclose(fp_read); fp_read = fopen(region_elt->cache_location, "rb"); if (fp_read == NULL) { - printf("==PDC_SERVER[%d]: %s - unable to open file [%s]\n", pdc_server_rank_g, - __func__, region_elt->cache_location); + LOG_ERROR("==PDC_SERVER[%d]: unable to open file [%s]\n", pdc_server_rank_g, + region_elt->cache_location); } n_fopen_g++; } @@ -4400,13 +4089,13 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) fseek(fp_read, region_elt->cache_offset, SEEK_SET); if (region_elt->data_size == 0) { - printf("==PDC_SERVER[%d]: %s - region data_size is 0\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: region data_size is 0\n", pdc_server_rank_g); continue; } read_bytes = fread(region_elt->buf, 1, region_elt->data_size, fp_read); if (read_bytes != region_elt->data_size) { - printf("==PDC_SERVER[%d]: %s - read size %zu is not expected %" PRIu64 "\n", - pdc_server_rank_g, __func__, read_bytes, region_elt->data_size); + LOG_ERROR("==PDC_SERVER[%d]: read size %zu is not expected %" PRIu64 "\n", + pdc_server_rank_g, read_bytes, region_elt->data_size); continue; } #ifdef ENABLE_TIMING @@ -4440,8 +4129,7 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) n_fopen_g++; } else { - printf("==PDC_SERVER[%d]: %s - NULL storage location\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL storage location\n", pdc_server_rank_g); fp_read = NULL; } @@ -4452,8 +4140,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) #endif if (fp_read == NULL) { - printf("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, - region_elt->storage_location); + LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, + region_elt->storage_location); ret_value = FAIL; goto done; } @@ -4468,8 +4156,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) region_elt->overlap_storage_regions[i].offset, region_elt->buf, &read_bytes); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: error with PDC_Server_read_overlap_regions\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_read_overlap_regions\n", + pdc_server_rank_g); fclose(fp_read); fp_read = NULL; goto done; @@ -4480,15 +4168,16 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) } // end of for all overlapping storage regions for one request region if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: Read data total size %zu\n", pdc_server_rank_g, - total_read_bytes); + LOG_DEBUG("==PDC_SERVER[%d]: Read data total size %zu\n", pdc_server_rank_g, + total_read_bytes); fflush(stdout); } offset += total_read_bytes; } // end else read from storage if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: Read data total size %zu\n", pdc_server_rank_g, total_read_bytes); + LOG_DEBUG("==PDC_SERVER[%d]: Read data total size %zu\n", pdc_server_rank_g, + total_read_bytes); fflush(stdout); } region_elt->is_data_ready = 1; @@ -4552,8 +4241,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) #endif if (NULL == fp_write) { - printf("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, - region_elt->storage_location); + LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, + region_elt->storage_location); ret_value = FAIL; goto done; } @@ -4570,10 +4259,11 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) // Actual write (append) write_bytes = fwrite(region_elt->buf, 1, region_elt->data_size, fp_write); if (write_bytes != region_elt->data_size) { - printf("==PDC_SERVER[%d]: fwrite to [%s] FAILED, region off %" PRIu64 ", size %" PRIu64 ", " - "actual writeen %zu!\n", - pdc_server_rank_g, region_elt->storage_location, offset, region_elt->data_size, - write_bytes); + LOG_ERROR("==PDC_SERVER[%d]: fwrite to [%s] FAILED, region off %" PRIu64 ", size %" PRIu64 + ", " + "actual writeen %zu!\n", + pdc_server_rank_g, region_elt->storage_location, offset, region_elt->data_size, + write_bytes); ret_value = FAIL; goto done; } @@ -4585,8 +4275,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) double region_write_time = PDC_get_elapsed_time_double(&pdc_timer_start5, &pdc_timer_end5); server_write_time_g += region_write_time; if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: fwrite %" PRIu64 " bytes, %.2fs\n", pdc_server_rank_g, write_bytes, - region_write_time); + LOG_DEBUG("==PDC_SERVER[%d]: fwrite %" PRIu64 " bytes, %.2fs\n", pdc_server_rank_g, + write_bytes, region_write_time); } #endif @@ -4597,15 +4287,15 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) } if (is_debug_g == 1) { - printf("Write data offset: %" PRIu64 ", size %" PRIu64 ", to [%s]\n", offset, - region_elt->data_size, region_elt->storage_location); + LOG_DEBUG("Write data offset: %" PRIu64 ", size %" PRIu64 ", to [%s]\n", offset, + region_elt->data_size, region_elt->storage_location); } region_elt->is_data_ready = 1; region_elt->offset = offset; ret_value = PDC_Server_update_region_storagelocation_offset(region_elt, PDC_UPDATE_STORAGE); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: failed to update region storage info!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: failed to update region storage info!\n", pdc_server_rank_g); goto done; } previous_region = region_elt; @@ -4614,7 +4304,7 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) } // end of WRITE else { - printf("==PDC_SERVER[%d]: %s- unsupported access type\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: unsupported access type\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4687,8 +4377,7 @@ PDC_Server_data_io_direct(pdc_access_t io_type, uint64_t obj_id, struct pdc_regi PDC_Server_set_lustre_stripe(io_region->storage_location, stripe_count, stripe_size); if (is_debug_g == 1 && pdc_server_rank_g == 0) { - printf("storage_location is %s\n", io_region->storage_location); - /* printf("lustre is enabled\n"); */ + LOG_ERROR("storage_location is %s\n", io_region->storage_location); } #endif @@ -4716,8 +4405,8 @@ PDC_Server_posix_write(int fd, void *buf, uint64_t write_size) while (write_size > max_write_size) { ret = write(fd, buf, max_write_size); if (ret < 0 || ret != (ssize_t)max_write_size) { - printf("==PDC_SERVER[%d]: in-loop: write %d failed, ret = %ld, max_write_size = %llu\n", - pdc_server_rank_g, fd, ret, max_write_size); + LOG_ERROR("==PDC_SERVER[%d]: in-loop: write %d failed, ret = %ld, max_write_size = %llu\n", + pdc_server_rank_g, fd, ret, max_write_size); ret_value = FAIL; goto done; } @@ -4728,8 +4417,8 @@ PDC_Server_posix_write(int fd, void *buf, uint64_t write_size) ret = write(fd, buf, write_size); if (ret < 0 || ret != (ssize_t)write_size) { - printf("==PDC_SERVER[%d]: write %d failed, not all data written %llu/%llu\n", pdc_server_rank_g, fd, - write_bytes, write_size); + LOG_ERROR("==PDC_SERVER[%d]: write %d failed, not all data written %llu/%llu\n", pdc_server_rank_g, + fd, write_bytes, write_size); ret_value = FAIL; goto done; } @@ -4750,8 +4439,7 @@ _setup_zfp(struct pdc_region_info *region_info, zfp_stream **zfp) else if (region_info->unit == 4) type = zfp_type_int32; else - fprintf(stderr, "==PDC_SERVER[%d]: unit has size %u not expected!\n", pdc_server_rank_g, - region_info->unit); + LOG_ERROR("==PDC_SERVER[%d]: unit has size %u not expected!\n", pdc_server_rank_g, region_info->unit); if (region_info->ndim == 1) field = zfp_field_1d(region_info->buf, type, region_info->size[0]); @@ -4841,8 +4529,8 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, // 1D can overwrite data in region directly pos = (overlap_offset[0] - overlap_region->start[0]) * unit; if (pos > write_size) { - printf("==PDC_SERVER[%d]: Error with buf pos calculation %llu / %llu! @ line %d\n", - pdc_server_rank_g, pos, write_size, __LINE__); + LOG_ERROR("==PDC_SERVER[%d]: Error with buf pos calculation %llu / %llu!\n", + pdc_server_rank_g, pos, write_size); ret_value = -1; goto done; } @@ -4851,17 +4539,14 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef PDC_TIMING start_posix = MPI_Wtime(); #endif - // printf("POSIX write from file offset %lu, region start = %lu, region size = %lu\n", - // overlap_region->offset, overlap_region->start[0], overlap_region->count[0]); ret_value = PDC_Server_posix_write(region->fd, buf + (overlap_offset[0] - region_info->offset[0]) * unit, overlap_size[0] * unit); #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_write_posix += MPI_Wtime() - start_posix; #endif - // printf("posix write for position %d with write size %u\n", (int)pos, (unsigned)write_size); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4877,8 +4562,7 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, #endif if (pread(region->fd, tmp_buf, overlap_region->data_size, overlap_region->offset) != (ssize_t)overlap_region->data_size) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes %d\n", pdc_server_rank_g, - __LINE__); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += MPI_Wtime() - start_posix; @@ -4898,7 +4582,7 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, pdc_server_timings->PDCdata_server_write_posix += MPI_Wtime() - start_posix; #endif if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4944,8 +4628,8 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, free(tmp_buf); } if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", + pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -4973,8 +4657,8 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, pdc_server_timings->PDCdata_server_write_posix += MPI_Wtime() - start_posix; #endif if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", + pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -5064,10 +4748,6 @@ 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); - - // debug - /* fprintf(stderr, "==PDC_SERVER[%d]: %s posix write for position %d with write size %u\n", */ - /* pdc_server_rank_g, __func__, 0, (unsigned)write_size); */ #ifdef ENABLE_ZFP zfp_field * field; zfp_stream *zfp; @@ -5077,22 +4757,22 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, field = _setup_zfp(region_info, &zfp); if (field == NULL) - fprintf(stderr, "==PDC_SERVER[%d]: _setup_zfp failed!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: _setup_zfp failed!\n", pdc_server_rank_g); else { bufsize = zfp_stream_maximum_size(zfp, field); if (bufsize == 0) - fprintf(stderr, "==PDC_SERVER[%d]: zfp_stream_maximum_size returned 0!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: zfp_stream_maximum_size returned 0!\n", pdc_server_rank_g); buffer = malloc(bufsize); if (buffer == 0) - fprintf(stderr, "==PDC_SERVER[%d]: malloc failed!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: malloc failed!\n", pdc_server_rank_g); else { stream = stream_open(buffer, bufsize); zfp_stream_set_bit_stream(zfp, stream); // Compress the data and overwrite the write_size for the following posix write size_t compress_size = zfp_compress(zfp, field); - fprintf(stderr, "==PDC_SERVER[%d]: zfp compressed size %lu / %llu CR=%.2lf\n", - pdc_server_rank_g, compress_size, write_size, (double)write_size / compress_size); + LOG_ERROR("==PDC_SERVER[%d]: zfp compressed size %lu / %llu CR=%.2lf\n", pdc_server_rank_g, + compress_size, write_size, (double)write_size / compress_size); buf = buffer; write_size = compress_size; } @@ -5110,7 +4790,7 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, pdc_server_timings->PDCdata_server_write_posix += MPI_Wtime() - start_posix; #endif if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_posix_write FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -5128,15 +4808,14 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_end, 0); write_total_sec = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("==PDC_SERVER[%d]: write region time: %.4f, %llu bytes\n", pdc_server_rank_g, write_total_sec, - write_size); + LOG_ERROR("==PDC_SERVER[%d]: write region time: %.4f, %llu bytes\n", pdc_server_rank_g, write_total_sec, + write_size); fflush(stdout); #endif #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_write_out += MPI_Wtime() - start; #endif - /* printf("==PDC_SERVER[%d]: write region %llu bytes\n", pdc_server_rank_g, request_region->data_size); */ done: fflush(stdout); FUNC_LEAVE(ret_value); @@ -5160,7 +4839,7 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, region = PDC_Server_get_obj_region(obj_id); /* if (region == NULL) { - printf("cannot locate file handle\n"); + LOG_ERROR("cannot locate file handle\n"); goto done; } */ @@ -5191,30 +4870,19 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, if (overlap_offset) { if (region_info->ndim == 1) { pos = (overlap_offset[0] - overlap_region->start[0]) * unit; - /* if ((ssize_t)pos > request_bytes) { */ - /* printf("==PDC_SERVER[%d]: Error with buf pos calculation %lu / %ld! @ line %d\n", */ - /* pdc_server_rank_g, pos, request_bytes, __LINE__); */ - /* ret_value = -1; */ - /* goto done; */ - /* } */ #ifdef PDC_TIMING start_posix = MPI_Wtime(); #endif - /* printf("POSIX read from file offset %lu, region start = %lu, region size = %lu\n", */ - /* overlap_region->offset, overlap_region->start[0], overlap_region->count[0]); */ if (pread(region->fd, buf + (overlap_offset[0] - region_info->offset[0]) * unit, overlap_size[0] * unit, overlap_region->offset + pos) != (ssize_t)(overlap_size[0] * unit)) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes %d\n", pdc_server_rank_g, - __LINE__); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += MPI_Wtime() - start_posix; #endif - // printf("posix read for position %d with read size %u\n", (int)pos, - // (unsigned)request_bytes); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_posix_read FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_posix_read FAILED!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -5236,11 +4904,9 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, ssize_t read_size = read_max; while (leftover > 0) { - /* printf("==PDC_SERVER[%d]: pread %llu, leftover %llu\n", pdc_server_rank_g, - * read_size, leftover); */ if (pread(region->fd, tmp_buf + buf_off, read_size, reg_off) != read_size) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes %llu, LINE %d\n", - pdc_server_rank_g, read_size, __LINE__); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes %llu\n", + pdc_server_rank_g, read_size); } reg_off += read_size; buf_off += read_size; @@ -5252,8 +4918,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, else { if (pread(region->fd, tmp_buf, overlap_region->data_size, overlap_region->offset) != (ssize_t)overlap_region->data_size) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes %d\n", - pdc_server_rank_g, __LINE__); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", + pdc_server_rank_g); } } #ifdef PDC_TIMING @@ -5269,7 +4935,7 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, field = _setup_zfp(region_info, &zfp); if (field == NULL) - fprintf(stderr, "==PDC_SERVER[%d]: _setup_zfp failed!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: _setup_zfp failed!\n", pdc_server_rank_g); else { if (region_info->ndim >= 1) @@ -5279,20 +4945,19 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, if (region_info->ndim >= 3) decompress_size *= region_info->size[2]; if (decompress_size == 0) - fprintf(stderr, "==PDC_SERVER[%d]: zfp_stream_maximum_size returned 0!\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: zfp_stream_maximum_size returned 0!\n", + pdc_server_rank_g); void *decompress_buffer = malloc(decompress_size); if (decompress_buffer == 0) - fprintf(stderr, "==PDC_SERVER[%d]: malloc failed!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: malloc failed!\n", pdc_server_rank_g); else { stream = stream_open(decompress_buffer, decompress_size); zfp_stream_set_bit_stream(zfp, stream); // Decompress the data decompress_size = zfp_decompress(zfp, field); if (decompress_size == 0) - fprintf(stderr, "==PDC_SERVER[%d]: zfp_decompress failed!\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: zfp_decompress failed!\n", pdc_server_rank_g); free(tmp_buf); tmp_buf = decompress_buffer; } @@ -5327,8 +4992,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, overlap_size[0] * overlap_size[1] * unit, overlap_region->offset + pos) != (ssize_t)(overlap_size[0] * overlap_size[1] * unit)) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", + pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += MPI_Wtime() - start_posix; @@ -5342,8 +5007,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, if (pread(region->fd, tmp_buf, overlap_size[0] * overlap_size[1] * unit, overlap_region->offset + pos) != (ssize_t)(overlap_size[0] * overlap_size[1] * unit)) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", + pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += MPI_Wtime() - start_posix; @@ -5370,8 +5035,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, unit, overlap_size[1] * unit, overlap_region->offset + pos) != (ssize_t)(overlap_size[1] * unit)) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", + pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += MPI_Wtime() - start_posix; @@ -5399,8 +5064,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, overlap_size[0] * overlap_size[1] * overlap_size[2] * unit, overlap_region->offset + pos) != (ssize_t)(overlap_size[0] * overlap_size[1] * overlap_size[2] * unit)) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", + pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += MPI_Wtime() - start_posix; @@ -5416,8 +5081,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, overlap_size[0] * overlap_size[1] * overlap_size[2] * unit, overlap_region->offset + pos) != (ssize_t)(overlap_size[0] * overlap_size[1] * overlap_size[2] * unit)) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", + pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += MPI_Wtime() - start_posix; @@ -5449,8 +5114,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, unit, overlap_size[2] * unit, overlap_region->offset + pos) != (ssize_t)(overlap_size[2] * unit)) { - printf("==PDC_SERVER[%d]: pread failed to read enough bytes\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: pread failed to read enough bytes\n", + pdc_server_rank_g); } #ifdef PDC_TIMING pdc_server_timings->PDCdata_server_read_posix += @@ -5469,8 +5134,8 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_end, 0); read_total_sec = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("==PDC_SERVER[%d]: read region time: %.4f, %llu bytes\n", pdc_server_rank_g, read_total_sec, - total_read_bytes); + LOG_INFO("==PDC_SERVER[%d]: read region time: %.4f, %llu bytes\n", pdc_server_rank_g, read_total_sec, + total_read_bytes); fflush(stdout); #endif @@ -5491,9 +5156,9 @@ PDC_Server_data_write_direct(uint64_t obj_id, struct pdc_region_info *region_inf ret_value = PDC_Server_data_io_direct(PDC_WRITE, obj_id, region_info, buf); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_data_write_direct() " - "error with PDC_Server_data_io_direct()\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_data_write_direct() " + "error with PDC_Server_data_io_direct()\n", + pdc_server_rank_g); goto done; } @@ -5510,9 +5175,9 @@ PDC_Server_data_read_direct(uint64_t obj_id, struct pdc_region_info *region_info ret_value = PDC_Server_data_io_direct(PDC_READ, obj_id, region_info, buf); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: PDC_Server_data_read_direct() " - "error with PDC_Server_data_io_direct()\n", - pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_data_read_direct() " + "error with PDC_Server_data_io_direct()\n", + pdc_server_rank_g); goto done; } @@ -5535,7 +5200,6 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args // FIXME: currently use timestep value of 0 PDC_Server_search_with_name_timestep(args->name, PDC_get_hash_by_name(args->name), 0, &meta); if (meta == NULL) { - /* printf("==PDC_SERVER[%d]: No metadata with name [%s] found!\n", pdc_server_rank_g, args->name); */ goto done; } @@ -5551,8 +5215,8 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args DL_FOREACH(region_head, region_elt) { if (i >= region_count) { - printf("==PDC_SERVER[%d] %s - More regions %d than allocated %d\n", pdc_server_rank_g, __func__, - i, region_count); + LOG_ERROR("==PDC_SERVER[%d] More regions %d than allocated %d\n", pdc_server_rank_g, i, + region_count); ret_value = FAIL; goto done; } @@ -5593,7 +5257,7 @@ PDC_Server_get_all_storage_meta_with_one_name(storage_meta_query_one_name_args_t // Fill in with storage meta (region_list_t **regions, int n_res) ret_value = PDC_Server_get_local_storage_meta_with_one_name(args); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - get local storage location ERROR!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: get local storage location ERROR!\n", pdc_server_rank_g); goto done; } @@ -5607,14 +5271,14 @@ PDC_Server_get_all_storage_meta_with_one_name(storage_meta_query_one_name_args_t // send the name to target server server_id = PDC_get_server_by_name(args->name, pdc_server_size_g); if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: %s - will get storage meta from remote server %d\n", pdc_server_rank_g, - __func__, server_id); + LOG_DEBUG("==PDC_SERVER[%d]: will get storage meta from remote server %d\n", pdc_server_rank_g, + server_id); fflush(stdout); } if (PDC_Server_lookup_server_id(server_id) != SUCCEED) { - printf("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, - server_id); + LOG_ERROR("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, + server_id); ret_value = FAIL; goto done; } @@ -5633,8 +5297,8 @@ PDC_Server_get_all_storage_meta_with_one_name(storage_meta_query_one_name_args_t hg_ret = HG_Forward(rpc_handle, PDC_check_int_ret_cb, NULL, &in); if (hg_ret != HG_SUCCESS) { - printf("==PDC_SERVER[%d]: %s - Could not start HG_Forward to server %u\n", pdc_server_rank_g, - __func__, server_id); + LOG_ERROR("==PDC_SERVER[%d]: Could not start HG_Forward to server %u\n", pdc_server_rank_g, + server_id); HG_Destroy(rpc_handle); ret_value = FAIL; goto done; @@ -5717,8 +5381,7 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t // Read data to shm ret_value = PDC_Server_read_one_region(region_elt); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - Error with PDC_Server_read_one_region\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: Error with PDC_Server_read_one_region\n", pdc_server_rank_g); } } @@ -5727,9 +5390,9 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_end, 0); read_total_sec = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("==PDC_SERVER[%d]: read %d objects time: %.4f, n_fread: %d, n_fopen: %d, is_sort_read: %d\n", - pdc_server_rank_g, accu_meta->n_accumulated, read_total_sec, n_fread_g, n_fopen_g, - is_sort_read); + LOG_INFO("==PDC_SERVER[%d]: read %d objects time: %.4f, n_fread: %d, n_fopen: %d, is_sort_read: %d\n", + pdc_server_rank_g, accu_meta->n_accumulated, read_total_sec, n_fread_g, n_fopen_g, + is_sort_read); fflush(stdout); #endif @@ -5809,13 +5472,13 @@ PDC_Server_storage_meta_name_query_bulk_respond_cb(const struct hg_cb_info *call // Sent the bulk handle with rpc and get a response ret = HG_Get_output(handle, &bulk_rpc_ret); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not get output\n"); + LOG_ERROR("Could not get output\n"); goto done; } ret = HG_Free_output(handle, &bulk_rpc_ret); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not free output\n"); + LOG_ERROR("Could not free output\n"); goto done; } @@ -5851,15 +5514,15 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac ret_value = PDC_Server_get_local_storage_meta_with_one_name(query_args); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - get local storage location ERROR!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: get local storage location ERROR!\n", pdc_server_rank_g); goto done; } // Now the storage meta is stored in query_args->regions; server_id = args->origin_id; if (PDC_Server_lookup_server_id(server_id) != SUCCEED) { - printf("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, - server_id); + LOG_ERROR("==PDC_SERVER[%d]: Error getting remote server %d addr via lookup\n", pdc_server_rank_g, + server_id); ret_value = FAIL; goto done; } @@ -5868,7 +5531,7 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac hg_ret = HG_Create(hg_context_g, pdc_remote_server_info_g[server_id].addr, get_storage_meta_name_query_bulk_result_rpc_register_id_g, &rpc_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create handle\n"); + LOG_ERROR("Could not create handle\n"); ret_value = FAIL; goto done; } @@ -5910,7 +5573,7 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac /* Register memory */ hg_ret = HG_Bulk_create(hg_class_g, nbuf, buf_ptrs, buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -5927,7 +5590,7 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac /* Forward call to remote addr */ hg_ret = HG_Forward(rpc_handle, PDC_Server_storage_meta_name_query_bulk_respond_cb, NULL, &bulk_rpc_in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not forward call\n"); + LOG_ERROR("Could not forward call\n"); ret_value = FAIL; goto done; } @@ -5954,7 +5617,7 @@ PDC_Server_proc_storage_meta_bulk(int task_id, int n_regions, region_list_t *reg pdc_task_list_t *task = PDC_find_task_from_list(&pdc_server_s2s_task_head_g, task_id, &pdc_server_task_mutex_g); if (task == NULL) { - printf("==PDC_SERVER[%d]: %s - Error getting task %d\n", pdc_server_rank_g, __func__, task_id); + LOG_ERROR("==PDC_SERVER[%d]: Error getting task %d\n", pdc_server_rank_g, task_id); ret_value = FAIL; goto done; } @@ -6025,8 +5688,8 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) // Open shared memory and map to data buf new_region->shm_fd = shm_open(new_region->shm_addr, O_RDONLY, 0666); if (new_region->shm_fd == -1) { - printf("==PDC_SERVER[%d]: %s - Shared memory open failed [%s]!\n", pdc_server_rank_g, __func__, - new_region->shm_addr); + LOG_ERROR("==PDC_SERVER[%d]: Shared memory open failed [%s]!\n", pdc_server_rank_g, + new_region->shm_addr); ret_value = FAIL; goto done; } @@ -6034,7 +5697,6 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) new_region->buf = mmap(0, new_region->data_size, PROT_READ, MAP_SHARED, new_region->shm_fd, new_region->offset); if (new_region->buf == MAP_FAILED) { - // printf("==PDC_SERVER[%d]: Map failed: %s\n", pdc_server_rank_g, strerror(errno)); ret_value = FAIL; goto done; } @@ -6103,7 +5765,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) fp_read = fopen(region->storage_location, "rb"); if (NULL == fp_read) { - printf("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, region->storage_location); + LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, region->storage_location); ret_value = FAIL; goto done; } @@ -6116,7 +5778,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) fseek(fp_read, region->offset, SEEK_SET); if (region->data_size == 0) { - printf("==PDC_SERVER[%d]: %s - region data_size is 0\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: region data_size is 0\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -6125,8 +5787,8 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) read_bytes = fread(region->buf, 1, region->data_size, fp_read); if (read_bytes != region->data_size) { - printf("==PDC_SERVER[%d]: %s - read size %" PRIu64 " is not expected %" PRIu64 "\n", - pdc_server_rank_g, __func__, read_bytes, region->data_size); + LOG_ERROR("==PDC_SERVER[%d]: read size %" PRIu64 " is not expected %" PRIu64 "\n", pdc_server_rank_g, + read_bytes, region->data_size); ret_value = FAIL; goto done; } @@ -6167,8 +5829,8 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) fclose(fp_read); fp_read = fopen(region_elt->storage_location, "rb"); if (NULL == fp_read) { - printf("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, - region_elt->storage_location); + LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, + region_elt->storage_location); } n_fopen_g++; } @@ -6180,7 +5842,7 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) fseek(fp_read, region_elt->offset, SEEK_SET); if (region_elt->data_size == 0) { - printf("==PDC_SERVER[%d]: %s - region data_size is 0\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: region data_size is 0\n", pdc_server_rank_g); continue; } @@ -6188,8 +5850,8 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) read_bytes = fread(region_elt->buf, 1, region_elt->data_size, fp_read); if (read_bytes != region_elt->data_size) { - printf("==PDC_SERVER[%d]: %s - read size %" PRIu64 " is not expected %" PRIu64 "\n", - pdc_server_rank_g, __func__, read_bytes, region_elt->data_size); + LOG_ERROR("==PDC_SERVER[%d]: read size %" PRIu64 " is not expected %" PRIu64 "\n", + pdc_server_rank_g, read_bytes, region_elt->data_size); continue; } read_count++; @@ -6206,11 +5868,11 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) double read_time = PDC_get_elapsed_time_double(&pdc_timer_start1, &pdc_timer_end1); server_read_time_g += read_time; if (region_list_head != NULL) { - printf("==PDC_SERVER[%d]: %s finished reading obj %" PRIu64 " of %d regions, %.2f seconds!\n", - pdc_server_rank_g, __func__, region_list_head->obj_id, read_count, read_time); + LOG_INFO("==PDC_SERVER[%d]: finished reading obj %" PRIu64 " of %d regions, %.2f seconds!\n", + pdc_server_rank_g, region_list_head->obj_id, read_count, read_time); } else - printf("==PDC_SERVER[%d]: %s no regions have been read!\n", pdc_server_rank_g, __func__); + LOG_INFO("==PDC_SERVER[%d]: no regions have been read!\n", pdc_server_rank_g); #endif fflush(stdout); @@ -6224,40 +5886,10 @@ PDC_region_has_hits_from_hist(pdc_query_constraint_t *constraint, pdc_histogram_ double value, value2; if (constraint == NULL || region_hist == NULL) { - printf("==PDC_SERVER[%d]: %s - NULL input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL input!\n", pdc_server_rank_g); return -1; } - /* - switch (constraint->type) { - case PDC_FLOAT: - value = (double)(*((float *)&constraint->value)); - value2 = (double)(*((float *)&constraint->value2)); - break; - case PDC_DOUBLE: - value = (double)(*((double *)&constraint->value)); - value2 = (double)(*((double *)&constraint->value2)); - break; - case PDC_INT: - value = (double)(*((int *)&constraint->value)); - value2 = (double)(*((int *)&constraint->value2)); - break; - case PDC_UINT: - value = (double)(*((uint32_t *)&constraint->value)); - value2 = (double)(*((uint32_t *)&constraint->value2)); - break; - case PDC_INT64: - value = (double)(*((int64_t *)&constraint->value)); - value2 = (double)(*((int64_t *)&constraint->value2)); - break; - case PDC_UINT64: - value = (double)(*((uint64_t *)&constraint->value)); - value2 = (double)(*((uint64_t *)&constraint->value2)); - break; - default: - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, __func__); - return -1; - } - */ + switch (constraint->type) { case PDC_FLOAT: value = (double)constraint->value; @@ -6285,7 +5917,7 @@ PDC_region_has_hits_from_hist(pdc_query_constraint_t *constraint, pdc_histogram_ value2 = (double)constraint->value2; break; default: - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with operator type!\n", pdc_server_rank_g); return -1; } @@ -6312,115 +5944,6 @@ PDC_region_has_hits_from_hist(pdc_query_constraint_t *constraint, pdc_histogram_ return 1; } -/* -static perr_t -PDC_constraint_get_nhits_from_hist(pdc_query_constraint_t *constraint, pdc_histogram_t *region_hist, - uint64_t *min_hits, uint64_t *max_hits) -{ - perr_t ret_value = SUCCEED; - pdc_query_op_t lop; - double value, value2; - int i, lidx, ridx; - - if (constraint == NULL || region_hist == NULL || min_hits == NULL || max_hits == NULL) { - printf("==PDC_SERVER[%d]: %s - NULL input!\n", pdc_server_rank_g, __func__); - - - goto done; - } - - switch(constraint->type) { - case PDC_FLOAT : - value = (double)(*((float*)&constraint->value)); - value2 = (double)(*((float*)&constraint->value2)); - break; - case PDC_DOUBLE: - value = (double)(*((double*)&constraint->value)); - value2 = (double)(*((double*)&constraint->value2)); - break; - case PDC_INT: - value = (double)(*((int*)&constraint->value)); - value2 = (double)(*((int*)&constraint->value2)); - break; - case PDC_UINT: - value = (double)(*((uint32_t*)&constraint->value)); - value2 = (double)(*((uint32_t*)&constraint->value2)); - break; - case PDC_INT64: - value = (double)(*((int64_t*)&constraint->value)); - value2 = (double)(*((int64_t*)&constraint->value2)); - - break; - case PDC_UINT64: - value = (double)(*((uint64_t*)&constraint->value)); - value2 = (double)(*((uint64_t*)&constraint->value2)); - break; - default: - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, __func__); - ret_value = FAIL; - goto done; - } - - lop = constraint->op; - *min_hits = *max_hits = 0; - lidx = 0; - ridx = region_hist->nbin*2 - 1; - - if (constraint->is_range == 1) { - // No overlap at all - if (value > region_hist->range[region_hist->nbin*2-1] || value2 < region_hist->range[0]) { - goto done; - } - - // Find the value range in hist that includes the queried range - i = 0; - while (i < region_hist->nbin*2 && region_hist->range[i] < value) { - lidx = i; - i += 2; - } - - i = region_hist->nbin*2 - 1; - while (i > 0 && region_hist->range[i] > value2) { - ridx = i; - i -= 2; - } - } - else { - // one sided - if (lop == PDC_LT || lop == PDC_LTE) { - i = region_hist->nbin*2 - 1; - while (i > 0 && region_hist->range[i] > value) { - ridx = i; - i -= 2; - } - lidx = 0; - value2 = value; - value = -DBL_MAX; - } - else if (lop == PDC_GT || lop == PDC_GTE) { - i = 0; - while (i < region_hist->nbin*2 && region_hist->range[i] < value) { - lidx = i; - i += 2; - } - ridx = region_hist->nbin*2 - 1; - value2 = DBL_MAX; - } - } - - for (i = lidx/2; i <= ridx/2; i++) { - (*max_hits) += region_hist->bin[i]; - if (region_hist->range[i*2] >= value && region_hist->range[i*2+1] <= value2) { - - (*min_hits) += region_hist->bin[i]; - } - } - -done: - return ret_value; -} -*/ - static perr_t PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_combine_op_t combine_op) { @@ -6435,8 +5958,7 @@ PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_com storage_region_list_head = constraint->storage_region_list_head; if (NULL == constraint || NULL == storage_region_list_head) { - printf("==PDC_SERVER[%d]: %s - NULL query constraint/storage region!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: NULL query constraint/storage region!\n", pdc_server_rank_g); goto done; } @@ -6461,8 +5983,7 @@ PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_com // write and read are separate lists io_list_target = (pdc_data_server_io_list_t *)calloc(1, sizeof(pdc_data_server_io_list_t)); if (NULL == io_list_target) { - printf("==PDC_SERVER[%d]: %s - ERROR allocating pdc_data_server_io_list_t!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR allocating pdc_data_server_io_list_t!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -6512,14 +6033,11 @@ PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_com if (gen_hist_g == 1) { if (req_region->region_hist->nbin == 0) { - printf("==PDC_SERVER[%d]: %s - ERROR histogram is empty!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR histogram is empty!\n", pdc_server_rank_g); fflush(stdout); } if (PDC_region_has_hits_from_hist(constraint, req_region->region_hist) == 0) { - /* printf("==PDC_SERVER[%d]: Region [%" PRIu64 ", %" PRIu64 "], skipped by histogram\n", */ - /* pdc_server_rank_g, req_region->start[0], req_region->count[0]); */ - if (task->invalid_region_ids == NULL) task->invalid_region_ids = (int *)calloc(count, sizeof(int)); @@ -6550,7 +6068,7 @@ PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_com // append current request region to the io list region_list_t *new_region = (region_list_t *)calloc(1, sizeof(region_list_t)); if (new_region == NULL) { - printf("==PDC_SERVER: ERROR allocating new_region!\n"); + LOG_ERROR("==PDC_SERVER: ERROR allocating new_region!\n"); ret_value = FAIL; goto done; } @@ -6571,7 +6089,7 @@ PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_com // TODO: potential optimization: aggregate all I/O requests ret_value = PDC_Server_data_read_to_buf(io_list_target->region_list_head); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - PDC_Server_data_read_to_shm FAILED!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_data_read_to_shm FAILED!\n", pdc_server_rank_g); goto done; } @@ -6584,12 +6102,12 @@ perr_t region_index_to_coord(int ndim, uint64_t idx, uint64_t *sizes, uint64_t *coord) { if (sizes == NULL || coord == NULL) { - printf("==PDC_SERVER[%d]: %s - input NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: input NULL!\n", pdc_server_rank_g); return FAIL; } if (ndim > 3) { - printf("==PDC_SERVER[%d]: %s - dimension > 3 not supported!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: dimension > 3 not supported!\n", pdc_server_rank_g); return FAIL; } @@ -6612,12 +6130,12 @@ coord_to_region_index(size_t ndim, uint64_t *coord, region_list_t *region, int u uint64_t off = 0; if (ndim == 0 || coord == NULL || region == NULL || region->start[0] == 0 || region->count[0] == 0) { - printf("==PDC_SERVER[%d]: %s - input NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: input NULL!\n", pdc_server_rank_g); return 0; } if (ndim > 3) { - printf("==PDC_SERVER[%d]: %s - cannot handle dim > 3!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: cannot handle dim > 3!\n", pdc_server_rank_g); return 0; } @@ -6707,7 +6225,7 @@ compare_coords_3d(const void *a, const void *b) _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ - printf("==PDC_SERVER[%d]: %s - dimension > 3 not supported!\n", pdc_server_rank_g, __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: dimension > 3 not supported!\n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6739,8 +6257,7 @@ compare_coords_3d(const void *a, const void *b) is_good = 1; \ break; \ default: \ - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, \ - __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: error with operator type!\n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6750,8 +6267,7 @@ compare_coords_3d(const void *a, const void *b) ((_sel)->coords) = \ (uint64_t *)realloc(((_sel)->coords), (_sel)->coords_alloc * sizeof(uint64_t)); \ if (NULL == ((_sel)->coords)) { \ - printf("==PDC_SERVER[%d]: %s - error with malloc!\n", pdc_server_rank_g, \ - __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: error with malloc!\n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6812,8 +6328,7 @@ compare_coords_3d(const void *a, const void *b) is_good = 1; \ break; \ default: \ - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, \ - __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: error with operator type!\n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6838,8 +6353,8 @@ compare_coords_3d(const void *a, const void *b) jjj++; \ } \ if (iii > (_sel)->nhits) \ - printf("==PDC_SERVER[%d]: ERROR! invalidated more elements than total\n", \ - pdc_server_rank_g); \ + LOG_ERROR("==PDC_SERVER[%d]: Error! invalidated more elements than total\n", \ + pdc_server_rank_g); \ else \ ((_sel)->nhits) -= iii; \ } \ @@ -6855,7 +6370,7 @@ compare_coords_3d(const void *a, const void *b) _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ - printf("==PDC_SERVER[%d]: %s - dimension > 3 not supported!\n", pdc_server_rank_g, __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: dimension > 3 not supported!\n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6882,7 +6397,7 @@ compare_coords_3d(const void *a, const void *b) is_good = 1; \ } \ else { \ - printf("==PDC_SERVER[%d]: %s - error with range op! \n", pdc_server_rank_g, __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: error with range op! \n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6892,8 +6407,7 @@ compare_coords_3d(const void *a, const void *b) ((_sel)->coords) = \ (uint64_t *)realloc(((_sel)->coords), (_sel)->coords_alloc * sizeof(uint64_t)); \ if (NULL == ((_sel)->coords)) { \ - printf("==PDC_SERVER[%d]: %s - error with malloc!\n", pdc_server_rank_g, \ - __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: error with malloc!\n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6949,7 +6463,7 @@ compare_coords_3d(const void *a, const void *b) is_good = 1; \ } \ else { \ - printf("==PDC_SERVER[%d]: %s - error with range op! \n", pdc_server_rank_g, __func__); \ + LOG_ERROR("==PDC_SERVER[%d]: - error with range op!\n", pdc_server_rank_g); \ ret_value = FAIL; \ goto done; \ } \ @@ -6974,8 +6488,8 @@ compare_coords_3d(const void *a, const void *b) jjj++; \ } \ if (iii > (_sel)->nhits) \ - printf("==PDC_SERVER[%d]: ERROR! invalidated more elements than total\n", \ - pdc_server_rank_g); \ + LOG_ERROR("==PDC_SERVER[%d]: Error! invalidated more elements than total\n", \ + pdc_server_rank_g); \ else \ ((_sel)->nhits) -= iii; \ } \ @@ -7027,23 +6541,21 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast fastbitErr = fastbit_iapi_register_array(bmsName, ft, data, dataCount); if (fastbitErr < 0) { - printf("==PDC_SERVER[%d]: %s - ERROR with fastbit_iapi_register_array\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with fastbit_iapi_register_array\n", pdc_server_rank_g); ret_value = FAIL; goto done; } fastbitErr = fastbit_iapi_build_index(bmsName, (const char *)gBinningOption); if (fastbitErr < 0) { - printf("==PDC_SERVER[%d]: %s - ERROR with fastbit_iapi_build_index\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with fastbit_iapi_build_index\n", pdc_server_rank_g); ret_value = FAIL; goto done; } fastbitErr = fastbit_iapi_deconstruct_index(bmsName, &keys, &nk, &offsets, &no, &bms, &nb); if (fastbitErr < 0) { - printf("==PDC_SERVER[%d]: %s - ERROR with fastbit_iapi_deconstruct_index\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with fastbit_iapi_deconstruct_index\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -7066,7 +6578,7 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast sprintf(out_name, "%s/%s", storage_location, bmsName); fp = fopen(out_name, "w"); if (fp == NULL) { - printf("==PDC_SERVER[%d]: %s - unable to open file [%s]\n", pdc_server_rank_g, __func__, out_name); + LOG_ERROR("==PDC_SERVER[%d]: unable to open file [%s]\n", pdc_server_rank_g, out_name); goto done; } fwrite(bms, nb, sizeof(uint32_t), fp); @@ -7075,7 +6587,7 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast sprintf(out_name, "%s/%s", storage_location, keyName); fp = fopen(out_name, "w"); if (fp == NULL) { - printf("==PDC_SERVER[%d]: %s - unable to open file [%s]\n", pdc_server_rank_g, __func__, out_name); + LOG_ERROR("==PDC_SERVER[%d]: unable to open file [%s]\n", pdc_server_rank_g, out_name); goto done; } fwrite(keys, nk, sizeof(double), fp); @@ -7084,7 +6596,7 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast sprintf(out_name, "%s/%s", storage_location, offName); fp = fopen(out_name, "w"); if (fp == NULL) { - printf("==PDC_SERVER[%d]: %s - unable to open file [%s]\n", pdc_server_rank_g, __func__, out_name); + LOG_ERROR("==PDC_SERVER[%d]: unable to open file [%s]\n", pdc_server_rank_g, out_name); goto done; } fwrite(offsets, no, sizeof(int64_t), fp); @@ -7124,17 +6636,17 @@ queryData(const char *name) FastBitSelectionHandle sel = fastbit_selection_combine(sel1, FastBitCombineAnd, sel2); nhits = fastbit_selection_evaluate(sel); - printf("Query has %" PRIu64 " hits\n", nhits); + LOG_INFO("Query has %" PRIu64 " hits\n", nhits); buf = (uint64_t *)calloc(nhits, sizeof(uint64_t)); nhits = fastbit_selection_get_coordinates(sel, buf, nhits, 0); - printf("Coordinates:\n"); + LOG_JUST_PRINT("Coordinates:\n"); for (i = 0; i < nhits; i++) { - printf(", %" PRIu64 "", buf[i]); + LOG_JUST_PRINT(", %" PRIu64 "", buf[i]); } - printf("\n"); + LOG_JUST_PRINT("\n"); free(buf); @@ -7175,7 +6687,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i sprintf(out_name, "%s/%s", storage_location, bmsName); fp = fopen(out_name, "r"); if (fp == NULL) { - printf("==PDC_SERVER[%d]: %s - ERROR opening file [%s]!\n", pdc_server_rank_g, __func__, out_name); + LOG_ERROR("==PDC_SERVER[%d]: ERROR opening file [%s]!\n", pdc_server_rank_g, out_name); return -1; } fseek(fp, 0, SEEK_END); @@ -7189,7 +6701,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i sprintf(out_name, "%s/%s", storage_location, keyName); fp = fopen(out_name, "r"); if (fp == NULL) { - printf("==PDC_SERVER[%d]: %s - ERROR opening file [%s]!\n", pdc_server_rank_g, __func__, out_name); + LOG_ERROR("==PDC_SERVER[%d]: ERROR opening file [%s]!\n", pdc_server_rank_g, out_name); return -1; } @@ -7204,7 +6716,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i sprintf(out_name, "%s/%s", storage_location, offName); fp = fopen(out_name, "r"); if (fp == NULL) { - printf("==PDC_SERVER[%d]: %s - ERROR opening file [%s]!\n", pdc_server_rank_g, __func__, out_name); + LOG_ERROR("==PDC_SERVER[%d]: ERROR opening file [%s]!\n", pdc_server_rank_g, out_name); return -1; } fseek(fp, 0, SEEK_END); @@ -7240,7 +6752,7 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, FUNC_ENTER(NULL); if (region == NULL || constraint == NULL || coords == NULL || nhit == NULL) { - printf("==PDC_SERVER[%d]: %s - ERROR with input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]:ERROR with input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -7301,7 +6813,7 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, v2 = (double)(*((uint64_t *)&constraint->value2)); break; default: - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with operator type!\n", pdc_server_rank_g); ret_value = FAIL; goto done; @@ -7366,7 +6878,7 @@ PDC_gen_fastbit_idx(region_list_t *region, pdc_var_type_t dtype) FUNC_ENTER(NULL); if (region == NULL || region->buf == NULL) { - printf("==PDC_SERVER[%d]: %s - ERROR with input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -7423,7 +6935,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ void * value = NULL, *buf = NULL; int n_eval_region = 0, can_skip, region_iter = 0; - printf("==PDC_SERVER[%d]: %s - start query evaluation!\n", pdc_server_rank_g, __func__); + LOG_INFO("==PDC_SERVER[%d]: start query evaluation!\n", pdc_server_rank_g); fflush(stdout); #ifdef ENABLE_TIMING @@ -7434,14 +6946,14 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ // query is guarenteed to be non-leaf nodes if (query == NULL) { - printf("==PDC_SERVER[%d]: %s - input query NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: input query NULL!\n", pdc_server_rank_g); goto done; } // Need to go through each region for query evaluation, so get region head region_list_head = (region_list_t *)query->constraint->storage_region_list_head; if (NULL == region_list_head) { - printf("==PDC_SERVER[%d]: %s - error with storage_region_list_head!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with storage_region_list_head!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -7452,7 +6964,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ ndim = task->ndim; if (ndim <= 0 || ndim > 3) { - printf("==PDC_SERVER[%d]: %s - error with ndim = %d!\n", pdc_server_rank_g, __func__, ndim); + LOG_ERROR("==PDC_SERVER[%d]: error with ndim = %d!\n", pdc_server_rank_g, ndim); ret_value = FAIL; goto done; } @@ -7488,37 +7000,6 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ // Check if there is a range query that we can combine the evaluation if (query->constraint->is_range == 1) { - /* - switch (query->constraint->type) { - - case PDC_FLOAT: - flo = *((float *)&query->constraint->value); - fhi = *((float *)&query->constraint->value2); - break; - case PDC_DOUBLE: - dlo = *((double *)&query->constraint->value); - dhi = *((double *)&query->constraint->value2); - break; - case PDC_INT: - ilo = *((int *)&query->constraint->value); - ihi = *((int *)&query->constraint->value2); - break; - case PDC_UINT: - ulo = *((uint32_t *)&query->constraint->value); - uhi = *((uint32_t *)&query->constraint->value2); - break; - case PDC_INT64: - i64lo = *((int64_t *)&query->constraint->value); - i64hi = *((int64_t *)&query->constraint->value2); - break; - case PDC_UINT64: - ui64lo = *((uint64_t *)&query->constraint->value); - ui64hi = *((uint64_t *)&query->constraint->value2); - break; - default: - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, - __func__); ret_value = FAIL; goto done; } // End switch - */ switch (query->constraint->type) { case PDC_FLOAT: flo = (float)query->constraint->value; @@ -7545,7 +7026,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ ui64hi = (uint64_t)query->constraint->value2; break; default: - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with operator type!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } // End switch @@ -7609,8 +7090,8 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ uint64_t idx_nhits = 0, *idx_coords = NULL, tmp_coord[DIM_MAX]; PDC_query_fastbit_idx(region_elt, query->constraint, &idx_nhits, &idx_coords); if (idx_nhits > region_elt->data_size / unit_size) { - printf("==PDC_SERVER[%d]: %s - idx_nhits = %" PRIu64 " may be too large!\n", - pdc_server_rank_g, __func__, idx_nhits); + LOG_WARNING("==PDC_SERVER[%d]: idx_nhits = %" PRIu64 " may be too large!\n", + pdc_server_rank_g, idx_nhits); } if (idx_nhits > 0) { @@ -7629,8 +7110,8 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ for (j = 0; j < ndim; j++) { tmp = (sel->nhits + iter) * ndim + j; if (tmp > sel->coords_alloc) { - printf("==PDC_SERVER[%d]: %s - coord array overflow %" PRIu64 "/ %" PRIu64 "!\n", - pdc_server_rank_g, __func__, tmp, sel->coords_alloc); + LOG_ERROR("==PDC_SERVER[%d]: - coord array overflow %" PRIu64 "/ %" PRIu64 "!\n", + pdc_server_rank_g, tmp, sel->coords_alloc); } else sel->coords[tmp] = tmp_coord[j] + region_elt->start[j] / unit_size; @@ -7648,7 +7129,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ } // End if use fastbit else { // Load data - printf("==PDC_SERVER[%d]: %s - start loading data!\n", pdc_server_rank_g, __func__); + LOG_INFO("==PDC_SERVER[%d]: start loading data!\n", pdc_server_rank_g); fflush(stdout); PDC_Server_load_query_data(task, query, combine_op); @@ -7785,7 +7266,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ } break; default: - printf("==PDC_SERVER[%d]: %s - error with operator type!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with operator type!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } // End switch @@ -7837,7 +7318,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ if (pdc_server_rank_g == 0 || pdc_server_rank_g == 1) { gettimeofday(&pdc_timer_end1, 0); double rm_dup_time = PDC_get_elapsed_time_double(&pdc_timer_start1, &pdc_timer_end1); - printf("==PDC_SERVER[%d]: remove duplicate time %.4fs\n", pdc_server_rank_g, rm_dup_time); + LOG_INFO("==PDC_SERVER[%d]: remove duplicate time %.4fs\n", pdc_server_rank_g, rm_dup_time); } #endif @@ -7845,10 +7326,10 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_end, 0); double query_eval_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("==PDC_SERVER[%d]: evaluated %d regions of %" PRIu64 ": %" PRIu64 "/ %" PRIu64 - " hits, time %.4fs\n", - pdc_server_rank_g, n_eval_region, query->constraint->obj_id, sel->nhits, task->total_elem, - query_eval_time); + LOG_INFO("==PDC_SERVER[%d]: evaluated %d regions of %" PRIu64 ": %" PRIu64 "/ %" PRIu64 + " hits, time %.4fs\n", + pdc_server_rank_g, n_eval_region, query->constraint->obj_id, sel->nhits, task->total_elem, + query_eval_time); #endif fflush(stdout); @@ -7919,7 +7400,7 @@ attach_cache_storage_region_to_query(pdc_query_t *query) cache_storage_region_t *cache_region_elt; if (NULL == query->constraint) { - printf("==PDC_SERVER[%d]: %s - query->constraint is NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: query->constraint is NULL!\n", pdc_server_rank_g); return FAIL; } @@ -7949,22 +7430,13 @@ attach_local_storage_region_to_query(pdc_query_t *query) pdc_data_server_io_list_t *obj_reg; if (NULL == query->constraint) { - printf("==PDC_SERVER[%d]: %s - query->constraint is NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: query->constraint is NULL!\n", pdc_server_rank_g); return FAIL; } - /* meta = PDC_Server_get_obj_metadata(query->constraint->obj_id); */ - /* if (NULL == meta) { */ - /* printf("==PDC_SERVER[%d]: %s - cannot find metadata %" PRIu64 "!\n", pdc_server_rank_g, __func__, - */ - /* query->constraint->obj_id); */ - /* return FAIL; */ - /* } */ - /* query->constraint->storage_region_list_head = meta->storage_region_list_head; */ - obj_reg = PDC_Server_get_obj_region_query(query->constraint->obj_id); if (obj_reg == NULL) { - printf("==PDC_SERVER[%d]: %s - cannot find region from object!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: cannot find region from object!\n", pdc_server_rank_g); } else query->constraint->storage_region_list_head = obj_reg->region_list_head; @@ -7985,15 +7457,14 @@ PDC_Server_send_nhits_to_server(query_task_t *task) server_id = task->manager; if (server_id >= pdc_server_size_g) { - printf("==PDC_SERVER[%d]: %s - server_id %d invalid!\n", pdc_server_rank_g, __func__, server_id); + LOG_ERROR("==PDC_SERVER[%d]: server_id %d invalid!\n", pdc_server_rank_g, server_id); ret_value = FAIL; goto done; } if (pdc_remote_server_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - pdc_remote_server_info_g is NULL\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: pdc_remote_server_info_g is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8001,8 +7472,7 @@ PDC_Server_send_nhits_to_server(query_task_t *task) if (pdc_remote_server_info_g[server_id].addr_valid == 0) { ret_value = PDC_Server_lookup_server_id(server_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - PDC_Server_lookup failed!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_lookup failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8020,7 +7490,7 @@ PDC_Server_send_nhits_to_server(query_task_t *task) hg_ret = HG_Forward(handle, PDC_check_int_ret_cb, NULL, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8045,13 +7515,13 @@ PDC_Server_send_nhits_to_client(query_task_t *task) client_id = task->client_id; if (client_id >= pdc_client_num_g) { - printf("==PDC_SERVER[%d]: %s - client_id %d invalid!\n", pdc_server_rank_g, __func__, client_id); + LOG_ERROR("==PDC_SERVER[%d]: client_id %d invalid!\n", pdc_server_rank_g, client_id); ret_value = FAIL; goto done; } if (pdc_client_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - pdc_client_info_g is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: pdc_client_info_g is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8059,8 +7529,7 @@ PDC_Server_send_nhits_to_client(query_task_t *task) if (pdc_client_info_g[client_id].addr_valid == 0) { ret_value = PDC_Server_lookup_client(client_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - PDC_Server_lookup_client failed!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_lookup_client failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8076,14 +7545,13 @@ PDC_Server_send_nhits_to_client(query_task_t *task) in.nhits = task->nhits; in.query_id = task->query_id; - printf("==PDC_SERVER[%d]: %s - sending %" PRIu64 " nhits to client!\n", pdc_server_rank_g, __func__, - in.nhits); + LOG_INFO("==PDC_SERVER[%d]: sending %" PRIu64 " nhits to client!\n", pdc_server_rank_g, in.nhits); fflush(stdout); hg_ret = HG_Forward(handle, PDC_check_int_ret_cb, NULL, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8111,7 +7579,7 @@ PDC_recv_nhits(const struct hg_cb_info *callback_info) } if (task_elt == NULL) { - printf("==PDC_SERVER[%d]: %s - Invalid task ID!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Invalid task ID!\n", pdc_server_rank_g); task_elt = query_task_list_head_g; } @@ -8140,13 +7608,13 @@ PDC_Server_send_coords_to_client(query_task_t *task) client_id = task->client_id; if (client_id >= pdc_client_num_g) { - printf("==PDC_SERVER[%d]: %s - client_id %d invalid!\n", pdc_server_rank_g, __func__, client_id); + LOG_ERROR("==PDC_SERVER[%d]: client_id %d invalid!\n", pdc_server_rank_g, client_id); ret_value = FAIL; goto done; } if (pdc_client_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - pdc_client_info_g is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: pdc_client_info_g is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8154,8 +7622,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) if (pdc_client_info_g[client_id].addr_valid == 0) { ret_value = PDC_Server_lookup_client(client_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - PDC_Server_lookup_client failed!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_lookup_client failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8176,10 +7643,8 @@ PDC_Server_send_coords_to_client(query_task_t *task) if (in.cnt > 0) { hg_ret = HG_Bulk_create(hg_class_g, 1, &buf, &buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); - /* printf("==PDC_SERVER[%d]: %s - created bulk handle %p!\n", pdc_server_rank_g, __func__, - * bulk_handle); */ if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -8198,7 +7663,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) hg_ret = HG_Forward(handle, PDC_check_int_ret_cb, NULL, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8225,13 +7690,13 @@ PDC_Server_send_coords_to_server(query_task_t *task) server_id = task->manager; if (server_id >= pdc_server_size_g) { - printf("==PDC_SERVER[%d]: %s - server_id %d invalid!\n", pdc_server_rank_g, __func__, server_id); + LOG_ERROR("==PDC_SERVER[%d]: server_id %d invalid!\n", pdc_server_rank_g, server_id); ret_value = FAIL; goto done; } if (pdc_remote_server_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - pdc_server_info_g is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: pdc_server_info_g is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; @@ -8240,8 +7705,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) if (pdc_remote_server_info_g[server_id].addr_valid == 0) { ret_value = PDC_Server_lookup_server_id(server_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - PDC_Server_lookup_server_id failed!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_lookup_server_id failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8252,7 +7716,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) buf_sizes = task->query->sel->nhits * sizeof(uint64_t) * task->ndim; hg_ret = HG_Bulk_create(hg_class_g, 1, &buf, &buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -8275,7 +7739,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) hg_ret = HG_Forward(handle, PDC_check_int_ret_cb, NULL, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8312,12 +7776,12 @@ coord_to_offset(size_t ndim, uint64_t *coord, uint64_t *start, uint64_t *count, uint64_t off = 0; if (ndim == 0 || coord == NULL || start == NULL || count == NULL) { - printf("==PDC_SERVER[%d]: %s - input NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: input NULL!\n", pdc_server_rank_g); return -1; } if (ndim > 3) { - printf("==PDC_SERVER[%d]: %s - cannot handle dim > 3!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: cannot handle dim > 3!\n", pdc_server_rank_g); return 0; } @@ -8336,7 +7800,7 @@ is_coord_in_region(int ndim, uint64_t *coord, size_t unit_size, region_list_t *r { int i; if (ndim == 0 || coord == NULL || region == NULL) { - printf("==PDC_SERVER[%d]: %s - input NULL!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: input NULL!\n", pdc_server_rank_g); return -1; } @@ -8363,13 +7827,13 @@ PDC_send_data_to_client(int client_id, void *buf, size_t ndim, size_t unit_size, FUNC_ENTER(NULL); if (client_id >= pdc_client_num_g) { - printf("==PDC_SERVER[%d]: %s - client_id %d invalid!\n", pdc_server_rank_g, __func__, client_id); + LOG_ERROR("==PDC_SERVER[%d]: client_id %d invalid!\n", pdc_server_rank_g, client_id); ret_value = FAIL; goto done; } if (pdc_client_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - pdc_client_info_g is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: pdc_client_info_g is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8377,8 +7841,7 @@ PDC_send_data_to_client(int client_id, void *buf, size_t ndim, size_t unit_size, if (pdc_client_info_g[client_id].addr_valid == 0) { ret_value = PDC_Server_lookup_client(client_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - PDC_Server_lookup_client failed!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_lookup_client failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8388,10 +7851,8 @@ PDC_send_data_to_client(int client_id, void *buf, size_t ndim, size_t unit_size, if (buf != NULL && buf_sizes != 0) { hg_ret = HG_Bulk_create(hg_class_g, 1, &buf, &buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); - /* printf("==PDC_SERVER[%d]: %s - created bulk handle %p!\n", pdc_server_rank_g, __func__, - * bulk_handle); */ if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -8413,7 +7874,7 @@ PDC_send_data_to_client(int client_id, void *buf, size_t ndim, size_t unit_size, hg_ret = HG_Forward(handle, PDC_check_int_ret_cb, NULL, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8445,8 +7906,8 @@ PDC_Server_read_coords(const struct hg_cb_info *callback_info) task->my_data = malloc(my_size); if (NULL == task->my_data) { - printf("==PDC_SERVER[%d]: %s - error allocating %" PRIu64 " bytes for data read!\n", - pdc_server_rank_g, __func__, task->my_nread_coords * unit_size); + LOG_ERROR("==PDC_SERVER[%d]: error allocating %" PRIu64 " bytes for data read!\n", + pdc_server_rank_g, task->my_nread_coords * unit_size); goto done; } @@ -8479,8 +7940,8 @@ PDC_Server_read_coords(const struct hg_cb_info *callback_info) // Requested object is not part of query, need to find their storage data and then read from // storage - printf("==PDC_SERVER[%d]: %s - Requested object is not here, need to find its storage data!\n", - pdc_server_rank_g, __func__); + LOG_INFO("==PDC_SERVER[%d]: Requested object is not here, need to find its storage data!\n", + pdc_server_rank_g); goto done; } @@ -8521,12 +7982,12 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) obj_id = bulk_args->obj_id; if (nhits == 0) { - printf("==PDC_SERVER[%d]: %s - received 0 read coords!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: received 0 read coords!\n", pdc_server_rank_g); goto done; } if (nhits * ndim * sizeof(uint64_t) != bulk_args->nbytes) { - printf("==PDC_SERVER[%d]: %s - receive buf size not expected %" PRIu64 " / %zu!\n", - pdc_server_rank_g, __func__, nhits * ndim * sizeof(uint64_t), bulk_args->nbytes); + LOG_ERROR("==PDC_SERVER[%d]: receive buf size not expected %" PRIu64 " / %zu!\n", + pdc_server_rank_g, nhits * ndim * sizeof(uint64_t), bulk_args->nbytes); } ret = HG_Bulk_access(local_bulk_handle, 0, bulk_args->nbytes, HG_BULK_READWRITE, 1, (void **)&buf, @@ -8548,27 +8009,26 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) } if (task_elt == NULL) { - printf("==PDC_SERVER[%d]: %s - Invalid task ID %d!\n", pdc_server_rank_g, __func__, query_id); + LOG_ERROR("==PDC_SERVER[%d]: Invalid task ID %d!\n", pdc_server_rank_g, query_id); goto done; } - fprintf(stderr, "==PDC_SERVER[%d]: received read coords from server %d!\n", pdc_server_rank_g, - origin); + LOG_ERROR("==PDC_SERVER[%d]: received read coords from server %d!\n", pdc_server_rank_g, origin); } // End else done: ret = HG_Bulk_free(local_bulk_handle); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not free HG bulk handle\n"); + LOG_ERROR("Could not free HG bulk handle\n"); return ret; } ret = HG_Respond(bulk_args->handle, PDC_Server_read_coords, task_elt, &out); if (ret != HG_SUCCESS) - fprintf(stderr, "Could not respond\n"); + LOG_ERROR("Could not respond\n"); ret = HG_Destroy(bulk_args->handle); if (ret != HG_SUCCESS) - fprintf(stderr, "Could not destroy handle\n"); + LOG_ERROR("Could not destroy handle\n"); free(bulk_args); return ret; @@ -8606,9 +8066,8 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) if (nhits > 0) { if (nhits * unit_size * ndim != bulk_args->nbytes) { - printf("==PDC_SERVER[%d]: %s - receive size is unexpected %" PRIu64 " / %" PRIu64 "!\n", - pdc_server_rank_g, __func__, (uint64_t)nhits * unit_size * ndim, - (uint64_t)bulk_args->nbytes); + LOG_ERROR("==PDC_SERVER[%d]: receive size is unexpected %" PRIu64 " / %" PRIu64 "!\n", + pdc_server_rank_g, (uint64_t)nhits * unit_size * ndim, (uint64_t)bulk_args->nbytes); } ret = HG_Bulk_access(local_bulk_handle, 0, bulk_args->nbytes, HG_BULK_READWRITE, 1, (void **)&buf, @@ -8666,8 +8125,8 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) task_elt->coords_arr = NULL; } - printf("==PDC_SERVER[%d]: received all %d query results, send to client!\n", pdc_server_rank_g, - task_elt->n_recv); + LOG_INFO("==PDC_SERVER[%d]: received all %d query results, send to client!\n", pdc_server_rank_g, + task_elt->n_recv); PDC_Server_send_coords_to_client(task_elt); } } // End else @@ -8677,18 +8136,18 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) if (nhits > 0) { ret = HG_Bulk_free(local_bulk_handle); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not free HG bulk handle\n"); + LOG_ERROR("Could not free HG bulk handle\n"); return ret; } } ret = HG_Respond(bulk_args->handle, NULL, NULL, &out); if (ret != HG_SUCCESS) - fprintf(stderr, "Could not respond\n"); + LOG_ERROR("Could not respond\n"); ret = HG_Destroy(bulk_args->handle); if (ret != HG_SUCCESS) - fprintf(stderr, "Could not destroy handle\n"); + LOG_ERROR("Could not destroy handle\n"); free(bulk_args); @@ -8709,13 +8168,13 @@ PDC_Server_send_query_result_to_client(query_task_t *task) else if (task->get_op == PDC_QUERY_GET_DATA) { } else { - printf("==PDC_SERVER[%d]: %s - Invalid get_op type!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Invalid get_op type!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - error sending query result to client!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error sending query result to client!\n", pdc_server_rank_g); goto done; } @@ -8731,28 +8190,26 @@ PDC_Server_send_query_result_to_manager(query_task_t *task) if (task->get_op == PDC_QUERY_GET_NHITS) { ret_value = PDC_Server_send_nhits_to_server(task); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - error with PDC_Server_send_nhits_to_server!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with PDC_Server_send_nhits_to_server!\n", pdc_server_rank_g); goto done; } } else if (task->get_op == PDC_QUERY_GET_SEL) { ret_value = PDC_Server_send_coords_to_server(task); if (ret_value != SUCCEED) { - printf("==PDC_SERVER[%d]: %s - error with PDC_Server_send_coords_to_server!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with PDC_Server_send_coords_to_server!\n", pdc_server_rank_g); goto done; } } else { - printf("==PDC_SERVER[%d]: %s - Invalid get_op type!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Invalid get_op type!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } // TODO: free the task_list at close time - printf("==PDC_SERVER[%d]: sent query results to manager %d!\n", pdc_server_rank_g, task->manager); + LOG_ERROR("==PDC_SERVER[%d]: sent query results to manager %d!\n", pdc_server_rank_g, task->manager); done: fflush(stdout); @@ -8789,7 +8246,7 @@ PDC_Server_do_query(query_task_t *task) #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_end, 0); double query_process_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("==PDC_SERVER[%d]: query processing time %.4fs\n", pdc_server_rank_g, query_process_time); + LOG_INFO("==PDC_SERVER[%d]: query processing time %.4fs\n", pdc_server_rank_g, query_process_time); #endif task->is_done = 1; @@ -8807,7 +8264,7 @@ add_storage_region_to_buf(void **in_buf, uint64_t *buf_alloc, uint64_t *buf_off, if (in_buf == NULL || *in_buf == NULL || region == NULL || buf_alloc == NULL || buf_off == NULL || region->storage_location[0] == '\0') { - printf("==PDC_SERVER[%d]: %s - ERROR! NULL input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR! NULL input!\n", pdc_server_rank_g); goto done; } @@ -8922,19 +8379,19 @@ PDC_send_query_metadata_bulk(bulk_rpc_in_t *in, void *buf, uint64_t buf_sizes, i FUNC_ENTER(NULL); if (buf == NULL || buf_sizes == 0 || server_id < 0) { - printf("==PDC_SERVER[%d]: %s - ERROR with input!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR with input!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } if (server_id >= (int32_t)pdc_server_size_g) { - printf("==PDC_SERVER[%d]: %s - server_id %d invalid!\n", pdc_server_rank_g, __func__, server_id); + LOG_ERROR("==PDC_SERVER[%d]: server_id %d invalid!\n", pdc_server_rank_g, server_id); ret_value = FAIL; goto done; } if (pdc_remote_server_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - pdc_server_info_g is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: pdc_server_info_g is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8942,8 +8399,7 @@ PDC_send_query_metadata_bulk(bulk_rpc_in_t *in, void *buf, uint64_t buf_sizes, i if (pdc_remote_server_info_g[server_id].addr_valid == 0) { ret_value = PDC_Server_lookup_server_id(server_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - PDC_Server_lookup_server_id failed!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_lookup_server_id failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -8951,7 +8407,7 @@ PDC_send_query_metadata_bulk(bulk_rpc_in_t *in, void *buf, uint64_t buf_sizes, i hg_ret = HG_Bulk_create(hg_class_g, 1, &buf, &buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -8965,13 +8421,13 @@ PDC_send_query_metadata_bulk(bulk_rpc_in_t *in, void *buf, uint64_t buf_sizes, i goto done; } - printf("==PDC_SERVER[%d]: %s - sending %" PRIu64 " meta to server %d!\n", pdc_server_rank_g, __func__, - in->cnt, server_id); + LOG_INFO("==PDC_SERVER[%d]: sending %" PRIu64 " meta to server %d!\n", pdc_server_rank_g, in->cnt, + server_id); fflush(stdout); hg_ret = HG_Forward(handle, PDC_check_int_ret_cb, NULL, in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -9038,8 +8494,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in if (meta->all_storage_region_distributed == 1) goto done; - printf("==PDC_SERVER[%d]: found metadata for %" PRIu64 ", %d regions!\n", pdc_server_rank_g, obj_id, - count); + LOG_INFO("==PDC_SERVER[%d]: found metadata for %" PRIu64 ", %d regions!\n", pdc_server_rank_g, obj_id, + count); // Need to distribute storage metadata to other servers avg_count = ceil((1.0 * count) / task->n_sent_server); @@ -9072,8 +8528,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in } if (nsent > count) { - printf("==PDC_SERVER[%d]: ERROR sending more storage meta (%d) than expected (%d)!\n", - pdc_server_rank_g, nsent, count); + LOG_ERROR("==PDC_SERVER[%d]: Error sending more storage meta (%d) than expected (%d)!\n", + pdc_server_rank_g, nsent, count); fflush(stdout); } @@ -9115,7 +8571,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in } } // End DL_FOREACH - printf("==PDC_SERVER[%d]: distributed all storage meta of %" PRIu64 "!\n", pdc_server_rank_g, obj_id); + LOG_INFO("==PDC_SERVER[%d]: distributed all storage meta of %" PRIu64 "!\n", pdc_server_rank_g, + obj_id); fflush(stdout); meta->all_storage_region_distributed = 1; @@ -9161,8 +8618,8 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) pdc_int_ret_t out; out.ret = 1; - printf("==PDC_SERVER[%d]: %s - received %d query metadata from %d!\n", pdc_server_rank_g, __func__, - bulk_args->cnt, bulk_args->origin); + LOG_INFO("==PDC_SERVER[%d]: received %d query metadata from %d!\n", pdc_server_rank_g, bulk_args->cnt, + bulk_args->origin); fflush(stdout); // TODO: test @@ -9177,7 +8634,7 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) nregion = bulk_args->cnt; if (nregion <= 0) { - printf("==PDC_SERVER[%d]: %s - ERROR! 0 query metadata received!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR! 0 query metadata received!\n", pdc_server_rank_g); goto done; } ret = HG_Bulk_access(local_bulk_handle, 0, bulk_args->nbytes, HG_BULK_READWRITE, 1, (void **)&buf, @@ -9188,7 +8645,7 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) buf_off = 0; for (i = 0; i < nregion; i++) { if (buf_off > bulk_args->nbytes) { - printf("==PDC_SERVER[%d]: %s - ERROR! buf overflow %d! 1\n", pdc_server_rank_g, __func__, i); + LOG_ERROR("==PDC_SERVER[%d]: ERROR! buf overflow %d! 1\n", pdc_server_rank_g, i); fflush(stdout); } loc_len_ptr = (int *)(buf + buf_off); @@ -9214,7 +8671,7 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) buf_off += sizeof(int); if (buf_off > bulk_args->nbytes) { - printf("==PDC_SERVER[%d]: %s - ERROR! buf overflow %d!2\n", pdc_server_rank_g, __func__, i); + LOG_ERROR("==PDC_SERVER[%d]: ERROR! buf overflow %d!2\n", pdc_server_rank_g, i); fflush(stdout); } @@ -9230,13 +8687,13 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) PDC_copy_hist(regions[i].region_hist, hist_ptr); if (regions[i].region_hist->nbin == 0 || regions[i].region_hist->nbin > 1000) { - printf("==PDC_SERVER[%d]: %s ERROR received hist nbin=%d\n", pdc_server_rank_g, __func__, - regions[i].region_hist->nbin); + LOG_ERROR("==PDC_SERVER[%d]: ERROR received hist nbin=%d\n", pdc_server_rank_g, + regions[i].region_hist->nbin); } } if (buf_off > bulk_args->nbytes) { - printf("==PDC_SERVER[%d]: %s - ERROR! buf overflow %d! 3\n", pdc_server_rank_g, __func__, i); + LOG_ERROR("==PDC_SERVER[%d]: ERROR! buf overflow %d! 3\n", pdc_server_rank_g, i); fflush(stdout); } regions[i].obj_id = bulk_args->obj_id; @@ -9244,7 +8701,7 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) } if (buf_off > bulk_args->nbytes) { - printf("==PDC_SERVER[%d]: %s - ERROR! buf overflow after!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: ERROR! buf overflow after!\n", pdc_server_rank_g); fflush(stdout); } @@ -9283,17 +8740,17 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) done: ret = HG_Bulk_free(local_bulk_handle); if (ret != HG_SUCCESS) { - fprintf(stderr, "Could not free HG bulk handle\n"); + LOG_ERROR("Could not free HG bulk handle\n"); return ret; } ret = HG_Respond(bulk_args->handle, NULL, NULL, &out); if (ret != HG_SUCCESS) - fprintf(stderr, "Could not respond\n"); + LOG_ERROR("Could not respond\n"); ret = HG_Destroy(bulk_args->handle); if (ret != HG_SUCCESS) - fprintf(stderr, "Could not destroy handle\n"); + LOG_ERROR("Could not destroy handle\n"); if (bulk_args->op == PDC_RECV_REGION_DO_READ) return ret; @@ -9332,7 +8789,7 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) query = PDC_deserialize_query(query_xfer); if (NULL == query) { - printf("==PDC_SERVER[%d]: deserialize query FAILED!\n", pdc_server_rank_g); + LOG_ERROR("==PDC_SERVER[%d]: deserialize query FAILED!\n", pdc_server_rank_g); goto done; } @@ -9341,7 +8798,7 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) query->sel->coords_alloc = 8192; query->sel->coords = (uint64_t *)calloc(query->sel->coords_alloc, sizeof(uint64_t)); if (NULL == query->sel->coords) { - printf("==PDC_SERVER[%d]: %s - error with calloc!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: error with calloc!\n", pdc_server_rank_g); goto done; } @@ -9354,7 +8811,7 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) if (task_elt->query_id == query_xfer->query_id) { query_id_exist = 1; new_task = task_elt; - printf("==PDC_SERVER[%d]: %s - query id already exist!\n", pdc_server_rank_g, __func__); + LOG_WARNING("==PDC_SERVER[%d]: query id already exist!\n", pdc_server_rank_g); fflush(stdout); break; } @@ -9377,8 +8834,8 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) new_task->prev_server_id = query_xfer->prev_server_id; if (is_debug_g == 1) { - printf("==PDC_SERVER[%d]: %s - appended new query task %d to list head\n", pdc_server_rank_g, - __func__, new_task->query_id); + LOG_INFO("==PDC_SERVER[%d]: appended new query task %d to list head\n", pdc_server_rank_g, + new_task->query_id); } // find metadata of all queried objects and distribute to other servers @@ -9439,13 +8896,13 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n FUNC_ENTER(NULL); if (server_id >= pdc_server_size_g) { - printf("==PDC_SERVER[%d]: %s - server_id %d invalid!\n", pdc_server_rank_g, __func__, server_id); + LOG_ERROR("==PDC_SERVER[%d]: server_id %d invalid!\n", pdc_server_rank_g, server_id); ret_value = FAIL; goto done; } if (pdc_remote_server_info_g == NULL) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - pdc_server_info_g is NULL\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: pdc_server_info_g is NULL\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -9453,8 +8910,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n if (pdc_remote_server_info_g[server_id].addr_valid == 0) { ret_value = PDC_Server_lookup_server_id(server_id); if (ret_value != SUCCEED) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - PDC_Server_lookup_server_id failed!\n", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: PDC_Server_lookup_server_id failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -9463,11 +8919,8 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n buf = coord; buf_sizes = ncoords * ndim * sizeof(uint64_t); hg_ret = HG_Bulk_create(hg_class_g, 1, &buf, &buf_sizes, HG_BULK_READ_ONLY, &bulk_handle); - /* printf("==PDC_SERVER[%d]: %s - created bulk handle %p!\n", pdc_server_rank_g, __func__, - * bulk_handle); - */ if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not create bulk data handle\n"); + LOG_ERROR("Could not create bulk data handle\n"); ret_value = FAIL; goto done; } @@ -9492,7 +8945,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n hg_ret = HG_Forward(handle, PDC_check_int_ret_cb, NULL, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); ret_value = FAIL; goto done; } @@ -9530,7 +8983,7 @@ PDC_Server_send_query_obj_read_to_all_server(query_task_t *task, uint64_t obj_id hg_ret = HG_Forward(handle, NULL, NULL, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "==PDC_SERVER[%d]: %s - HG_Forward failed!\n", pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: HG_Forward failed!\n", pdc_server_rank_g); HG_Destroy(handle); ret_value = FAIL; goto done; @@ -9567,8 +9020,8 @@ PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) } if (NULL == task) { - printf("==PDC_SERVER[%d]: %s - cannot find task id = %d, obj = %" PRIu64 "\n", pdc_server_rank_g, - __func__, in->query_id, in->obj_id); + LOG_ERROR("==PDC_SERVER[%d]: cannot find task id = %d, obj = %" PRIu64 "\n", pdc_server_rank_g, + in->query_id, in->obj_id); goto done; } coords = task->query->sel->coords; @@ -9592,8 +9045,8 @@ PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) } if (NULL == storage_region_head) { - printf("==PDC_SERVER[%d]: %s - cannot find cached storage region query_id=%d, obj_id=%" PRIu64 "\n", - pdc_server_rank_g, __func__, in->query_id, in->obj_id); + LOG_ERROR("==PDC_SERVER[%d]: cannot find cached storage region query_id=%d, obj_id=%" PRIu64 "\n", + pdc_server_rank_g, in->query_id, in->obj_id); goto done; } @@ -9602,8 +9055,8 @@ PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) my_size = nhits * unit_size; task->my_data = malloc(my_size); if (NULL == task->my_data) { - printf("==PDC_SERVER[%d]: %s - error allocating %" PRIu64 " bytes for data read!\n", - pdc_server_rank_g, __func__, nhits * unit_size); + LOG_ERROR("==PDC_SERVER[%d]: error allocating %" PRIu64 " bytes for data read!\n", pdc_server_rank_g, + nhits * unit_size); goto done; } @@ -9656,16 +9109,15 @@ PDC_Server_recv_get_sel_data(const struct hg_cb_info *callback_info) } if (NULL == task) { - printf("==PDC_SERVER[%d]: %s - cannot find query task id=%d\n", pdc_server_rank_g, __func__, - in->query_id); + LOG_ERROR("==PDC_SERVER[%d]: cannot find query task id=%d\n", pdc_server_rank_g, in->query_id); goto done; } // Find metadata object meta = PDC_Server_get_obj_metadata(in->obj_id); if (NULL == meta) { - printf("==PDC_SERVER[%d]: %s - cannot find metadata object id=%" PRIu64 "\n", pdc_server_rank_g, - __func__, in->obj_id); + LOG_ERROR("==PDC_SERVER[%d]: cannot find metadata object id=%" PRIu64 "\n", pdc_server_rank_g, + in->obj_id); goto done; } diff --git a/src/server/pdc_server_region/pdc_server_region_cache.c b/src/server/pdc_server_region/pdc_server_region_cache.c index c61869d27..f53a2237d 100644 --- a/src/server/pdc_server_region/pdc_server_region_cache.c +++ b/src/server/pdc_server_region/pdc_server_region_cache.c @@ -1,6 +1,7 @@ #include "pdc_client_server_common.h" #include "pdc_server_region_cache.h" #include "pdc_timing.h" +#include "pdc_logger.h" /* #define TANG_DEBUG 1 */ @@ -72,7 +73,7 @@ PDC_region_server_cache_init() MPI_Comm_rank(MPI_COMM_WORLD, &server_rank); #endif if (server_rank == 0) - fprintf(stderr, "==PDC_SERVER[%d]: max cache size: %llu\n", server_rank, maximum_cache_size); + LOG_INFO("==PDC_SERVER[%d]: max cache size: %llu\n", server_rank, maximum_cache_size); obj_cache_list = NULL; obj_cache_list_end = NULL; @@ -422,14 +423,14 @@ PDC_region_cache_register(uint64_t obj_id, int obj_ndim, const uint64_t *obj_dim pdc_obj_cache * obj_cache_iter, *obj_cache = NULL; struct pdc_region_info *region_cache_info; if (obj_ndim != ndim && obj_ndim > 0) { - printf("%s reports obj_ndim != ndim, %d != %d\n", __func__, obj_ndim, ndim); + LOG_INFO("reports obj_ndim != ndim, %d != %d\n", obj_ndim, ndim); return FAIL; } #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: %s for %llu\n", cur_time, PDC_get_rank(), __func__, obj_id); + LOG_DEBUG("%s ==PDC_SERVER[%d]: for %llu\n", cur_time, PDC_get_rank(), obj_id); #endif pthread_mutex_lock(&pdc_obj_cache_list_mutex); @@ -484,7 +485,6 @@ PDC_region_cache_register(uint64_t obj_id, int obj_ndim, const uint64_t *obj_dim } obj_cache->region_cache_size++; - /* printf("checkpoint region_obj_cache_size = %d\n", obj_cache->region_obj_cache_size); */ obj_cache->region_cache_end->region_cache_info = (struct pdc_region_info *)malloc(sizeof(struct pdc_region_info)); region_cache_info = obj_cache->region_cache_end->region_cache_info; @@ -506,14 +506,11 @@ PDC_region_cache_register(uint64_t obj_id, int obj_ndim, const uint64_t *obj_dim gettimeofday(&(obj_cache->timestamp), NULL); if (total_cache_size > maximum_cache_size) { - printf("==PDC_SERVER[%d]: server cache full %.1f / %.1f MB, will flush to storage\n", PDC_get_rank(), - total_cache_size / 1048576.0, maximum_cache_size / 1048576.0); + LOG_INFO("==PDC_SERVER[%d]: server cache full %.1f / %.1f MB, will flush to storage\n", + PDC_get_rank(), total_cache_size / 1048576.0, maximum_cache_size / 1048576.0); PDC_region_cache_flush_all(); } - // printf("created cache region at offset %llu, buf size %llu, unit = %ld, ndim = %ld, obj_id = %llu\n", - // offset[0], buf_size, unit, ndim, (long long unsigned)obj_cache->obj_id); - return 0; } @@ -565,7 +562,7 @@ PDC_transfer_request_data_write_out(uint64_t obj_id, int obj_ndim, const uint64_ #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: enter %s for %llu\n", cur_time, PDC_get_rank(), __func__, obj_id); + LOG_INFO("%s ==PDC_SERVER[%d]: enter for %llu\n", cur_time, PDC_get_rank(), obj_id); #endif pthread_mutex_lock(&pdc_obj_cache_list_mutex); @@ -619,17 +616,11 @@ PDC_transfer_request_data_write_out(uint64_t obj_id, int obj_ndim, const uint64_ pthread_mutex_unlock(&pdc_obj_cache_list_mutex); /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d]: %s after unlock\n", cur_time, PDC_get_rank(), __func__); */ if (!flag) { PDC_region_cache_register(obj_id, obj_ndim, obj_dims, buf, write_size, region_info->offset, region_info->size, region_info->ndim, unit); } - /* else { */ - /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d]: %s write is fully contained with cached region\n", cur_time, - * PDC_get_rank(), __func__); */ - /* } */ // PDC_Server_data_write_out2(obj_id, region_info, buf, unit); #ifdef PDC_TIMING @@ -638,7 +629,7 @@ PDC_transfer_request_data_write_out(uint64_t obj_id, int obj_ndim, const uint64_ #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: leaving %s\n", cur_time, PDC_get_rank(), __func__); + LOG_INFO("%s ==PDC_SERVER[%d]: leaving\n", cur_time, PDC_get_rank()); #endif // done: @@ -735,12 +726,11 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int #endif env_char = getenv("PDC_SERVER_CACHE_NO_FLUSH"); if (env_char && atoi(env_char) != 0) { - fprintf(stderr, "==PDC_SERVER[%d]: flushed disabled\n", PDC_get_rank()); + LOG_ERROR("==PDC_SERVER[%d]: flushed disabled\n", PDC_get_rank()); return 0; } /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d.%d]: enter %s\n", cur_time, PDC_get_rank(), flag, __func__); */ // For 1D case, we can merge regions to minimize the number of POSIX calls. if (obj_cache->ndim == 1 && obj_cache->region_cache_size) { @@ -768,7 +758,6 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int free(obj_regions); // Merge adjacent regions - // printf("checkpoint @ line %d\n", __LINE__); merge_requests(start, end, obj_cache->region_cache_size, buf, &new_start, &new_end, &new_buf, unit, &merged_request_size); free(start); @@ -779,7 +768,6 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int obj_cache->region_cache_size = merged_request_size; region_cache_iter = obj_cache->region_cache; for (i = 0; i < merged_request_size; ++i) { - // printf("new_start = %lu, new_end = %lu\n", new_start[i], new_end[i]); region_cache_info = region_cache_iter->region_cache_info; region_cache_info->offset[0] = new_start[i]; region_cache_info->size[0] = new_end[i] - new_start[i]; @@ -812,10 +800,6 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int // Iterate through all cache regions and use POSIX I/O to write them back to file system. region_cache_iter = obj_cache->region_cache; while (region_cache_iter != NULL) { - /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d.%d]: %s going to write out\n", */ - /* cur_time, PDC_get_rank(), flag, __func__); */ - region_cache_info = region_cache_iter->region_cache_info; PDC_Server_transfer_request_io(obj_id, obj_cache->ndim, obj_cache->dims, region_cache_info, region_cache_info->buf, region_cache_info->unit, 1); @@ -828,8 +812,8 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int if (write_size > 0) { PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d.%d]: %s server flushed %.1f / %.1f MB to storage\n", cur_time, - PDC_get_rank(), flag, __func__, write_size / 1048576.0, total_cache_size / 1048576.0); + LOG_INFO("%s ==PDC_SERVER[%d.%d]: server flushed %.1f / %.1f MB to storage\n", cur_time, + PDC_get_rank(), flag, write_size / 1048576.0, total_cache_size / 1048576.0); } total_cache_size -= write_size; @@ -854,7 +838,6 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int #endif /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d.%d]: leave %s\n", cur_time, PDC_get_rank(), flag, __func__); */ return nflush; } @@ -873,14 +856,13 @@ PDC_region_cache_flush(uint64_t obj_id) obj_cache_iter = obj_cache_iter->next; } if (obj_cache == NULL) { - // printf("server error: flushing object that does not exist\n"); return 1; } #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: %s going to flush\n", cur_time, PDC_get_rank(), __func__); + LOG_INFO("%s ==PDC_SERVER[%d]: going to flush\n", cur_time, PDC_get_rank()); #endif PDC_region_cache_flush_by_pointer(obj_id, obj_cache, 0); @@ -899,7 +881,7 @@ PDC_region_cache_flush_all() #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: %s going to flush\n", cur_time, PDC_get_rank(), __func__); + LOG_INFO("%s ==PDC_SERVER[%d]: going to flush\n", cur_time, PDC_get_rank()); #endif PDC_region_cache_flush_by_pointer(obj_cache_iter->obj_id, obj_cache_iter, 0); @@ -947,11 +929,6 @@ PDC_region_cache_clock_cycle(void *ptr) (current_time.tv_usec - last_cache_activity_timeval_g.tv_usec) / 1000000.0; if (elapsed_time >= pdc_idle_flush_time_g) { - - /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d.1]: %s going to flush with idle time\n", */ - /* cur_time, PDC_get_rank(), __func__); */ - pthread_mutex_lock(&pdc_obj_cache_list_mutex); nflush = PDC_region_cache_flush_by_pointer(obj_cache->obj_id, obj_cache, 1); pthread_mutex_unlock(&pdc_obj_cache_list_mutex); @@ -962,8 +939,8 @@ PDC_region_cache_clock_cycle(void *ptr) if (nflush > 0) { PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d.1]: flushed %d regions to storage, took %.4fs\n", cur_time, - PDC_get_rank(), nflush, elapsed_time); + LOG_INFO("%s ==PDC_SERVER[%d.1]: flushed %d regions to storage, took %.4fs\n", + cur_time, PDC_get_rank(), nflush, elapsed_time); } } else { @@ -971,10 +948,6 @@ PDC_region_cache_clock_cycle(void *ptr) obj_cache_iter = obj_cache_iter->next; pthread_mutex_unlock(&pdc_obj_cache_list_mutex); - /* PDC_get_time_str(cur_time); */ - /* fprintf(stderr, "%s ==PDC_SERVER[%d]: stop flush to allow processing new RPCs\n", */ - /* cur_time,PDC_get_rank()); */ - usleep(300000); break; } @@ -1039,8 +1012,6 @@ PDC_region_fetch(uint64_t obj_id, int obj_ndim, const uint64_t *obj_dims, struct obj_cache_iter = obj_cache_iter->next; } if (obj_cache != NULL) { - // printf("region fetch for obj id %llu\n", obj_cache->obj_id); - // Check if the input region is contained inside any cache region. region_cache_iter = obj_cache->region_cache; while (region_cache_iter != NULL) { @@ -1070,7 +1041,7 @@ PDC_region_fetch(uint64_t obj_id, int obj_ndim, const uint64_t *obj_dims, struct #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: %s going to flush\n", cur_time, PDC_get_rank(), __func__); + LOG_DEBUG("%s ==PDC_SERVER[%d]: going to flush\n", cur_time, PDC_get_rank()); #endif PDC_region_cache_flush_by_pointer(obj_id, obj_cache, 0); diff --git a/src/server/pdc_server_region/pdc_server_region_request_handler.h b/src/server/pdc_server_region/pdc_server_region_request_handler.h index c6f96f6ab..cb2953365 100644 --- a/src/server/pdc_server_region/pdc_server_region_request_handler.h +++ b/src/server/pdc_server_region/pdc_server_region_request_handler.h @@ -11,7 +11,6 @@ transfer_request_all_bulk_transfer_read_cb2(const struct hg_cb_info *info) double end, start; #endif - // printf("entering transfer_request_all_bulk_transfer_read_cb2\n"); pthread_mutex_lock(&transfer_request_status_mutex); for (i = 0; i < local_bulk_args2->request_data.n_objs; ++i) { PDC_finish_request(local_bulk_args2->transfer_request_id[i]); @@ -23,7 +22,6 @@ transfer_request_all_bulk_transfer_read_cb2(const struct hg_cb_info *info) HG_Bulk_free(local_bulk_args2->bulk_handle); HG_Destroy(local_bulk_args2->handle); free(local_bulk_args2); - // printf("finishing transfer_request_all_bulk_transfer_read_cb2\n"); #ifdef PDC_TIMING // transfer_request_inner_read_all_bulk is purely for transferring read data from server to client. @@ -55,7 +53,6 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info) double end; #endif - // printf("entering transfer_request_all_bulk_transfer_read_cb\n"); handle_info = HG_Get_info(local_bulk_args->handle); request_data.n_objs = local_bulk_args->in.n_objs; parse_bulk_data(local_bulk_args->data_buf, &request_data, PDC_READ); @@ -104,11 +101,11 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info) request_data.unit[i], 0); #endif #if 0 - fprintf(stderr, "server read array, offset = %lu, size = %lu:", request_data.remote_offset[i][0], request_data.remote_length[i][0]); uint64_t k; + LOG_ERROR("server read array, offset = %lu, size = %lu:", request_data.remote_offset[i][0], request_data.remote_length[i][0]); uint64_t k; for ( k = 0; k < remote_reg_info->size[0]; ++k ) { - fprintf(stderr, "%d,", *(int*)(ptr + sizeof(int) * k)); + LOG_ERROR("%d,", *(int*)(ptr + sizeof(int) * k)); } - fprintf(stderr, "\n"); + LOG_ERROR("\n"); #endif ptr += mem_size; } @@ -136,9 +133,7 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info) ret = HG_Bulk_create(handle_info->hg_class, 1, &(local_bulk_args2->data_buf), &total_mem_size, HG_BULK_READWRITE, &(local_bulk_args2->bulk_handle)); if (ret != HG_SUCCESS) { - printf("Error at transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info): @ line " - "%d \n", - __LINE__); + LOG_ERROR("Error at transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)\n"); } // This is the actual data transfer. When transfer is finished, we are heading our way to the function @@ -148,9 +143,7 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info) HG_BULK_PUSH, handle_info->addr, local_bulk_args->in.local_bulk_handle, 0, local_bulk_args2->bulk_handle, 0, total_mem_size, HG_OP_ID_IGNORE); if (ret != HG_SUCCESS) { - printf("Error at transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info): @ line " - "%d \n", - __LINE__); + LOG_ERROR("Error at transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)"); } // pointers in request_data are freed in the next call back function free(local_bulk_args->data_buf); @@ -179,7 +172,7 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: enter %s\n", cur_time, PDC_get_rank(), __func__); + LOG_DEBUG("%s ==PDC_SERVER[%d]: enter\n", cur_time, PDC_get_rank()); #endif gettimeofday(&last_cache_activity_timeval_g, NULL); @@ -208,7 +201,7 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: %s before (cache) writing\n", cur_time, PDC_get_rank(), __func__); + LOG_DEBUG("%s ==PDC_SERVER[%d]: before (cache) writing\n", cur_time, PDC_get_rank()); #endif for (i = 0; i < request_data.n_objs; ++i) { @@ -227,11 +220,11 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info) #if 0 uint64_t j; - fprintf(stderr, "server write array, offset = %lu, size = %lu:", request_data.remote_offset[i][0], request_data.remote_length[i][0]); + LOG_ERROR("server write array, offset = %lu, size = %lu:", request_data.remote_offset[i][0], request_data.remote_length[i][0]); for ( j = 0; j < remote_reg_info->size[0]; ++j ) { - fprintf(stderr, "%d,", *(int*)(request_data.data_buf[i] + sizeof(int) * j)); + LOG_ERROR("%d,", *(int*)(request_data.data_buf[i] + sizeof(int) * j)); } - fprintf(stderr, "\n"); + LOG_ERROR("\n"); #endif pthread_mutex_lock(&transfer_request_status_mutex); PDC_finish_request(local_bulk_args->transfer_request_id[i]); @@ -240,7 +233,7 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: %s after (cache) writing\n", cur_time, PDC_get_rank(), __func__); + LOG_DEBUG("%s ==PDC_SERVER[%d]: after (cache) writing\n", cur_time, PDC_get_rank()); #endif #ifndef PDC_SERVER_CACHE @@ -270,7 +263,7 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: leaving %s\n", cur_time, PDC_get_rank(), __func__); + LOG_DEBUG("%s ==PDC_SERVER[%d]: leaving\n", cur_time, PDC_get_rank()); #endif FUNC_LEAVE(ret); @@ -300,8 +293,6 @@ transfer_request_wait_all_bulk_transfer_cb(const struct hg_cb_info *info) transfer_request_id = *((pdcid_t *)ptr); ptr += sizeof(pdcid_t); status = PDC_check_request(transfer_request_id); - // printf("processing transfer_id = %llu, pdc_server_rank = %d\n", (long long - // unsigned)transfer_request_id, get_server_rank()); if (status == PDC_TRANSFER_STATUS_PENDING) { PDC_try_finish_request(transfer_request_id, local_bulk_args->handle, handle_ref, 1); } @@ -310,12 +301,6 @@ transfer_request_wait_all_bulk_transfer_cb(const struct hg_cb_info *info) } } pthread_mutex_unlock(&transfer_request_status_mutex); - /* - - printf("HG_TEST_RPC_CB(transfer_request_wait, handle): exiting the wait function at server side @ - %d\n", - __LINE__); - */ if (fast_return) { free(handle_ref); out.ret = 1; @@ -356,7 +341,7 @@ transfer_request_bulk_transfer_write_cb(const struct hg_cb_info *info) #ifdef TANG_DEBUG char cur_time[64]; PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: enter %s\n", cur_time, PDC_get_rank(), __func__); + LOG_DEBUG("%s ==PDC_SERVER[%d]: enter\n", cur_time, PDC_get_rank()); #endif gettimeofday(&last_cache_activity_timeval_g, NULL); @@ -389,10 +374,6 @@ transfer_request_bulk_transfer_write_cb(const struct hg_cb_info *info) (remote_reg_info->size)[2] = (local_bulk_args->in.remote_region).count_2; obj_dims[2] = (local_bulk_args->in).obj_dim2; } -/* - printf("Server transfer request at write branch, index 1 value = %d\n", - *((int *)(local_bulk_args->data_buf + sizeof(int)))); -*/ #ifdef PDC_SERVER_CACHE PDC_transfer_request_data_write_out(local_bulk_args->in.obj_id, local_bulk_args->in.obj_ndim, obj_dims, remote_reg_info, (void *)local_bulk_args->data_buf, @@ -462,7 +443,6 @@ HG_TEST_RPC_CB(transfer_request_status, handle) FUNC_ENTER(NULL); HG_Get_input(handle, &in); - // printf("entering the status function at server side @ line %d\n", __LINE__); pthread_mutex_lock(&transfer_request_status_mutex); out.status = PDC_check_request(in.transfer_request_id); pthread_mutex_unlock(&transfer_request_status_mutex); @@ -492,11 +472,6 @@ HG_TEST_RPC_CB(transfer_request_wait, handle) #endif HG_Get_input(handle, &in); - /* - printf("HG_TEST_RPC_CB(transfer_request_wait, handle): entering the wait function at server side @ - %d\n", - __LINE__); - */ pthread_mutex_lock(&transfer_request_status_mutex); status = PDC_check_request(in.transfer_request_id); if (status == PDC_TRANSFER_STATUS_PENDING) { @@ -507,11 +482,6 @@ HG_TEST_RPC_CB(transfer_request_wait, handle) fast_return = 1; } pthread_mutex_unlock(&transfer_request_status_mutex); - /* - printf("HG_TEST_RPC_CB(transfer_request_wait, handle): exiting the wait function at server side @ - %d\n", - __LINE__); - */ if (fast_return) { out.ret = 1; ret_value = HG_Respond(handle, NULL, NULL, &out); @@ -597,8 +567,7 @@ HG_TEST_RPC_CB(transfer_request_all, handle) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: enter %s process CLIENT[%d]\n", cur_time, PDC_get_rank(), __func__, - in.client_id); + LOG_DEBUG("%s ==PDC_SERVER[%d]: enter process CLIENT[%d]\n", cur_time, PDC_get_rank(), in.client_id); #endif gettimeofday(&last_cache_activity_timeval_g, NULL); @@ -640,7 +609,7 @@ HG_TEST_RPC_CB(transfer_request_all, handle) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[x]: %s start bulk \n", cur_time, __func__); + LOG_DEBUG("%s ==PDC_SERVER[x]: start bulk \n", cur_time); #endif ret_value = @@ -650,7 +619,7 @@ HG_TEST_RPC_CB(transfer_request_all, handle) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[x]: %s done bulk\n", cur_time, __func__); + LOG_DEBUG("%s ==PDC_SERVER[x]: done bulk\n", cur_time); #endif } else { @@ -682,8 +651,7 @@ HG_TEST_RPC_CB(transfer_request_all, handle) #ifdef TANG_DEBUG PDC_get_time_str(cur_time); - printf("%s ==PDC_SERVER[%d]: leaving %s responded CLIENT[%d]\n", cur_time, PDC_get_rank(), __func__, - in.client_id); + LOG_DEBUG("%s ==PDC_SERVER[%d]: leaving responded CLIENT[%d]\n", cur_time, PDC_get_rank(), in.client_id); #endif fflush(stdout); @@ -698,14 +666,10 @@ transfer_request_metadata_query_bulk_transfer_cb(const struct hg_cb_info *info) transfer_request_metadata_query_out_t out; FUNC_ENTER(NULL); - // printf("transfer_request_metadata_query_bulk_transfer_cb: checkpoint %d\n", __LINE__); out.query_id = transfer_request_metadata_query_parse(local_bulk_args->in.n_objs, (char *)local_bulk_args->data_buf, local_bulk_args->in.is_write, &(out.total_buf_size)); - // printf("transfer_request_metadata_query_bulk_transfer_cb: checkpoint %d\n", __LINE__); free(local_bulk_args->data_buf); - // printf("transfer_request_metadata_query_bulk_transfer_cb: checkpoint %d\n", __LINE__); - out.ret = 1; ret = HG_Respond(local_bulk_args->handle, NULL, NULL, &out); HG_Bulk_free(local_bulk_args->bulk_handle); @@ -733,11 +697,10 @@ HG_TEST_RPC_CB(transfer_request_metadata_query, handle) local_bulk_args->data_buf = malloc(in.total_buf_size); local_bulk_args->in = in; local_bulk_args->handle = handle; - // printf("transfer_request_metadata_query: checkpoint %d\n", __LINE__); ret_value = HG_Bulk_create(info->hg_class, 1, &(local_bulk_args->data_buf), &(in.total_buf_size), HG_BULK_READWRITE, &(local_bulk_args->bulk_handle)); if (ret_value != HG_SUCCESS) { - printf("Error at HG_TEST_RPC_CB(transfer_request, handle): @ line %d \n", __LINE__); + LOG_ERROR("Error at HG_TEST_RPC_CB(transfer_request, handle)\n"); } // This is the actual data transfer. When transfer is finished, we are heading our way to the function @@ -762,8 +725,6 @@ transfer_request_metadata_query2_bulk_transfer_cb(const struct hg_cb_info *info) FUNC_ENTER(NULL); out.ret = 1; - // printf("transfer_request_metadata_query2_bulk_transfer_cb: checkpoint %d, data_buf = %lld\n", __LINE__, - // (long long int)local_bulk_args->data_buf); free(local_bulk_args->data_buf); ret = HG_Respond(local_bulk_args->handle, NULL, NULL, &out); HG_Bulk_free(local_bulk_args->bulk_handle); @@ -792,14 +753,11 @@ HG_TEST_RPC_CB(transfer_request_metadata_query2, handle) local_bulk_args->handle = handle; // Retrieve the data buffer to be sent to client - // printf("transfer_request_metadata_query2: checkpoint %d, total_buf_size = %lu\n", __LINE__, - // in.total_buf_size); transfer_request_metadata_query_lookup_query_buf(in.query_id, (char **)&(local_bulk_args->data_buf)); - // printf("transfer_request_metadata_query2: checkpoint %d\n", __LINE__); ret_value = HG_Bulk_create(info->hg_class, 1, &(local_bulk_args->data_buf), &(in.total_buf_size), HG_BULK_READWRITE, &(local_bulk_args->bulk_handle)); if (ret_value != HG_SUCCESS) { - printf("Error at HG_TEST_RPC_CB(transfer_request, handle): @ line %d \n", __LINE__); + LOG_ERROR("Error at HG_TEST_RPC_CB(transfer_request, handle)\n"); } // This is the actual data transfer. When transfer is finished, we are heading our way to the function @@ -867,11 +825,6 @@ HG_TEST_RPC_CB(transfer_request, handle) #ifdef PDC_TIMING local_bulk_args->start_time = MPI_Wtime(); #endif - /* - printf("server check obj ndim %d, dims [%" PRIu64 ", %" PRIu64 ", %" PRIu64 "]\n", (int)in.obj_ndim, - in.obj_dim0, in.obj_dim1, in.obj_dim2); - */ - // printf("HG_TEST_RPC_CB(transfer_request, handle) checkpoint @ line %d\n", __LINE__); out.ret = 1; ret_value = HG_Respond(handle, NULL, NULL, &out); if (in.access_type == PDC_WRITE) { @@ -879,7 +832,7 @@ HG_TEST_RPC_CB(transfer_request, handle) (const hg_size_t *)&(local_bulk_args->total_mem_size), HG_BULK_READWRITE, &(local_bulk_args->bulk_handle)); if (ret_value != HG_SUCCESS) { - printf("Error at HG_TEST_RPC_CB(transfer_request, handle): @ line %d \n", __LINE__); + LOG_ERROR("Error at HG_TEST_RPC_CB(transfer_request, handle)\n"); } // This is the actual data transfer. When transfer is finished, we are heading our way to the function @@ -918,38 +871,11 @@ HG_TEST_RPC_CB(transfer_request, handle) PDC_Server_transfer_request_io(in.obj_id, in.obj_ndim, obj_dims, remote_reg_info, (void *)local_bulk_args->data_buf, in.remote_unit, 0); #endif - /* - printf("ndim = %d\n", in.obj_ndim); - if (in.obj_ndim == 2) { - printf("offset[0] = %" PRIu64 ", length[0] = %" PRIu64 ", offset[1] = %" PRIu64 ", - length[1] = %" PRIu64 "\n", (remote_reg_info->offset)[0], (remote_reg_info->size)[0], - (remote_reg_info->offset)[1], (remote_reg_info->size)[1]); - } - uint64_t total_data_size = (remote_reg_info->size)[0]; - if (remote_reg_info->ndim >= 2) { - total_data_size *= (remote_reg_info->size)[1]; - } - if (remote_reg_info->ndim >= 3) { - total_data_size *= (remote_reg_info->size)[2]; - } - int *int_ptr = local_bulk_args->data_buf; - uint64_t i; - printf("Read data print out\n"); - for ( i = 0; i < total_data_size; ++i ) { - printf("%d ", int_ptr[i]); - } - printf("\n"); - printf("--------------------\n"); - */ - /* - printf("Server transfer request at read branch index 1 value is %d\n", - *((int *)(local_bulk_args->data_buf + sizeof(int)))); - */ ret_value = HG_Bulk_create(info->hg_class, 1, &(local_bulk_args->data_buf), (const hg_size_t *)&(local_bulk_args->total_mem_size), HG_BULK_READWRITE, &(local_bulk_args->bulk_handle)); if (ret_value != HG_SUCCESS) { - printf("Error at HG_TEST_RPC_CB(transfer_request, handle): @ line %d \n", __LINE__); + LOG_ERROR("Error at HG_TEST_RPC_CB(transfer_request, handle)\n"); } // This is the actual data transfer. When transfer is finished, we are heading our way to the function @@ -960,7 +886,7 @@ HG_TEST_RPC_CB(transfer_request, handle) free(remote_reg_info); } if (ret_value != HG_SUCCESS) { - printf("Error at HG_TEST_RPC_CB(transfer_request, handle): @ line %d \n", __LINE__); + LOG_ERROR("Error at HG_TEST_RPC_CB(transfer_request, handle)\n"); } HG_Free_input(handle, &in); diff --git a/src/server/pdc_server_region/pdc_server_region_transfer.c b/src/server/pdc_server_region/pdc_server_region_transfer.c index 0361178c2..ab9b5b1ee 100644 --- a/src/server/pdc_server_region/pdc_server_region_transfer.c +++ b/src/server/pdc_server_region/pdc_server_region_transfer.c @@ -1,6 +1,8 @@ #include "pdc_client_server_common.h" #include "pdc_server_data.h" #include "pdc_timing.h" +#include "pdc_logger.h" + static int io_by_region_g = 1; int @@ -95,23 +97,13 @@ PDC_finish_request(uint64_t transfer_request_id) ptr->handle_ref[0]--; if (!ptr->handle_ref[0]) { if (ptr->out_type == -1) { - printf("PDC SERVER PDC_finish_request out type unset error %d\n", __LINE__); + LOG_ERROR("PDC SERVER PDC_finish_request out type unset error\n"); } if (ptr->out_type) { - - /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d]: enter %s, out_all ret\n", cur_time, PDC_get_rank(), - * __func__); */ - out_all.ret = 1; ret_value = HG_Respond(ptr->handle, NULL, NULL, &out_all); } else { - - /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d]: enter %s, out ret\n", cur_time, PDC_get_rank(), - * __func__); */ - out.ret = 1; ret_value = HG_Respond(ptr->handle, NULL, NULL, &out); } @@ -257,12 +249,12 @@ PDC_transfer_request_id_register() #define PDC_POSIX_IO(fd, buf, io_size, is_write) \ if (is_write) { \ if (write(fd, buf, io_size) != io_size) { \ - printf("server POSIX write failed\n"); \ + LOG_ERROR("server POSIX write failed\n"); \ } \ } \ else { \ if (read(fd, buf, io_size) != io_size) { \ - printf("server POSIX read failed\n"); \ + LOG_ERROR("server POSIX read failed\n"); \ } \ } @@ -282,7 +274,6 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob FUNC_ENTER(NULL); /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d]: enter %s\n", cur_time, PDC_get_rank(), __func__); */ if (io_by_region_g || obj_ndim == 0) { // PDC_Server_register_obj_region(obj_id); @@ -296,7 +287,7 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob goto done; } if (obj_ndim != (int)region_info->ndim) { - printf("Server I/O error: Obj dim does not match obj dim\n"); + LOG_ERROR("Server I/O error: Obj dim does not match obj dim\n"); goto done; } @@ -314,12 +305,11 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob PDC_get_rank(), PDC_get_rank()); PDC_mkdir(storage_location); - /* fprintf(stderr, "Rank %d, write to offset %llu, size %llu\n", server_rank, region_info->offset[0], + /* LOG_ERROR("Rank %d, write to offset %llu, size %llu\n", server_rank, region_info->offset[0], * region_info->size[0]); */ fd = open(storage_location, O_RDWR | O_CREAT, 0666); if (region_info->ndim == 1) { - // printf("server I/O checkpoint 1D\n"); lseek(fd, region_info->offset[0] * unit, SEEK_SET); io_size = region_info->size[0] * unit; PDC_POSIX_IO(fd, buf, io_size, is_write); @@ -327,20 +317,13 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob else if (region_info->ndim == 2) { // Check we can directly write the contiguous chunk to the file if (region_info->offset[1] == 0 && region_info->size[1] == obj_dims[1]) { - // printf("server I/O checkpoint 2D 1\n"); lseek(fd, region_info->offset[0] * obj_dims[1] * unit, SEEK_SET); io_size = region_info->size[0] * obj_dims[1] * unit; PDC_POSIX_IO(fd, buf, io_size, is_write); } else { - // printf("server I/O checkpoint 2D 2\n"); // We have to write line by line for (i = 0; i < region_info->size[0]; ++i) { - /* - printf("lseek to %lld\n", - (long long int)((i + region_info->offset[0]) * obj_dims[1] + - region_info->offset[1])); - */ lseek(fd, ((i + region_info->offset[0]) * obj_dims[1] + region_info->offset[1]) * unit, SEEK_SET); io_size = region_info->size[1] * unit; @@ -355,11 +338,9 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob region_info->offset[2] == 0 && region_info->size[2] == obj_dims[2]) { lseek(fd, region_info->offset[0] * region_info->size[1] * region_info->size[2] * unit, SEEK_SET); io_size = region_info->size[0] * region_info->size[1] * region_info->size[2] * unit; - // printf("server I/O checkpoint 3D 1\n"); PDC_POSIX_IO(fd, buf, io_size, is_write); } else if (region_info->offset[2] == 0 && region_info->size[2] == obj_dims[2]) { - // printf("server I/O checkpoint 3D 2\n"); // We have to write plane by plane for (i = 0; i < region_info->size[0]; ++i) { lseek(fd, @@ -373,14 +354,6 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob } } else { - /* - printf("server I/O checkpoint 3D 3, obj dims [%" PRIu64 ", %" PRIu64 ", %" PRIu64 - "], region [%" PRIu64 ", %" PRIu64 ", %" PRIu64 "] size [%" PRIu64 ", %" PRIu64 - ", %" PRIu64 "]\n", - obj_dims[0], obj_dims[1], obj_dims[2], region_info->offset[0], - region_info->offset[1], region_info->offset[2], region_info->size[0], region_info->size[1], - region_info->size[2]); - */ // We have to write line by line for (i = 0; i < region_info->size[0]; ++i) { for (j = 0; j < region_info->size[1]; ++j) { @@ -400,7 +373,6 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob done: /* PDC_get_time_str(cur_time); */ - /* printf("%s ==PDC_SERVER[%d]: leave %s\n", cur_time, PDC_get_rank(), __func__); */ fflush(stdout); FUNC_LEAVE(ret_value); @@ -417,26 +389,7 @@ clean_write_bulk_data(transfer_request_all_data *request_data) free(request_data->data_buf); return 0; } -/* -static int -print_bulk_data(transfer_request_all_data *request_data) -{ - int i, j; - uint64_t data_size; - printf("total number of objects: %d\n", request_data->n_objs); - for (i = 0; i < request_data->n_objs; ++i) { - data_size = request_data->remote_length[i][0] * request_data->unit[i]; - for (j = 1; j < request_data->remote_ndim[i]; ++j) { - data_size *= request_data->remote_length[i][j]; - } - printf("----object %d----\n", i); - printf("object dimension: %d\n", request_data->remote_ndim[i]); - printf("object unit: %" PRIu64 "\n", request_data->unit[i]); - } - return 0; -} -*/ int parse_bulk_data(void *buf, transfer_request_all_data *request_data, pdc_access_t access_type) { diff --git a/src/server/pdc_server_region/pdc_server_region_transfer_metadata_query.c b/src/server/pdc_server_region/pdc_server_region_transfer_metadata_query.c index 357bd8424..c4e230961 100644 --- a/src/server/pdc_server_region/pdc_server_region_transfer_metadata_query.c +++ b/src/server/pdc_server_region/pdc_server_region_transfer_metadata_query.c @@ -3,6 +3,7 @@ #include #include #include "pdc_region.h" +#include "pdc_logger.h" typedef struct pdc_region_metadata_pkg { uint64_t * reg_offset; @@ -287,8 +288,8 @@ metadata_query_buf_create(pdc_obj_region_metadata *regions, int size, uint64_t * (sizeof(uint32_t) + sizeof(uint64_t) * regions[i].ndim * 2); } else { - printf("metadata_query_buf_create: Unable to find the object with ID %lu\n", - (long int)regions[i].obj_id); + LOG_ERROR("metadata_query_buf_create: Unable to find the object with ID %lu\n", + (long int)regions[i].obj_id); } } if (!total_data_size) { @@ -303,12 +304,8 @@ metadata_query_buf_create(pdc_obj_region_metadata *regions, int size, uint64_t * query_buf->id = query_id_g; query_id_g++; ptr = query_buf->buf; - // printf("metadata_query_buf_create query_id = %lu, size of buf = %lu, buf address = %lld @ line %d\n", - // query_buf->id, total_data_size, (long long int)query_buf, __LINE__); memcpy(ptr, &transfer_request_counter_total, sizeof(int)); ptr += sizeof(int); - // printf("metadata_query_buf_create transfer_request_counter_total = %d @ %d\n", - // transfer_request_counter_total, __LINE__); // Iterate through all input regions. We fill in the buffer. for (i = 0; i < size; ++i) { temp = metadata_server_objs; @@ -336,8 +333,6 @@ metadata_query_buf_create(pdc_obj_region_metadata *regions, int size, uint64_t * ptr += sizeof(uint64_t) * regions[i].ndim; memcpy(ptr, overlap_size, sizeof(uint64_t) * regions[i].ndim); ptr += sizeof(uint64_t) * regions[i].ndim; - // printf("overlapping offset = %lu, overlapping size = %lu\n", overlap_offset[0], - // overlap_size[0]); } // overlap_size is freed together. free(overlap_offset); @@ -446,11 +441,8 @@ transfer_request_metadata_query_parse(int32_t n_objs, char *buf, uint8_t is_writ unit, data_server_id, region_partition); } } - // printf("transfer_request_metadata_query_parse: checkpoint %d\n", __LINE__); query_id = metadata_query_buf_create(region_metadata, n_objs, total_buf_size_ptr); free(region_metadata); - // printf("transfer_request_metadata_query_parse: checkpoint %d\n", __LINE__); - /* pthread_mutex_unlock(&metadata_query_mutex); */ fflush(stdout); FUNC_LEAVE(query_id); @@ -477,8 +469,7 @@ transfer_request_metadata_reg_append(pdc_region_metadata_pkg *regions, int ndim, memcpy(regions->reg_size, reg_size, sizeof(uint64_t) * ndim); if (region_partition == PDC_REGION_DYNAMIC) { - // printf("transfer_request_metadata_reg_append: checkpoint @ line %d, pdc_server_size = %d, ndim = - // %d\n", __LINE__, pdc_server_size, ndim); + min_bytes = data_server_bytes[0]; min_bytes_server = 0; @@ -494,8 +485,6 @@ transfer_request_metadata_reg_append(pdc_region_metadata_pkg *regions, int ndim, total_reg_size *= reg_size[i]; } data_server_bytes[min_bytes_server] += total_reg_size; - // printf("transfer_request_metadata_reg_append: checkpoint @ line %d, pdc_server_size = %d, ndim = - // %d, data_server_id = %d\n", __LINE__, pdc_server_size, ndim, (int) regions->data_server_id); } else { regions->data_server_id = data_server_id; @@ -514,7 +503,6 @@ transfer_request_metadata_query_append(uint64_t obj_id, int ndim, uint64_t *reg_ pdc_region_metadata_pkg *temp_region_metadata; FUNC_ENTER(NULL); - // printf("transfer_request_metadata_query_append: checkpoint %d\n", __LINE__); temp = metadata_server_objs; while (temp) { if (temp->obj_id == obj_id) { @@ -522,7 +510,6 @@ transfer_request_metadata_query_append(uint64_t obj_id, int ndim, uint64_t *reg_ } temp = temp->next; } - // printf("transfer_request_metadata_query_append: checkpoint %d\n", __LINE__); if (temp == NULL) { temp = (pdc_obj_metadata_pkg *)malloc(sizeof(pdc_obj_metadata_pkg)); if (metadata_server_objs) { @@ -539,20 +526,15 @@ transfer_request_metadata_query_append(uint64_t obj_id, int ndim, uint64_t *reg_ metadata_server_objs_end->obj_id = obj_id; metadata_server_objs_end->ndim = ndim; } - // printf("transfer_request_metadata_query_append: checkpoint %d\n", __LINE__); region_metadata = temp->regions; while (region_metadata) { if (detect_region_contained(reg_offset, reg_size, region_metadata->reg_offset, region_metadata->reg_size, ndim)) { - // printf("%lu, %lu, %lu ,%lu\n", reg_offset[0], reg_size[0], region_metadata->reg_offset[0], - // region_metadata->reg_size[0]); - // printf("---------------transfer_request_metadata_query_append: detected repeated requests\n"); FUNC_LEAVE(region_metadata->data_server_id); } region_metadata = region_metadata->next; } // Reaching this line means that we are creating a new region and append it to the end of the object list. - // printf("transfer_request_metadata_query_append: checkpoint %d\n", __LINE__); temp_region_metadata = (pdc_region_metadata_pkg *)malloc(sizeof(pdc_region_metadata_pkg)); if (temp->regions) { temp->regions_end->next = temp_region_metadata; @@ -564,7 +546,6 @@ transfer_request_metadata_query_append(uint64_t obj_id, int ndim, uint64_t *reg_ } transfer_request_metadata_reg_append(temp_region_metadata, ndim, reg_offset, reg_size, unit, data_server_id, region_partition); - // printf("transfer_request_metadata_query_append: checkpoint %d\n", __LINE__); fflush(stdout); FUNC_LEAVE(temp->regions_end->data_server_id); } diff --git a/src/tests/bdcats.c b/src/tests/bdcats.c index 13c052b24..db5d4b34d 100644 --- a/src/tests/bdcats.c +++ b/src/tests/bdcats.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./bdcats #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./bdcats #particles\n"); } int @@ -79,7 +79,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } x = (float *)malloc(numparticles * sizeof(float)); @@ -99,47 +99,47 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); if (obj_xx == 0) { - printf("Error when open object %s\n", "obj-var-xx"); + LOG_ERROR("Error when open object %s\n", "obj-var-xx"); exit(-1); } obj_yy = PDCobj_open("obj-var-yy", pdc_id); if (obj_yy == 0) { - printf("Error when open object %s\n", "obj-var-yy"); + LOG_ERROR("Error when open object %s\n", "obj-var-yy"); exit(-1); } obj_zz = PDCobj_open("obj-var-zz", pdc_id); if (obj_zz == 0) { - printf("Error when open object %s\n", "obj-var-zz"); + LOG_ERROR("Error when open object %s\n", "obj-var-zz"); exit(-1); } obj_pxx = PDCobj_open("obj-var-pxx", pdc_id); if (obj_pxx == 0) { - printf("Error when open object %s\n", "obj-var-pxx"); + LOG_ERROR("Error when open object %s\n", "obj-var-pxx"); exit(-1); } obj_pyy = PDCobj_open("obj-var-pyy", pdc_id); if (obj_pyy == 0) { - printf("Error when open object %s\n", "obj-var-pyy"); + LOG_ERROR("Error when open object %s\n", "obj-var-pyy"); exit(-1); } obj_pzz = PDCobj_open("obj-var-pzz", pdc_id); if (obj_pzz == 0) { - printf("Error when open object %s\n", "obj-var-pzz"); + LOG_ERROR("Error when open object %s\n", "obj-var-pzz"); exit(-1); } obj_id11 = PDCobj_open("id11", pdc_id); if (obj_id11 == 0) { - printf("Error when open object %s\n", "id11"); + LOG_ERROR("Error when open object %s\n", "id11"); exit(-1); } obj_id22 = PDCobj_open("id22", pdc_id); if (obj_id22 == 0) { - printf("Error when open object %s\n", "id22"); + LOG_ERROR("Error when open object %s\n", "id22"); exit(-1); } @@ -175,249 +175,249 @@ main(int argc, char **argv) transfer_request_x = PDCregion_transfer_create(&x[0], PDC_READ, obj_xx, region_x, region_xx); if (transfer_request_x == 0) { - printf("Array x transfer request creation failed\n"); + LOG_ERROR("Array x transfer request creation failed\n"); return 1; } transfer_request_y = PDCregion_transfer_create(&y[0], PDC_READ, obj_yy, region_y, region_yy); if (transfer_request_y == 0) { - printf("Array y transfer request creation failed\n"); + LOG_ERROR("Array y transfer request creation failed\n"); return 1; } transfer_request_z = PDCregion_transfer_create(&z[0], PDC_READ, obj_zz, region_z, region_zz); if (transfer_request_z == 0) { - printf("Array z transfer request creation failed\n"); + LOG_ERROR("Array z transfer request creation failed\n"); return 1; } transfer_request_px = PDCregion_transfer_create(&px[0], PDC_READ, obj_pxx, region_px, region_pxx); if (transfer_request_px == 0) { - printf("Array px transfer request creation failed\n"); + LOG_ERROR("Array px transfer request creation failed\n"); return 1; } transfer_request_py = PDCregion_transfer_create(&py[0], PDC_READ, obj_pyy, region_py, region_pyy); if (transfer_request_py == 0) { - printf("Array py transfer request creation failed\n"); + LOG_ERROR("Array py transfer request creation failed\n"); return 1; } transfer_request_pz = PDCregion_transfer_create(&pz[0], PDC_READ, obj_pzz, region_pz, region_pzz); if (transfer_request_pz == 0) { - printf("Array pz transfer request creation failed\n"); + LOG_ERROR("Array pz transfer request creation failed\n"); return 1; } transfer_request_id1 = PDCregion_transfer_create(&id1[0], PDC_READ, obj_id11, region_id1, region_id11); if (transfer_request_id1 == 0) { - printf("Array id1 transfer request creation failed\n"); + LOG_ERROR("Array id1 transfer request creation failed\n"); return 1; } transfer_request_id2 = PDCregion_transfer_create(&id2[0], PDC_READ, obj_id22, region_id2, region_id22); if (transfer_request_id2 == 0) { - printf("Array id2 transfer request creation failed\n"); + LOG_ERROR("Array id2 transfer request creation failed\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to start transfer for region_xx\n"); + LOG_ERROR("Failed to start transfer for region_xx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to start transfer for region_yy\n"); + LOG_ERROR("Failed to start transfer for region_yy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to start transfer for region_zz\n"); + LOG_ERROR("Failed to start transfer for region_zz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pxx\n"); + LOG_ERROR("Failed to start transfer for region_pxx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pyy\n"); + LOG_ERROR("Failed to start transfer for region_pyy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pzz\n"); + LOG_ERROR("Failed to start transfer for region_pzz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id11\n"); + LOG_ERROR("Failed to start transfer for region_id11\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id22\n"); + LOG_ERROR("Failed to start transfer for region_id22\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_xx\n"); + LOG_ERROR("Failed to transfer wait for region_xx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_yy\n"); + LOG_ERROR("Failed to transfer wait for region_yy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_zz\n"); + LOG_ERROR("Failed to transfer wait for region_zz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pxx\n"); + LOG_ERROR("Failed to transfer wait for region_pxx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pyy\n"); + LOG_ERROR("Failed to transfer wait for region_pyy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pzz\n"); + LOG_ERROR("Failed to transfer wait for region_pzz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id11\n"); + LOG_ERROR("Failed to transfer wait for region_id11\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id22\n"); + LOG_ERROR("Failed to transfer wait for region_id22\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_x); if (ret != SUCCEED) { - printf("region xx transfer close failed\n"); + LOG_ERROR("region xx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_y); if (ret != SUCCEED) { - printf("region yy transfer close failed\n"); + LOG_ERROR("region yy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_z); if (ret != SUCCEED) { - printf("region zz transfer close failed\n"); + LOG_ERROR("region zz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_px); if (ret != SUCCEED) { - printf("region pxx transfer close failed\n"); + LOG_ERROR("region pxx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_py); if (ret != SUCCEED) { - printf("region pyy transfer close failed\n"); + LOG_ERROR("region pyy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_pz); if (ret != SUCCEED) { - printf("region pzz transfer close failed\n"); + LOG_ERROR("region pzz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id1); if (ret != SUCCEED) { - printf("region id11 transfer close failed\n"); + LOG_ERROR("region id11 transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id2); if (ret != SUCCEED) { - printf("region id22 transfer close failed\n"); + LOG_ERROR("region id22 transfer close failed\n"); return 1; } PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - printf("fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - printf("fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - printf("fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - printf("fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - printf("fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - printf("fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - printf("fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - printf("fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - printf("fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - printf("fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - printf("fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - printf("fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - printf("fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - printf("fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - printf("fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - printf("fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - printf("fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - printf("fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - printf("fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - printf("fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - printf("fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - printf("fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - printf("fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - printf("fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); free(x); free(y); diff --git a/src/tests/bdcats_old.c b/src/tests/bdcats_old.c index b4cdc347b..653dfc631 100644 --- a/src/tests/bdcats_old.c +++ b/src/tests/bdcats_old.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int @@ -75,7 +75,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } x = (float *)malloc(numparticles * sizeof(float)); @@ -95,47 +95,47 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); if (obj_xx == 0) { - printf("Error when open object %s\n", "obj-var-xx"); + LOG_ERROR("Error when open object %s\n", "obj-var-xx"); exit(-1); } obj_yy = PDCobj_open("obj-var-yy", pdc_id); if (obj_yy == 0) { - printf("Error when open object %s\n", "obj-var-yy"); + LOG_ERROR("Error when open object %s\n", "obj-var-yy"); exit(-1); } obj_zz = PDCobj_open("obj-var-zz", pdc_id); if (obj_zz == 0) { - printf("Error when open object %s\n", "obj-var-zz"); + LOG_ERROR("Error when open object %s\n", "obj-var-zz"); exit(-1); } obj_pxx = PDCobj_open("obj-var-pxx", pdc_id); if (obj_pxx == 0) { - printf("Error when open object %s\n", "obj-var-pxx"); + LOG_ERROR("Error when open object %s\n", "obj-var-pxx"); exit(-1); } obj_pyy = PDCobj_open("obj-var-pyy", pdc_id); if (obj_pyy == 0) { - printf("Error when open object %s\n", "obj-var-pyy"); + LOG_ERROR("Error when open object %s\n", "obj-var-pyy"); exit(-1); } obj_pzz = PDCobj_open("obj-var-pzz", pdc_id); if (obj_pzz == 0) { - printf("Error when open object %s\n", "obj-var-pzz"); + LOG_ERROR("Error when open object %s\n", "obj-var-pzz"); exit(-1); } obj_id11 = PDCobj_open("id11", pdc_id); if (obj_id11 == 0) { - printf("Error when open object %s\n", "id11"); + LOG_ERROR("Error when open object %s\n", "id11"); exit(-1); } obj_id22 = PDCobj_open("id22", pdc_id); if (obj_id22 == 0) { - printf("Error when open object %s\n", "id22"); + LOG_ERROR("Error when open object %s\n", "id22"); exit(-1); } @@ -171,212 +171,212 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx, region_xx); if (ret < 0) - printf("Array x PDCbuf_obj_map failed\n"); + LOG_ERROR("Array x PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy, region_yy); if (ret < 0) - printf("Array y PDCbuf_obj_map failed\n"); + LOG_ERROR("Array y PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz, region_zz); if (ret < 0) - printf("Array z PDCbuf_obj_map failed\n"); + LOG_ERROR("Array z PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx, region_pxx); if (ret < 0) - printf("Array px PDCbuf_obj_map failed\n"); + LOG_ERROR("Array px PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy, region_pyy); if (ret < 0) - printf("Array py PDCbuf_obj_map failed\n"); + LOG_ERROR("Array py PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz, region_pzz); if (ret < 0) - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_ERROR("Array pz PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11, region_id11); if (ret < 0) - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id1 PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22, region_id22); if (ret < 0) - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id2 PDCbuf_obj_map failed\n"); ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_zz\n"); + LOG_ERROR("Failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("Failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("Failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("Failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id11\n"); + LOG_ERROR("Failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id22\n"); + LOG_ERROR("Failed to obtain lock for region_id22\n"); ret = PDCreg_release_lock(obj_xx, region_xx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_xx\n"); + LOG_ERROR("Failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy, region_yy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_yy\n"); + LOG_ERROR("Failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz, region_zz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_zz\n"); + LOG_ERROR("Failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pxx\n"); + LOG_ERROR("Failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pyy\n"); + LOG_ERROR("Failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pzz\n"); + LOG_ERROR("Failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11, region_id11, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id11\n"); + LOG_ERROR("Failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22, region_id22, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id22\n"); + LOG_ERROR("Failed to release lock for region_id22\n"); ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) - printf("region xx unmap failed\n"); + LOG_ERROR("region xx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_yy, region_yy); if (ret != SUCCEED) - printf("region yy unmap failed\n"); + LOG_ERROR("region yy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_zz, region_zz); if (ret != SUCCEED) - printf("region zz unmap failed\n"); + LOG_ERROR("region zz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pxx, region_pxx); if (ret != SUCCEED) - printf("region pxx unmap failed\n"); + LOG_ERROR("region pxx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pyy, region_pyy); if (ret != SUCCEED) - printf("region pyy unmap failed\n"); + LOG_ERROR("region pyy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pzz, region_pzz); if (ret != SUCCEED) - printf("region pzz unmap failed\n"); + LOG_ERROR("region pzz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id11, region_id11); if (ret != SUCCEED) - printf("region id11 unmap failed\n"); + LOG_ERROR("region id11 unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id22, region_id22); if (ret != SUCCEED) - printf("region id22 unmap failed\n"); + LOG_ERROR("region id22 unmap failed\n"); PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - printf("fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - printf("fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - printf("fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - printf("fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - printf("fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - printf("fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - printf("fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - printf("fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - printf("fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - printf("fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - printf("fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - printf("fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - printf("fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - printf("fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - printf("fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - printf("fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - printf("fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - printf("fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - printf("fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - printf("fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - printf("fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - printf("fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - printf("fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - printf("fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); free(x); free(y); diff --git a/src/tests/bdcats_v2.c b/src/tests/bdcats_v2.c index 88a78b094..c6c2a83a8 100644 --- a/src/tests/bdcats_v2.c +++ b/src/tests/bdcats_v2.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int @@ -94,47 +94,47 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); if (obj_xx == 0) { - printf("Error when open object %s\n", "obj-var-xx"); + LOG_ERROR("Error when open object %s\n", "obj-var-xx"); exit(-1); } obj_yy = PDCobj_open("obj-var-yy", pdc_id); if (obj_yy == 0) { - printf("Error when open object %s\n", "obj-var-yy"); + LOG_ERROR("Error when open object %s\n", "obj-var-yy"); exit(-1); } obj_zz = PDCobj_open("obj-var-zz", pdc_id); if (obj_zz == 0) { - printf("Error when open object %s\n", "obj-var-zz"); + LOG_ERROR("Error when open object %s\n", "obj-var-zz"); exit(-1); } obj_pxx = PDCobj_open("obj-var-pxx", pdc_id); if (obj_pxx == 0) { - printf("Error when open object %s\n", "obj-var-pxx"); + LOG_ERROR("Error when open object %s\n", "obj-var-pxx"); exit(-1); } obj_pyy = PDCobj_open("obj-var-pyy", pdc_id); if (obj_pyy == 0) { - printf("Error when open object %s\n", "obj-var-pyy"); + LOG_ERROR("Error when open object %s\n", "obj-var-pyy"); exit(-1); } obj_pzz = PDCobj_open("obj-var-pzz", pdc_id); if (obj_pzz == 0) { - printf("Error when open object %s\n", "obj-var-pzz"); + LOG_ERROR("Error when open object %s\n", "obj-var-pzz"); exit(-1); } obj_id11 = PDCobj_open("id11", pdc_id); if (obj_id11 == 0) { - printf("Error when open object %s\n", "id11"); + LOG_ERROR("Error when open object %s\n", "id11"); exit(-1); } obj_id22 = PDCobj_open("id22", pdc_id); if (obj_id22 == 0) { - printf("Error when open object %s\n", "id22"); + LOG_ERROR("Error when open object %s\n", "id22"); exit(-1); } @@ -171,50 +171,50 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx, region_xx); if (ret < 0) - printf("Array x PDCbuf_obj_map failed\n"); + LOG_ERROR("Array x PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &x[0], region_x, obj_xx, region_xx, 1, DECR_STATE, DATA_IN); ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy, region_yy); if (ret < 0) - printf("Array y PDCbuf_obj_map failed\n"); + LOG_ERROR("Array y PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &y[0], region_y, obj_yy, region_yy, 1, DECR_STATE, DATA_IN); ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz, region_zz); if (ret < 0) - printf("Array z PDCbuf_obj_map failed\n"); + LOG_ERROR("Array z PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &z[0], region_z, obj_zz, region_zz, 1, DECR_STATE, DATA_IN); ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx, region_pxx); if (ret < 0) - printf("Array px PDCbuf_obj_map failed\n"); + LOG_ERROR("Array px PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &px[0], region_px, obj_pxx, region_pxx, 1, DECR_STATE, DATA_IN); ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy, region_pyy); if (ret < 0) - printf("Array py PDCbuf_obj_map failed\n"); + LOG_ERROR("Array py PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &py[0], region_py, obj_pyy, region_pyy, 1, DECR_STATE, DATA_IN); ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz, region_pzz); if (ret < 0) - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_ERROR("Array pz PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &pz[0], region_pz, obj_pzz, region_pzz, 1, DECR_STATE, DATA_IN); ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11, region_id11); if (ret < 0) - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id1 PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &id1[0], region_id1, obj_id11, region_id11, 1, DECR_STATE, DATA_IN); ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22, region_id22); if (ret < 0) - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id2 PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", &id2[0], region_id2, obj_id22, region_id22, 1, DECR_STATE, DATA_IN); @@ -226,7 +226,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to map with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to map with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -237,35 +237,35 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_zz\n"); + LOG_ERROR("Failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("Failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("Failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("Failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id11\n"); + LOG_ERROR("Failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id22\n"); + LOG_ERROR("Failed to obtain lock for region_id22\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -275,7 +275,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to lock with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to lock with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -286,35 +286,35 @@ main(int argc, char **argv) ret = PDCreg_release_lock(obj_xx, region_xx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_xx\n"); + LOG_ERROR("Failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy, region_yy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_yy\n"); + LOG_ERROR("Failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz, region_zz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_zz\n"); + LOG_ERROR("Failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pxx\n"); + LOG_ERROR("Failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pyy\n"); + LOG_ERROR("Failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_pzz\n"); + LOG_ERROR("Failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11, region_id11, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id11\n"); + LOG_ERROR("Failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22, region_id22, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for region_id22\n"); + LOG_ERROR("Failed to release lock for region_id22\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -324,7 +324,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to relese lock with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to relese lock with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -334,35 +334,35 @@ main(int argc, char **argv) ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) - printf("region xx unmap failed\n"); + LOG_ERROR("region xx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_yy, region_yy); if (ret != SUCCEED) - printf("region yy unmap failed\n"); + LOG_ERROR("region yy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_zz, region_zz); if (ret != SUCCEED) - printf("region zz unmap failed\n"); + LOG_ERROR("region zz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pxx, region_pxx); if (ret != SUCCEED) - printf("region pxx unmap failed\n"); + LOG_ERROR("region pxx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pyy, region_pyy); if (ret != SUCCEED) - printf("region pyy unmap failed\n"); + LOG_ERROR("region pyy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pzz, region_pzz); if (ret != SUCCEED) - printf("region pzz unmap failed\n"); + LOG_ERROR("region pzz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id11, region_id11); if (ret != SUCCEED) - printf("region id11 unmap failed\n"); + LOG_ERROR("region id11 unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id22, region_id22); if (ret != SUCCEED) - printf("region id22 unmap failed\n"); + LOG_ERROR("region id22 unmap failed\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -372,88 +372,88 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to read data with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to read data with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } if (PDCobj_close(obj_xx) < 0) - printf("fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - printf("fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - printf("fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - printf("fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - printf("fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - printf("fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - printf("fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - printf("fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - printf("fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - printf("fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - printf("fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - printf("fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - printf("fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - printf("fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - printf("fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - printf("fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - printf("fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - printf("fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - printf("fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - printf("fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - printf("fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - printf("fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - printf("fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - printf("fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); free(x); free(y); diff --git a/src/tests/blocked_lock.c b/src/tests/blocked_lock.c index 4bdcb7f79..090b09218 100644 --- a/src/tests/blocked_lock.c +++ b/src/tests/blocked_lock.c @@ -67,17 +67,16 @@ main(int argc, char **argv) // create a pdc pdc_id = PDC_init("pdc"); - /* printf("create a new pdc, pdc id is: %lld\n", pdc); */ // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -92,7 +91,7 @@ main(int argc, char **argv) obj2 = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop2, 0); if (obj2 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } @@ -105,13 +104,11 @@ main(int argc, char **argv) // create a region r1 = PDCregion_create(1, offset, mysize); - // printf("first region id: %lld\n", r1); - r2 = PDCregion_create(1, offset_remote, mysize); - // printf("second region id: %lld\n", r2); - + // LOG_ERROR("First region id: %lld\n", r1); + r2 = PDCregion_create(1, offset_remote, mysize); ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, r1, obj2, r2); if (ret < 0) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); exit(-1); } @@ -119,54 +116,53 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj2, r2, WRITE, NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for r2\n"); + LOG_ERROR("Failed to obtain lock for r2\n"); MPI_Barrier(MPI_COMM_WORLD); for (int i = 0; i < numparticles; i++) { x[i] = uniform_random_number() * x_dim; - // printf("x = %f\n", x[i]); // fflush(stdout); } ret = PDCreg_release_lock(obj2, r2, WRITE); if (ret != SUCCEED) - printf("Failed to release lock for r2\n"); + LOG_ERROR("Failed to release lock for r2\n"); MPI_Barrier(MPI_COMM_WORLD); - printf("done with region release\n"); + LOG_INFO("done with region release\n"); fflush(stdout); if (rank == 0) { - printf("request another lock\n"); + LOG_INFO("request another lock\n"); fflush(stdout); } ret = PDCreg_obtain_lock(obj2, r2, WRITE, BLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for r2\n"); + LOG_ERROR("Failed to obtain lock for r2\n"); if (rank == 0) { - printf("lock is granted\n"); + LOG_INFO("lock is granted\n"); fflush(stdout); } ret = PDCbuf_obj_unmap(obj2, r2); if (ret != SUCCEED) - printf("region unmap failed\n"); + LOG_ERROR("region unmap failed\n"); if (PDCobj_close(obj2) < 0) - printf("fail to close obj2\n"); + LOG_ERROR("Fail to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container\n"); + LOG_ERROR("Fail to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDC_close(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/buf_map_mpi_v2.c b/src/tests/buf_map_mpi_v2.c index 7cbc912f7..ebab67991 100644 --- a/src/tests/buf_map_mpi_v2.c +++ b/src/tests/buf_map_mpi_v2.c @@ -85,12 +85,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -110,7 +110,7 @@ main(int argc, char **argv) obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); #endif if (obj2 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } } @@ -128,7 +128,7 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, r1, obj2, r2); if (ret < 0) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); exit(-1); } @@ -138,7 +138,7 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj2, r2, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for r2\n"); + LOG_ERROR("Failed to obtain lock for r2\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -146,7 +146,7 @@ main(int argc, char **argv) ret = PDCreg_release_lock(obj2, r2, PDC_READ); if (ret != SUCCEED) - printf("Failed to release lock for r2\n"); + LOG_ERROR("Failed to release lock for r2\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -154,25 +154,25 @@ main(int argc, char **argv) ret = PDCbuf_obj_unmap(obj2, r2); if (ret != SUCCEED) - printf("region unmap failed\n"); + LOG_ERROR("region unmap failed\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif if (PDCobj_close(obj2) < 0) - printf("fail to close obj2\n"); + LOG_ERROR("Fail to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container\n"); + LOG_ERROR("Fail to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/buf_obj_map.c b/src/tests/buf_obj_map.c index 9ccfd82fc..e1fbcaf8f 100644 --- a/src/tests/buf_obj_map.c +++ b/src/tests/buf_obj_map.c @@ -56,12 +56,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -82,11 +82,11 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(&myArray1[0], PDC_INT, r1, obj2, r2); if (ret < 0) - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret = PDCreg_obtain_lock(obj2, r2, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region\n"); + LOG_ERROR("Failed to obtain lock for region\n"); // update buffer myArray1[0][0] = 117; @@ -94,31 +94,31 @@ main(int argc, char **argv) ret = PDCreg_release_lock(obj2, r2, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region\n"); + LOG_ERROR("Failed to release lock for region\n"); PDCbuf_obj_unmap(obj2, r2); // close region if (PDCregion_close(r1) < 0) - printf("fail to close region r1\n"); + LOG_ERROR("Fail to close region r1\n"); if (PDCregion_close(r2) < 0) - printf("fail to close region r2\n"); + LOG_ERROR("Fail to close region r2\n"); // close object if (PDCobj_close(obj2) < 0) - printf("fail to close obj2\n"); + LOG_ERROR("Fail to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/buf_obj_map_mpi.c b/src/tests/buf_obj_map_mpi.c index 3de60aabd..81bff7673 100644 --- a/src/tests/buf_obj_map_mpi.c +++ b/src/tests/buf_obj_map_mpi.c @@ -76,12 +76,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -99,7 +99,7 @@ main(int argc, char **argv) obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); #endif if (obj2 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } @@ -116,7 +116,7 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, r1, obj2, r2); if (ret < 0) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); exit(-1); } @@ -126,7 +126,7 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj2, r2, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for r2\n"); + LOG_ERROR("Failed to obtain lock for r2\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -138,7 +138,7 @@ main(int argc, char **argv) ret = PDCreg_release_lock(obj2, r2, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for r2\n"); + LOG_ERROR("Failed to release lock for r2\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -146,25 +146,25 @@ main(int argc, char **argv) ret = PDCbuf_obj_unmap(obj2, r2); if (ret != SUCCEED) - printf("region unmap failed\n"); + LOG_ERROR("region unmap failed\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif if (PDCobj_close(obj2) < 0) - printf("fail to close obj2\n"); + LOG_ERROR("Fail to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container\n"); + LOG_ERROR("Fail to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/client_server.c b/src/tests/client_server.c index f63e659de..a510d004b 100644 --- a/src/tests/client_server.c +++ b/src/tests/client_server.c @@ -48,7 +48,7 @@ PDC_Client_read_server_addr_from_file(char target_addr_string[MAX_SERVER_NUM][PA na_config = fopen(pdc_server_cfg_name, "r"); if (!na_config) { - fprintf(stderr, "Could not open config file from default location: %s\n", pdc_server_cfg_name); + LOG_ERROR("Could not open config file from default location: %s\n", pdc_server_cfg_name); exit(0); } char tmp[PATH_MAX]; @@ -57,7 +57,7 @@ PDC_Client_read_server_addr_from_file(char target_addr_string[MAX_SERVER_NUM][PA p = strrchr(target_addr_string[i], '\n'); if (p != NULL) *p = '\0'; - /* printf("%s", target_addr_string[i]); */ + i++; } fclose(na_config); @@ -69,14 +69,12 @@ PDC_Client_read_server_addr_from_file(char target_addr_string[MAX_SERVER_NUM][PA static hg_return_t client_rpc_cb(const struct hg_cb_info *callback_info) { - /* printf("Entering client_rpc_cb()"); */ struct client_lookup_args *client_lookup_args = (struct client_lookup_args *)callback_info->arg; hg_handle_t handle = callback_info->info.forward.handle; /* Get output from server*/ gen_obj_id_out_t output; HG_Get_output(handle, &output); - /* printf("Return value=%llu\n", output.ret); */ client_lookup_args->obj_id = output.ret; hg_atomic_decr32(&atomic_work_todo_g); @@ -88,7 +86,6 @@ client_rpc_cb(const struct hg_cb_info *callback_info) static hg_return_t client_lookup_cb(const struct hg_cb_info *callback_info) { - /* printf("Entering client_lookup_cb()"); */ hg_return_t hg_ret; struct client_lookup_args *client_lookup_args = (struct client_lookup_args *)callback_info->arg; @@ -103,10 +100,9 @@ client_lookup_cb(const struct hg_cb_info *callback_info) gen_obj_id_in_t in; in.obj_name = client_lookup_args->obj_name; - /* printf("Sending input to target\n"); */ hg_ret = HG_Forward(handle, client_rpc_cb, client_lookup_args, &in); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "client_lookup_cb(): Could not start HG_Forward()\n"); + LOG_ERROR("client_lookup_cb(): Could not start HG_Forward()\n"); return EXIT_FAILURE; } return HG_SUCCESS; @@ -118,17 +114,16 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po char na_info_string[PATH_MAX]; sprintf(na_info_string, "cci+tcp://%d", port); if (!na_info_string) { - fprintf(stderr, HG_PORT_NAME - " environment variable must be set, e.g.:\nMERCURY_PORT_NAME=\"cci+tcp://22222\"\n"); + LOG_ERROR("HG_PORT_NAME + " environment variable must be set, e.g.:\nMERCURY_PORT_NAME=\"cci+tcp://22222\"\n"); exit(0); } - /* printf("NA: %s\n", na_info_string); */ /* Initialize Mercury with the desired network abstraction class */ - printf("Using %s\n", na_info_string); + LOG_INFO("Using %s\n", na_info_string); *hg_class = HG_Init(na_info_string, NA_FALSE); if (*hg_class == NULL) { - printf("Error with HG_Init()\n"); + LOG_ERROR("Error with HG_Init()\n"); return -1; } @@ -151,7 +146,6 @@ PDC_Client_check_response(hg_context_t **hg_context) hg_ret = HG_Trigger(*hg_context, 0 /* timeout */, 1 /* max count */, &actual_count); } while ((hg_ret == HG_SUCCESS) && actual_count); - /* printf("actual_count=%d\n",actual_count); */ /* Do not try to make progress anymore if we're done */ if (hg_atomic_get32(&atomic_work_todo_g) <= 0) break; @@ -172,7 +166,6 @@ send_name_recv_id(struct client_lookup_args *client_lookup_args, char *target_ad // implementation. hg_ret = HG_Addr_lookup(client_lookup_args->hg_context, client_lookup_cb, client_lookup_args, target_addr_string, HG_OP_ID_IGNORE); - /* printf("HG_Addr_lookup() ret=%d\n", hg_ret); */ return hg_ret; } @@ -206,7 +199,7 @@ main(int argc, char **argv) // Init Mercury network connection PDC_Client_mercury_init(&hg_class, &hg_context, port); if (hg_class == NULL || hg_context == NULL) { - printf("Error with Mercury Init, exiting...\n"); + LOG_ERROR("Error with Mercury Init, exiting...\n"); exit(0); } hg_atomic_init32(&atomic_work_todo_g, 0); @@ -228,7 +221,7 @@ main(int argc, char **argv) client_lookup_args[i].obj_id = -1; hg_atomic_incr32(&atomic_work_todo_g); - printf("Target addr:%s\n", target_addr_string[i]); + LOG_INFO("Target addr:%s\n", target_addr_string[i]); send_name_recv_id(&client_lookup_args[i], target_addr_string[i]); } @@ -237,10 +230,10 @@ main(int argc, char **argv) hg_time_get_current(&end_time); elapsed_time = hg_time_subtract(end_time, start_time); elapsed_time_double = hg_time_to_double(elapsed_time); - printf("Total elapsed time for PDC server connection: %.5e s\n", elapsed_time_double); + LOG_INFO("Total elapsed time for PDC server connection: %.5e s\n", elapsed_time_double); for (i = 0; i < n_server; i++) { - printf("\"%s\" obj_id = %d\n", client_lookup_args[i].obj_name, client_lookup_args[i].obj_id); + LOG_INFO("\"%s\" obj_id = %d\n", client_lookup_args[i].obj_name, client_lookup_args[i].obj_id); HG_Addr_free(hg_class, client_lookup_args[i].hg_target_addr); free(test_obj_names[i]); } diff --git a/src/tests/consistency_semantics.c b/src/tests/consistency_semantics.c index 3b11c74d6..798f4fa4a 100644 --- a/src/tests/consistency_semantics.c +++ b/src/tests/consistency_semantics.c @@ -60,40 +60,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -107,20 +107,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -146,19 +146,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -182,71 +182,71 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_add_del.c b/src/tests/cont_add_del.c index de55ff6e7..a13e65782 100644 --- a/src/tests/cont_add_del.c +++ b/src/tests/cont_add_del.c @@ -54,7 +54,7 @@ rand_string(char *str, size_t size) void print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -94,11 +94,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -115,7 +115,7 @@ main(int argc, char **argv) obj_ids = (pdcid_t *)calloc(count, sizeof(pdcid_t)); if (rank == 0) - printf("Creating %d objects per MPI rank\n", count); + LOG_INFO("Creating %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -124,20 +124,20 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create NCONT container for (i = 0; i < NCONT; i++) { sprintf(cont_name, "Cont%d", i); cont[i] = PDCcont_create(cont_name, cont_prop); if (cont[i] <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); PDCprop_set_obj_type(obj_prop, PDC_INT); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -148,7 +148,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } srand(rank + 1); @@ -174,7 +174,7 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop, i / 4 + rank * count); } else { - printf("Unsupported name choice\n"); + LOG_ERROR("Unsupported name choice\n"); goto done; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -182,11 +182,11 @@ main(int argc, char **argv) PDCprop_set_obj_tags(obj_prop, "tag0=1"); if (count < 20) { - printf("[%d] create obj with name %s\n", rank, obj_name); + LOG_INFO("[%d] create obj with name %s\n", rank, obj_name); } obj_ids[i] = PDCobj_create(cont[i % NCONT], obj_name, obj_prop); if (obj_ids[i] <= 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name); exit(-1); } @@ -198,7 +198,7 @@ main(int argc, char **argv) ht_total_end.tv_usec - ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("%10d created ... %.5e s\n", i * size, ht_total_sec); + LOG_INFO("%10d created ... %.5e s\n", i * size, ht_total_sec); fflush(stdout); } #ifdef ENABLE_MPI @@ -215,7 +215,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); + LOG_INFO("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); fflush(stdout); } @@ -229,15 +229,15 @@ main(int argc, char **argv) // close all container for (i = 0; i < NCONT; i++) { if (PDCcont_close(cont[i]) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/cont_del.c b/src/tests/cont_del.c index 3abc1f837..b6120de2e 100644 --- a/src/tests/cont_del.c +++ b/src/tests/cont_del.c @@ -45,56 +45,56 @@ main(int argc, char **argv) sprintf(cont_name, "c%d", rank); // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property create_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (create_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container cont = PDCcont_create(cont_name, create_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } ret = PDCcont_del(cont); if (ret != SUCCEED) { - printf("Fail to delete container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to delete container"); ret_value = 1; } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } - printf("trying to open a deleted container, should fail\n"); + LOG_INFO("Trying to open a deleted container, should fail\n"); cont = PDCcont_open(cont_name, pdc); if (cont > 0) - printf("Error: opened a container that was just deleted @ line %d!\n", __LINE__); + LOG_ERROR("Error: opened a container that was just deleted"); // close a container property if (PDCprop_close(create_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_getid.c b/src/tests/cont_getid.c index 59ed14fb5..c0500e5eb 100644 --- a/src/tests/cont_getid.c +++ b/src/tests/cont_getid.c @@ -48,13 +48,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -63,7 +63,7 @@ main(int argc, char **argv) cont_id2 = PDCcont_open("c1", pdc_id); if (cont_id2 == 0) { - printf("Fail to open container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to open container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -72,25 +72,25 @@ main(int argc, char **argv) cont_id3 = PDCcont_get_id("c1", pdc_id); if (PDCcont_close(cont_id3) < 0) { - printf("fail to close container cont_id3\n"); + LOG_ERROR("Fail to close container cont_id3\n"); ret_value = 1; } // close a container if (PDCcont_close(cont_id) < 0) { - printf("fail to close container cont_id1\n"); + LOG_ERROR("Fail to close container cont_id1\n"); ret_value = 1; } if (PDCcont_close(cont_id2) < 0) { - printf("fail to close container cont_id2\n"); + LOG_ERROR("Fail to close container cont_id2\n"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_info.c b/src/tests/cont_info.c index a24896300..e68a579ba 100644 --- a/src/tests/cont_info.c +++ b/src/tests/cont_info.c @@ -48,12 +48,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -61,30 +61,30 @@ main(int argc, char **argv) cont_id2 = PDCcont_open("c1", pdc_id); if (cont_id2 == 0) - printf("Fail to open container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to open container"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif cont_info = PDCcont_get_info("c1"); if (strcmp(cont_info->name, "c1")) { - printf("container get info with wrong name\n"); + LOG_ERROR("container get info with wrong name\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container cont_id1\n"); + LOG_ERROR("Fail to close container cont_id1\n"); if (PDCcont_close(cont_id2) < 0) - printf("fail to close container cont_id2\n"); + LOG_ERROR("Fail to close container cont_id2\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/cont_iter.c b/src/tests/cont_iter.c index 1af7805fb..9ab9c18b8 100644 --- a/src/tests/cont_iter.c +++ b/src/tests/cont_iter.c @@ -43,42 +43,42 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property create_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (create_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container cont1 = PDCcont_create("c1", create_prop); if (cont1 > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create second container cont2 = PDCcont_create("c2", create_prop); if (cont2 > 0) { - printf("Create a container c2\n"); + LOG_INFO("Create a container c2\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create third container cont3 = PDCcont_create("c3", create_prop); if (cont3 > 0) { - printf("Create a container c3\n"); + LOG_INFO("Create a container c3\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // start container iteration @@ -86,46 +86,46 @@ main(int argc, char **argv) while (!PDCcont_iter_null(ch)) { PDCcont_iter_get_info(ch); - printf("container property id is "); + LOG_INFO("container property id is"); ch = PDCcont_iter_next(ch); } // close cont1 if (PDCcont_close(cont1) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close cont2 if (PDCcont_close(cont2) < 0) { - printf("fail to close container c2\n"); + LOG_ERROR("Fail to close container c2\n"); ret_value = 1; } else { - printf("successfully close container c2\n"); + LOG_INFO("successfully close container c2\n"); } // close cont3 if (PDCcont_close(cont3) < 0) { - printf("fail to close container c3\n"); + LOG_ERROR("Fail to close container c3\n"); ret_value = 1; } else { - printf("successfully close container c3\n"); + LOG_INFO("successfully close container c3\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_iter_mt.c b/src/tests/cont_iter_mt.c index 78d3e9e9b..b56985e2e 100644 --- a/src/tests/cont_iter_mt.c +++ b/src/tests/cont_iter_mt.c @@ -49,9 +49,9 @@ TestThread(void *ThreadArgs) // create a container property pdcid_t create_prop = PDCprop_create(PDC_CONT_CREATE, args->pdcId); if (create_prop > 0) - printf("[%d] Create a container property, id is %llx\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] Create a container property, id is %llx\n", args->ThreadRank, create_prop); else - printf("[%d] Fail to create container property @ line %d!\n", args->ThreadRank, __LINE__); + LOG_ERROR("[%d] Fail to create container property!\n", args->ThreadRank); // create a container pdcid_t cont1 = PDCcont_create("c1", create_prop); @@ -77,36 +77,36 @@ TestThread(void *ThreadArgs) cont_handle *ch = PDCcont_iter_start(args->pdcId); while (!PDCcont_iter_null(ch)) { struct PDC_cont_info *info = PDCcont_iter_get_info(ch); - printf("[%d] container name is: %s\n", args->ThreadRank, info->name); - printf("[%d] container is in pdc %lld\n", args->ThreadRank, info->cont_pt->pdc->local_id); - printf("[%d] container property id is %llx\n", args->ThreadRank, info->cont_pt->cont_prop_id); + LOG_INFO("[%d] container name is: %s\n", args->ThreadRank, info->name); + LOG_INFO("[%d] container is in pdc %lld\n", args->ThreadRank, info->cont_pt->pdc->local_id); + LOG_INFO("[%d] container property id is %llx\n", args->ThreadRank, info->cont_pt->cont_prop_id); ch = PDCcont_iter_next(ch); } // close cont1 if (PDCcont_close(cont1) < 0) - printf("fail to close container %lld\n", cont1); + LOG_ERROR("Fail to close container %lld\n", cont1); else - printf("[%d] successfully close container # %llx\n", args->ThreadRank, cont1); + LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont1); // close cont2 if (PDCcont_close(cont2) < 0) - printf("fail to close container %lld\n", cont2); + LOG_ERROR("Fail to close container %lld\n", cont2); else - printf("[%d] successfully close container # %llx\n", args->ThreadRank, cont2); + LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont2); // close cont3 if (PDCcont_close(cont3) < 0) - printf("fail to close container %lld\n", cont3); + LOG_ERROR("Fail to close container %lld\n", cont3); else - printf("[%d] successfully close container # %llx\n", args->ThreadRank, cont3); + LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont3); // close a container property if (PDCprop_close(create_prop) < 0) - printf("[%d] Fail to close property @ line %d\n", args->ThreadRank, __LINE__); + LOG_ERROR("[%d] Fail to close property\n", args->ThreadRank); else - printf("[%d] Successfully closed container property # %lld\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] Successfully closed container property # %lld\n", args->ThreadRank, create_prop); return NULL; } @@ -135,7 +135,7 @@ main(int argc, char **argv) // create a pdc pdcid_t create_prop; pdcid_t pdc = PDC_init("pdc"); - printf("[MAIN] created a new pdc, pdc id is: %lld\n", pdc); + LOG_INFO("[MAIN] created a new pdc, pdc id is: %lld\n", pdc); /*Create nThreads threads in each process*/ for (i = 0; i < nThreads; i++) { @@ -152,16 +152,16 @@ main(int argc, char **argv) // close pdc if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); else - printf("PDC is closed\n"); + LOG_INFO("PDC is closed\n"); free(args); if (status > 0) { - printf("%d threads exited with an error status\n", status); + LOG_ERROR("%d threads exited with an error status\n", status); } else { - printf("No errors reported\n"); + LOG_INFO("No errors reported\n"); } #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/cont_life.c b/src/tests/cont_life.c index 014ef6be2..fa249a545 100644 --- a/src/tests/cont_life.c +++ b/src/tests/cont_life.c @@ -42,15 +42,15 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property create_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (create_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // print default container lifetime (persistent) @@ -60,10 +60,10 @@ main(int argc, char **argv) // create a container cont = PDCcont_create("c1", create_prop); if (cont > 0) { - printf("Create a container, c1\n"); + LOG_INFO("Create a container, c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // set container lifetime to transient @@ -78,23 +78,23 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_life_mt.c b/src/tests/cont_life_mt.c index ef4fba568..c4982c80a 100644 --- a/src/tests/cont_life_mt.c +++ b/src/tests/cont_life_mt.c @@ -49,53 +49,55 @@ TestThread(void *ThreadArgs) // create a container property pdcid_t create_prop = PDCprop_create(PDC_CONT_CREATE, args->pdcId); if (create_prop > 0) - printf("[%d] Create a container property, id is %llx\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] Create a container property, id is %llx\n", args->ThreadRank, create_prop); else - printf("[%d] Fail to create container property @ line %d!\n", args->ThreadRank, __LINE__); + LOG_ERROR("[%d] Fail to create container property!\n", args->ThreadRank); // print default container lifetime (persistent) struct PDC_cont_prop *prop = PDCcont_prop_get_info(create_prop); if (prop->cont_life == PDC_PERSIST) - printf("[%d] container property (id: %lld) default lifetime is persistent\n", args->ThreadRank, - create_prop); + LOG_INFO("[%d] container property (id: %lld) default lifetime is persistent\n", args->ThreadRank, + create_prop); else - printf("[%d] container property (id: %lld) default lifetime is transient\n", args->ThreadRank, - create_prop); + LOG_INFO("[%d] container property (id: %lld) default lifetime is transient\n", args->ThreadRank, + create_prop); // create a container pdcid_t cont = PDCcont_create("c1", create_prop); if (cont > 0) - printf("[%d] Create a container, id is %lld\n", args->ThreadRank, cont); + LOG_INFO("[%d] Create a container, id is %lld\n", args->ThreadRank, cont); else - printf("[%d] Failed to create container @ line %d!\n", args->ThreadRank, __LINE__); + LOG_ERROR("[%d] Failed to create container!\n", args->ThreadRank); // set container lifetime to transient PDCprop_set_cont_lifetime(create_prop, PDC_TRANSIENT); prop = PDCcont_prop_get_info(create_prop); if (prop->cont_life == PDC_PERSIST) - printf("[%d] container property (id: %lld) lifetime is persistent\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] container property (id: %lld) lifetime is persistent\n", args->ThreadRank, + create_prop); else - printf("[%d] container property (id: %lld) lifetime is transient\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] container property (id: %lld) lifetime is transient\n", args->ThreadRank, create_prop); // set container lifetime to persistent PDCcont_persist(cont); prop = PDCcont_prop_get_info(create_prop); if (prop->cont_life == PDC_PERSIST) - printf("[%d] container property (id: %lld) lifetime is persistent\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] container property (id: %lld) lifetime is persistent\n", args->ThreadRank, + create_prop); else - printf("[%d] container property (id: %lld) lifetime is transient\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] container property (id: %lld) lifetime is transient\n", args->ThreadRank, create_prop); // close a container if (PDCcont_close(cont) < 0) - printf("[%d] failed to close container %lld\n", args->ThreadRank, cont); + LOG_ERROR("[%d] failed to close container %lld\n", args->ThreadRank, cont); else - printf("[%d] successfully closed container # %lld\n", args->ThreadRank, cont); + LOG_INFO("[%d] successfully closed container # %lld\n", args->ThreadRank, cont); // close a container property if (PDCprop_close(create_prop) < 0) - printf("[%d] Fail to close property @ line %d\n", args->ThreadRank, __LINE__); + LOG_ERROR("[%d] Fail to close property\n", args->ThreadRank); else - printf("[%d] successfully closed container property # %lld\n", args->ThreadRank, create_prop); + LOG_INFO("[%d] successfully closed container property # %lld\n", args->ThreadRank, create_prop); return NULL; } @@ -123,7 +125,7 @@ main(int argc, char **argv) // create a pdc pdcid_t create_prop; pdcid_t pdc = PDC_init("pdc"); - printf("[MAIN] created a new pdc, pdc id is: %lld\n", pdc); + LOG_INFO("[MAIN] created a new pdc, pdc id is: %lld\n", pdc); /*Create nThreads threads in each process*/ for (i = 0; i < nThreads; i++) { @@ -140,16 +142,16 @@ main(int argc, char **argv) // close pdc if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); else - printf("PDC is closed\n"); + LOG_INFO("PDC is closed\n"); free(args); if (status > 0) { - printf("%d threads exited with an error status\n", status); + LOG_ERROR("%d threads exited with an error status\n", status); } else { - printf("No errors reported\n"); + LOG_INFO("No errors reported\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/cont_tags.c b/src/tests/cont_tags.c index 41a5acd60..554154b28 100644 --- a/src/tests/cont_tags.c +++ b/src/tests/cont_tags.c @@ -48,110 +48,110 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); return -1; } // create a container cont = PDCcont_create("c1", cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); return -1; } cont2 = PDCcont_create("c2", cont_prop); if (cont > 0) { - printf("Create a container c2\n"); + LOG_INFO("Create a container c2\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); return -1; } ret = PDCcont_put_tag(cont, "some tag", tag_value, PDC_STRING, strlen(tag_value) + 1); if (ret != SUCCEED) { - printf("Put tag failed at container 1\n"); + LOG_ERROR("Put tag failed at container 1\n"); return -1; } ret = PDCcont_put_tag(cont, "some tag 2", tag_value2, PDC_STRING, strlen(tag_value2) + 1); if (ret != SUCCEED) { - printf("Put tag failed at container 1\n"); + LOG_ERROR("Put tag failed at container 1\n"); return -1; } ret = PDCcont_put_tag(cont2, "some tag", tag_value, PDC_STRING, strlen(tag_value) + 1); if (ret != SUCCEED) { - printf("Put tag failed at container 2\n"); + LOG_ERROR("Put tag failed at container 2\n"); return -1; } ret = PDCcont_put_tag(cont2, "some tag 2", tag_value2, PDC_STRING, strlen(tag_value2) + 1); if (ret != SUCCEED) { - printf("Put tag failed at container 2\n"); + LOG_ERROR("Put tag failed at container 2\n"); return -1; } ret = PDCcont_get_tag(cont, "some tag", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at container 1\n"); + LOG_ERROR("Get tag failed at container 1\n"); return -1; } if (strcmp(tag_value, tag_value_ret) != 0) { - printf("Wrong tag value at container 1, expected = [%s], get [%s]\n", tag_value, tag_value_ret); + LOG_ERROR("Wrong tag value at container 1, expected = [%s], get [%s]\n", tag_value, tag_value_ret); return -1; } ret = PDCcont_get_tag(cont, "some tag 2", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at container 1\n"); + LOG_ERROR("Get tag failed at container 1\n"); return -1; } if (strcmp(tag_value2, tag_value_ret) != 0) { - printf("Wrong tag value at container 1, expected = [%s], get [%s]\n", tag_value2, tag_value_ret); + LOG_ERROR("Wrong tag value at container 1, expected = [%s], get [%s]\n", tag_value2, tag_value_ret); return -1; } ret = PDCcont_get_tag(cont2, "some tag", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at container 2\n"); + LOG_ERROR("Get tag failed at container 2\n"); return -1; } if (strcmp(tag_value, tag_value_ret) != 0) { - printf("Wrong tag value at container 2, expected = [%s], get [%s]\n", tag_value, tag_value_ret); + LOG_ERROR("Wrong tag value at container 2, expected = [%s], get [%s]\n", tag_value, tag_value_ret); return -1; } ret = PDCcont_get_tag(cont2, "some tag 2", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at container 2\n"); + LOG_ERROR("Get tag failed at container 2\n"); return -1; } if (strcmp(tag_value2, tag_value_ret) != 0) { - printf("Wrong tag value at container 2, expected = [%s], get [%s]\n", tag_value2, tag_value_ret); + LOG_ERROR("Wrong tag value at container 2, expected = [%s], get [%s]\n", tag_value2, tag_value_ret); return -1; } ret = PDCcont_del_tag(cont2, "some tag 2"); if (ret != SUCCEED) { - printf("Delete tag failed at container 2\n"); + LOG_ERROR("Delete tag failed at container 2\n"); return -1; } else { - printf("successfully deleted a tag from container c2\n"); + LOG_INFO("successfully deleted a tag from container c2\n"); } #ifdef ENABLE_MPI @@ -160,46 +160,46 @@ main(int argc, char **argv) ret = PDCcont_get_tag(cont2, "some tag 2", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at container 2\n"); + LOG_ERROR("Get tag failed at container 2\n"); return -1; } if (tag_value_ret != NULL || value_size != 0) { - printf("Error: got non-empty tag after deletion\n"); + LOG_ERROR("Error: got non-empty tag after deletion\n"); return -1; } else { - printf("verified the tag has been deleted successfully\n"); + LOG_INFO("verified the tag has been deleted successfully\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); return -1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container if (PDCcont_close(cont2) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); return -1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); return -1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return -1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_cont.c b/src/tests/create_cont.c index c4c197501..a6986b005 100644 --- a/src/tests/create_cont.c +++ b/src/tests/create_cont.c @@ -43,45 +43,45 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property create_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (create_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container cont = PDCcont_create("c1", create_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_cont_coll.c b/src/tests/create_cont_coll.c index cee2c264a..0c113eb24 100644 --- a/src/tests/create_cont_coll.c +++ b/src/tests/create_cont_coll.c @@ -43,45 +43,45 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property create_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (create_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container cont = PDCcont_create_col("c1", create_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_obj.c b/src/tests/create_obj.c index b0402bb87..fec4590c9 100644 --- a/src/tests/create_obj.c +++ b/src/tests/create_obj.c @@ -45,91 +45,91 @@ main(int argc, char **argv) #endif pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } // create first object sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // close first object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } // close second object if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_obj_coll.c b/src/tests/create_obj_coll.c index 3255b6af1..084d6acc8 100644 --- a/src/tests/create_obj_coll.c +++ b/src/tests/create_obj_coll.c @@ -43,34 +43,34 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Rank %d Create a container property\n", rank); + LOG_INFO("Rank %d Create a container property\n", rank); } else { - printf("Rank %d Fail to create container property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create container property!\n", rank); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container c1\n", rank); + LOG_INFO("Rank %d Create a container c1\n", rank); } else { - printf("Rank %d Fail to create container @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create container!\n", rank); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Rank %d Create an object property\n", rank); + LOG_INFO("Rank %d Create an object property\n", rank); } else { - printf("Rank %d Fail to create object property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object property!\n", rank); ret_value = 1; } // create first object @@ -81,13 +81,13 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont, obj_name1, obj_prop); #endif if (obj1 > 0) { - printf("Rank %d Create an object o1\n", rank); + LOG_INFO("Rank %d Create an object o1\n", rank); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object!\n", rank); ret_value = 1; } - printf("checkpoint 1 rank %d\n", rank); + LOG_INFO("checkpoint 1 rank %d\n", rank); // create second object sprintf(obj_name2, "o2"); #ifdef ENABLE_MPI @@ -96,102 +96,102 @@ main(int argc, char **argv) obj2 = PDCobj_create(cont, obj_name2, obj_prop); #endif if (obj2 > 0) { - printf("Rank %d Create an object o2\n", rank); + LOG_INFO("Rank %d Create an object o2\n", rank); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object!\n", rank); ret_value = 1; } - printf("checkpoint 2 rank %d\n", rank); + LOG_INFO("checkpoint 2 rank %d\n", rank); // open first object twice open11 = PDCobj_open(obj_name1, pdc); if (open11 == 0) { - printf("Rank %d Fail to open object o1\n", rank); + LOG_ERROR("Rank %d Fail to open object o1\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o1\n", rank); + LOG_INFO("Rank %d Open object o1\n", rank); } open12 = PDCobj_open(obj_name1, pdc); if (open12 == 0) { - printf("Rank %d Fail to open object o1\n", rank); + LOG_ERROR("Rank %d Fail to open object o1\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o1\n", rank); + LOG_INFO("Rank %d Open object o1\n", rank); } // open second object once open21 = PDCobj_open(obj_name2, pdc); if (open21 == 0) { - printf("Rank %d Fail to open object o2\n", rank); + LOG_ERROR("Rank %d Fail to open object o2\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o2\n", rank); + LOG_INFO("Rank %d Open object o2\n", rank); } // close object if (PDCobj_close(obj1) < 0) { - printf("Rank %d fail to close object o1\n", rank); + LOG_ERROR("Rank %d Fail to close object o1\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object o1\n", rank); + LOG_INFO("Rank %d successfully close object o1\n", rank); } if (PDCobj_close(open11) < 0) { - printf("Rank %d fail to close object open11\n", rank); + LOG_ERROR("Rank %d Fail to close object open11\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open11\n", rank); + LOG_INFO("Rank %d successfully close object open11\n", rank); } if (PDCobj_close(open12) < 0) { - printf("Rank %d fail to close object open12\n", rank); + LOG_ERROR("Rank %d Fail to close object open12\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open12\n", rank); + LOG_INFO("Rank %d successfully close object open12\n", rank); } if (PDCobj_close(obj2) < 0) { - printf("Rank %d fail to close object o2\n", rank); + LOG_ERROR("Rank %d Fail to close object o2\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object o2\n", rank); + LOG_INFO("Rank %d successfully close object o2\n", rank); } if (PDCobj_close(open21) < 0) { - printf("Rank %d fail to close object open21\n", rank); + LOG_ERROR("Rank %d Fail to close object open21\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open21\n", rank); + LOG_INFO("Rank %d successfully close object open21\n", rank); } // close a container if (PDCcont_close(cont) < 0) { - printf("Rank %d fail to close container c1\n", rank); + LOG_ERROR("Rank %d Fail to close container c1\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container c1\n", rank); + LOG_INFO("Rank %d successfully close container c1\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d successfully close object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d successfully close container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { - printf("Rank %d fail to close PDC\n", rank); + LOG_ERROR("Rank %d Fail to close PDC\n", rank); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_obj_scale.c b/src/tests/create_obj_scale.c index ebd0d373e..650044778 100644 --- a/src/tests/create_obj_scale.c +++ b/src/tests/create_obj_scale.c @@ -52,7 +52,7 @@ rand_string(char *str, size_t size) void print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -91,11 +91,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", i); + LOG_ERROR("Option -%c requires an argument.\n", i); else if (isprint(i)) - fprintf(stderr, "Unknown option `-%c'.\n", i); + LOG_ERROR("Unknown option `-%c'.\n", i); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", i); + LOG_ERROR("Unknown option character `\\x%x'.\n", i); return 1; default: print_usage(); @@ -116,7 +116,7 @@ main(int argc, char **argv) count /= size; if (rank == 0) - printf("Creating %d objects per MPI rank\n", count); + LOG_INFO("Creating %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -125,12 +125,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create_col("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); char *cont_tags = "cont_tags0=123"; if (rank == 0) { @@ -140,7 +140,7 @@ main(int argc, char **argv) // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); PDCprop_set_obj_type(obj_prop, PDC_INT); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -151,7 +151,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } srand(rank + 1); @@ -177,7 +177,7 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop, i / 4 + rank * count); } else { - printf("Unsupported name choice\n"); + LOG_ERROR("Unsupported name choice\n"); goto done; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -185,11 +185,11 @@ main(int argc, char **argv) PDCprop_set_obj_tags(obj_prop, "tag0=1"); if (count < 20) { - printf("[%d] create obj with name %s\n", rank, obj_name); + LOG_INFO("[%d] create obj with name %s\n", rank, obj_name); } test_obj = PDCobj_create(cont, obj_name, obj_prop); if (test_obj == 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name); exit(-1); } @@ -201,7 +201,7 @@ main(int argc, char **argv) ht_total_end.tv_usec - ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("%10d created ... %.5e s\n", i * size, ht_total_sec); + LOG_INFO("%10d created ... %.5e s\n", i * size, ht_total_sec); fflush(stdout); } #ifdef ENABLE_MPI @@ -218,21 +218,21 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); + LOG_INFO("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); fflush(stdout); } done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/create_prop.c b/src/tests/create_prop.c index 56669feeb..9c7bb1fb6 100644 --- a/src/tests/create_prop.c +++ b/src/tests/create_prop.c @@ -47,53 +47,53 @@ main(int argc, char **argv) // create an object property create_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop1 <= 0) { - printf("Fail to create @ line %d\n", __LINE__); + LOG_ERROR("Fail to create"); ret_value = 1; } // create another object property create_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop2 <= 0) { - printf("Fail to create @ line %d\n", __LINE__); + LOG_ERROR("Fail to create"); ret_value = 1; } if (PDCprop_close(create_prop1) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close first property\n"); + LOG_INFO("successfully close first property\n"); } if (PDCprop_close(create_prop2) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close second property\n"); + LOG_INFO("successfully close second property\n"); } // create a container property create_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (create_prop > 0) { if (type == PDC_CONT_CREATE) - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); else if (type == PDC_OBJ_CREATE) - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create"); ret_value = 1; } // close property if (PDCprop_close(create_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close property\n"); + LOG_INFO("successfully close property\n"); } // close a pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_region.c b/src/tests/create_region.c index 7f2102197..f09158c4d 100644 --- a/src/tests/create_region.c +++ b/src/tests/create_region.c @@ -56,7 +56,7 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); PDCregion_create(3, offset, offset_length); @@ -66,7 +66,7 @@ main(int argc, char **argv) // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart_algo_sim.c index 09c24da66..e3514da27 100644 --- a/src/tests/dart_algo_sim.c +++ b/src/tests/dart_algo_sim.c @@ -312,7 +312,6 @@ gen_random_strings_with_cb(int count, int minlen, int maxlen, int alphabet_size, char chr = (char)((randnum % alphabet_size) + 65); str[i] = chr; } - // printf("generated %s\n", str); result[c] = str; if (insert_cb != NULL && search_cb != NULL) { insert_cb(result[c], prefix_len); @@ -380,7 +379,7 @@ void print_usage() { println("dart_sim.exe " - " "); + " "); } int diff --git a/src/tests/dart_attr_dist_test.c b/src/tests/dart_attr_dist_test.c index d1a6d022d..9295bdfe3 100644 --- a/src/tests/dart_attr_dist_test.c +++ b/src/tests/dart_attr_dist_test.c @@ -141,7 +141,7 @@ main(int argc, char *argv[]) // print array. for (i = 0; i < arr_len; ++i) { - printf("rank %d: %ld\n", rank, attr_2_obj_array[i]); + LOG_INFO("rank %d: %ld\n", rank, attr_2_obj_array[i]); } sprintf(pdc_context_name, "pdc_%d", rank); @@ -149,16 +149,16 @@ main(int argc, char *argv[]) pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); sprintf(pdc_container_name, "c1_%d", rank); pdcid_t cont = PDCcont_create(pdc_container_name, cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -172,7 +172,7 @@ main(int argc, char *argv[]) sprintf(pdc_obj_name, "obj%d", i); obj_ids[i] = PDCobj_create(cont, pdc_obj_name, obj_prop); if (obj_ids[i] <= 0) - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); } else { obj_ids[i] = -1; @@ -185,7 +185,7 @@ main(int argc, char *argv[]) stime = MPI_Wtime(); #endif if (rank == 0) - printf("[Summary] Create %zu objects with %d ranks, time: %.6f\n", total_num_obj, size, total_time); + LOG_INFO("[Summary] Create %zu objects with %d ranks, time: %.6f\n", total_num_obj, size, total_time); // ========== ATTACH TAGS TO OBJECTS ========== stopwatch_t timer_obj; stopwatch_t timer_dart; @@ -222,7 +222,7 @@ main(int argc, char *argv[]) // attach attribute to object timer_start(&timer_obj); if (PDCobj_put_tag(obj_ids[j], key, (void *)&val, PDC_INT, sizeof(int)) < 0) - printf("fail to add a kvtag to o%d\n", j); + LOG_ERROR("Fail to add a kvtag to o%d\n", j); timer_pause(&timer_obj); duration_obj_ms += (double)timer_delta_ms(&timer_obj); } @@ -231,8 +231,8 @@ main(int argc, char *argv[]) if (j % num_object_per_pct == 0) pct += 1; if (rank == 0 && j % num_object_per_ton_thousand == 0) { - printf("[Client_Side_Insert] %d\%: Insert '%s=%s' for %llu objs within %.4f ms\n", pct, key, - value, j, duration_obj_ms); + LOG_INFO("[Client_Side_Insert] %d\%: Insert '%s=%s' for %llu objs within %.4f ms\n", pct, + key, value, j, duration_obj_ms); } } } @@ -244,8 +244,8 @@ main(int argc, char *argv[]) #endif if (rank == 0) - printf("[Summary] Inserted %d attributes for %zu objects with %d ranks, obj time: %.6f\n", - total_num_attr, total_num_obj, size, total_time); + LOG_INFO("[Summary] Inserted %d attributes for %zu objects with %d ranks, obj time: %.6f\n", + total_num_attr, total_num_obj, size, total_time); // ========== INSERT OBJECT REFERENCE INTO DART ========== dart_object_ref_type_t ref_type = REF_PRIMARY_ID; dart_hash_algo_t hash_algo = DART_HASH; @@ -269,9 +269,9 @@ main(int argc, char *argv[]) if (j % num_object_per_pct == 0) pct += 1; if (rank == 0 && j % num_object_per_ton_thousand == 0) { - printf("[Client_Side_Insert] %d\%: Insert '%s=%s' for %llu objs, index time " - "%.4f ms\n", - pct, key, value, j, duration_dart_ms); + LOG_INFO("[Client_Side_Insert] %d\%: Insert '%s=%s' for %llu objs, index time " + "%.4f ms\n", + pct, key, value, j, duration_dart_ms); } } } @@ -281,9 +281,9 @@ main(int argc, char *argv[]) stime = MPI_Wtime(); #endif if (rank == 0) - printf("[Summary] Inserted %d attributes for %zu objects with %d ranks, dart time: " - "%.6f\n", - total_num_attr, total_num_obj, size, total_time); + LOG_INFO("[Summary] Inserted %d attributes for %zu objects with %d ranks, dart time: " + "%.6f\n", + total_num_attr, total_num_obj, size, total_time); // ========== EXACT QUERY with Naive Approach ========== pdc_kvtag_t kvtag; duration_obj_ms = 0.0; @@ -305,7 +305,7 @@ main(int argc, char *argv[]) // naive query methods if (PDC_Client_query_kvtag(&kvtag, &rest_count1, &out1) < 0) { - printf("fail to query kvtag\n"); + LOG_ERROR("Fail to query kvtag\n"); break; } } @@ -323,8 +323,8 @@ main(int argc, char *argv[]) #endif if (rank == 0) - printf("[Summary] Exact query %d attributes for %zu objects with %d ranks, obj time: %.6f\n", - total_num_attr, total_num_obj, size, total_time); + LOG_INFO("[Summary] Exact query %d attributes for %zu objects with %d ranks, obj time: %.6f\n", + total_num_attr, total_num_obj, size, total_time); // ========== EXACT QUERY with DART ========== duration_obj_ms = 0.0; duration_dart_ms = 0.0; @@ -356,18 +356,18 @@ main(int argc, char *argv[]) #endif if (rank == 0) - printf("[Summary] Exact query %d attributes for %zu objects with %d ranks, dart " - "time: %.6f ms\n", - total_num_attr, total_num_obj, size, total_time); + LOG_INFO("[Summary] Exact query %d attributes for %zu objects with %d ranks, dart " + "time: %.6f ms\n", + total_num_attr, total_num_obj, size, total_time); if (PDCcont_close(cont) < 0) - printf("fail to close container %lld\n", cont); + LOG_ERROR("Fail to close container %lld\n", cont); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); // free attr_2_obj_array free(attr_2_obj_array); diff --git a/src/tests/dart_func_test.c b/src/tests/dart_func_test.c index 14d829b0f..a884c5ec3 100644 --- a/src/tests/dart_func_test.c +++ b/src/tests/dart_func_test.c @@ -37,15 +37,15 @@ main(int argc, char **argv) pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); dart_object_ref_type_t ref_type = REF_PRIMARY_ID; dart_hash_algo_t hash_algo = DART_HASH; @@ -94,13 +94,13 @@ main(int argc, char **argv) // done: if (PDCcont_close(cont) < 0) - printf("fail to close container %lld\n", cont); + LOG_ERROR("Fail to close container %lld\n", cont); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); // } #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index 47401e5bb..50ab98cd3 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -63,7 +63,7 @@ read_words_from_text(const char *fileName, int *word_count, int *total_word_coun int max_line_len = 512; char **words = (char **)malloc(sizeof(char *) * lines_allocated); if (words == NULL) { - fprintf(stderr, "Out of memory\n"); + LOG_ERROR("Out of memory\n"); exit(1); } int i; @@ -90,7 +90,7 @@ read_words_from_text(const char *fileName, int *word_count, int *total_word_coun new_size = lines_allocated * 2; char **new_wordlist_ptr = (char **)realloc(words, sizeof(char *) * new_size); if (new_wordlist_ptr == NULL) { - fprintf(stderr, "Out of memory\n"); + LOG_ERROR("Out of memory\n"); exit(3); } words = new_wordlist_ptr; @@ -98,7 +98,7 @@ read_words_from_text(const char *fileName, int *word_count, int *total_word_coun } words[line_count] = (char *)malloc(sizeof(char) * max_line_len); if (words[line_count] == NULL) { - fprintf(stderr, "out of memory\n"); + LOG_ERROR("out of memory\n"); exit(4); } if (fgets(words[line_count], max_line_len - 1, file) == NULL) { @@ -186,15 +186,15 @@ main(int argc, char **argv) pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); DART *dart_g = get_dart_g(); dart_g->replication_factor = replication_factor; @@ -590,13 +590,13 @@ main(int argc, char **argv) // done: if (PDCcont_close(cont) < 0) - printf("fail to close container %lld\n", cont); + LOG_ERROR("Fail to close container %lld\n", cont); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_rw_test.c b/src/tests/data_rw_test.c index 1bcc0a45d..b9baa731f 100644 --- a/src/tests/data_rw_test.c +++ b/src/tests/data_rw_test.c @@ -17,7 +17,7 @@ pdcid_t cont_prop; void print_usage() { - printf("Usage: srun -n ./data_rw_test\n"); + LOG_JUST_PRINT("Usage: srun -n ./data_rw_test\n"); } pdcid_t @@ -27,7 +27,7 @@ create_obj(char *obj_name, uint32_t ndim, uint64_t *dims) pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); PDCprop_set_obj_dims(obj_prop, ndim, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -39,7 +39,7 @@ create_obj(char *obj_name, uint32_t ndim, uint64_t *dims) if (rank == 0) { obj_id = PDCobj_create(cont, obj_name, obj_prop); if (obj_id <= 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name); exit(-1); } } @@ -55,21 +55,21 @@ print_data(int ndim, uint64_t *start, uint64_t *count, void *data) if (ndim == 1) { data_1d = (char *)data; - printf("[%.*s]\n", (int)count[0], data_1d + start[0]); + LOG_JUST_PRINT("[%.*s]\n", (int)count[0], data_1d + start[0]); } else if (ndim == 2) { data_2d = (char **)data; for (j = 0; j < count[1]; j++) { - printf("[%.*s]\n", (int)count[0], data_2d[j + start[1]] + start[0]); + LOG_JUST_PRINT("[%.*s]\n", (int)count[0], data_2d[j + start[1]] + start[0]); } } else if (ndim == 3) { data_3d = (char ***)data; for (i = 0; i < count[2]; i++) { for (j = 0; j < count[1]; j++) { - printf("[%.*s]\n", (int)count[0], data_3d[i + start[2]][j + start[1]] + start[0]); + LOG_JUST_PRINT("[%.*s]\n", (int)count[0], data_3d[i + start[2]][j + start[1]] + start[0]); } - printf("\n"); + LOG_JUST_PRINT("\n"); } } return 1; @@ -87,8 +87,8 @@ data_verify(int ndim, uint64_t *start, uint64_t *count, void *data, uint64_t *tr truth_data_1d = (char *)truth_data; for (k = 0; k < count[0]; k++) { if (data_1d[k + start[0]] != truth_data_1d[k + truth_start[0]]) { - printf("(%" PRIu64 ") %c / %c\n", k, data_1d[k + start[0]], - truth_data_1d[k + truth_start[0]]); + LOG_JUST_PRINT("(%" PRIu64 ") %c / %c\n", k, data_1d[k + start[0]], + truth_data_1d[k + truth_start[0]]); return -1; } } @@ -100,8 +100,9 @@ data_verify(int ndim, uint64_t *start, uint64_t *count, void *data, uint64_t *tr for (k = 0; k < count[0]; k++) { if (data_2d[j + start[1]][k + start[0]] != truth_data_2d[j + truth_start[1]][k + truth_start[0]]) { - printf("(%" PRIu64 ", %" PRIu64 ") %c / %c\n", j, k, data_2d[j + start[1]][k + start[0]], - truth_data_2d[j + truth_start[1]][k + truth_start[0]]); + LOG_JUST_PRINT("(%" PRIu64 ", %" PRIu64 ") %c / %c\n", j, k, + data_2d[j + start[1]][k + start[0]], + truth_data_2d[j + truth_start[1]][k + truth_start[0]]); return -1; } } @@ -115,9 +116,10 @@ data_verify(int ndim, uint64_t *start, uint64_t *count, void *data, uint64_t *tr for (k = 0; k < count[0]; k++) { if (data_3d[i + start[2]][j + start[1]][k + start[0]] != truth_data_3d[i + truth_start[2]][j + truth_start[1]][k + truth_start[0]]) { - printf("(%" PRIu64 ", %" PRIu64 ", %" PRIu64 ") %c / %c\n", i, j, k, - data_3d[i + start[2]][j + start[1]][k + start[0]], - truth_data_3d[i + truth_start[2]][j + truth_start[1]][k + truth_start[0]]); + LOG_JUST_PRINT( + "(%" PRIu64 ", %" PRIu64 ", %" PRIu64 ") %c / %c\n", i, j, k, + data_3d[i + start[2]][j + start[1]][k + start[0]], + truth_data_3d[i + truth_start[2]][j + truth_start[1]][k + truth_start[0]]); return -1; } } @@ -150,7 +152,7 @@ test1d(char *obj_name) dims[2] = 0; obj_id = create_obj(obj_name, ndim, dims); if (obj_id == 0) { - printf("[%d]: Error creating an object [%s]\n", rank, obj_name); + LOG_ERROR("[%d]: Error creating an object [%s]\n", rank, obj_name); exit(-1); } @@ -161,7 +163,7 @@ test1d(char *obj_name) // Query the created object PDC_Client_query_metadata_name_timestep(obj_name, 0, &metadata); if (metadata == NULL) { - printf("Error getting metadata from server!\n"); + LOG_ERROR("Error getting metadata from server!\n"); exit(-1); } @@ -230,7 +232,7 @@ test1d(char *obj_name) is_correct = data_verify(ndim, data_start, read_region.size, read_data, data_offset_real, data); if (is_correct != 1) - printf("proc %d: verification failed!\n", rank); + LOG_ERROR("proc %d: verification failed!\n", rank); is_all_correct = is_correct; #ifdef ENABLE_MPI @@ -239,11 +241,11 @@ test1d(char *obj_name) #endif if (rank == 0) { - printf("1D data verfication ..."); + LOG_INFO("1D data verfication ..."); if (is_all_correct != size) - printf("FAILED!\n"); + LOG_ERROR("FAILED!\n"); else - printf("SUCCEED!\n"); + LOG_INFO("succeED!\n"); } free(data); @@ -274,7 +276,7 @@ test2d(char *obj_name) obj_id = create_obj(obj_name, ndim, prob_domain); if (obj_id == 0) { - printf("[%d]: Error creating an object [%s]\n", rank, obj_name); + LOG_ERROR("[%d]: Error creating an object [%s]\n", rank, obj_name); exit(-1); } @@ -285,7 +287,7 @@ test2d(char *obj_name) // Query the created object PDC_Client_query_metadata_name_timestep(obj_name, 0, &metadata); if (metadata == NULL) { - printf("Error getting metadata from server!\n"); + LOG_ERROR("Error getting metadata from server!\n"); exit(-1); } @@ -408,7 +410,7 @@ test2d(char *obj_name) is_correct = data_verify(ndim, data_start, read_region.size, read_data_2d, data_offset_real, data_2d); if (is_correct != 1) - printf("proc %d: verification failed!\n", rank); + LOG_ERROR("proc %d: verification failed!\n", rank); is_all_correct = is_correct; #ifdef ENABLE_MPI @@ -417,11 +419,11 @@ test2d(char *obj_name) #endif if (rank == 0) { - printf("2D data verfication ..."); + LOG_INFO("2D data verfication ..."); if (is_all_correct != size) - printf("FAILED!\n"); + LOG_ERROR("FAILED!\n"); else - printf("SUCCEED!\n"); + LOG_INFO("succeED!\n"); } free(data); @@ -471,7 +473,7 @@ test3d(char *obj_name) obj_id = create_obj(obj_name, ndim, prob_domain); if (obj_id == 0) { - printf("[%d]: Error creating an object [%s]\n", rank, obj_name); + LOG_ERROR("[%d]: Error creating an object [%s]\n", rank, obj_name); exit(-1); } @@ -482,7 +484,7 @@ test3d(char *obj_name) // Query the created object PDC_Client_query_metadata_name_timestep(obj_name, 0, &metadata); if (metadata == NULL) { - printf("Error getting metadata from server!\n"); + LOG_ERROR("Error getting metadata from server!\n"); exit(-1); } @@ -743,7 +745,7 @@ test3d(char *obj_name) is_correct = data_verify(ndim, data_start, read_region.size, read_data_3d, data_offset_real, data_3d); if (is_correct != 1) - printf("proc %d: verification failed!\n", rank); + LOG_ERROR("proc %d: verification failed!\n", rank); is_all_correct = is_correct; @@ -753,11 +755,11 @@ test3d(char *obj_name) #endif if (rank == 0) { - printf("3D data verfication ..."); + LOG_INFO("3D data verfication ..."); if (is_all_correct != size) - printf("FAILED!\n"); + LOG_ERROR("FAILED!\n"); else - printf("SUCCEED!\n"); + LOG_INFO("succeED!\n"); } free(data); @@ -820,12 +822,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); test1d("test_obj_1d"); @@ -842,18 +844,18 @@ main(int argc, char **argv) test3d("test_obj_3d"); if (rank == 0) - printf("\n\n"); + LOG_JUST_PRINT("\n\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_meta.c b/src/tests/data_server_meta.c index b0f92746e..bf837b041 100644 --- a/src/tests/data_server_meta.c +++ b/src/tests/data_server_meta.c @@ -52,7 +52,7 @@ rand_string(char *str, size_t size) void print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -84,7 +84,7 @@ main(int argc, char **argv) obj_ids = (pdcid_t *)calloc(count, sizeof(pdcid_t)); if (rank == 0) - printf("Creating %d objects per MPI rank\n", count); + LOG_INFO("Creating %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -93,18 +93,18 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container i = 0 sprintf(cont_name, "Cont%d", i); cont[i] = PDCcont_create(cont_name, cont_prop); if (cont[i] <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); PDCprop_set_obj_type(obj_prop, PDC_INT); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -118,16 +118,16 @@ main(int argc, char **argv) PDCprop_set_obj_tags(obj_prop, "tag0=1"); // Create a few objects with same name but diff timestep - sprintf(obj_name, "%s", obj_prefix[0]); + LOG_INFO(obj_name, "%s", obj_prefix[0]); for (i = 0; i < count; i++) { PDCprop_set_obj_time_step(obj_prop, i); obj_ids[i] = PDCobj_create(cont[0], obj_name, obj_prop); if (obj_ids[i] < 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name); goto done; } - printf("[%d] create an obj with name: %s, ts: %d\n", rank, obj_name, i); + LOG_INFO("[%d] create an obj with name: %s, ts: %d\n", rank, obj_name, i); } #ifdef ENABLE_MPI @@ -143,14 +143,14 @@ main(int argc, char **argv) done: // close all container if (PDCcont_close(cont[0]) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_meta_test.c b/src/tests/data_server_meta_test.c index 3f0e8fbf2..6ca6ee485 100644 --- a/src/tests/data_server_meta_test.c +++ b/src/tests/data_server_meta_test.c @@ -13,7 +13,7 @@ void print_usage() { - printf("Should run with more than 1 processes!\n"); + LOG_JUST_PRINT("Should run with more than 1 processes!\n"); } int @@ -56,17 +56,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); PDCprop_set_obj_dims(obj_prop, 1, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -84,7 +84,7 @@ main(int argc, char **argv) for (i = 0; i < NOBJ; i++) { obj_ids[i] = PDCobj_create(cont, obj_names[i], obj_prop); if (obj_ids[i] <= 0) { - printf("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); goto done; } } @@ -98,7 +98,7 @@ main(int argc, char **argv) for (i = 0; i < NOBJ; i++) { PDC_Client_query_metadata_name_timestep(obj_names[i], 0, &metadata[i]); if (metadata[i]->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); goto done; } @@ -107,7 +107,7 @@ main(int argc, char **argv) PDC_Client_write(metadata[i], &write_region, write_data); } - printf("%d - Finished writing %d regions. \n", rank, NOBJ); + LOG_INFO("%d - Finished writing %d regions. \n", rank, NOBJ); fflush(stdout); #ifdef ENABLE_MPI @@ -129,10 +129,10 @@ main(int argc, char **argv) } PDC_Client_query_name_read_entire_obj(my_read_obj, obj_names, &out_buf, out_buf_sizes); - printf("Received %d data objects:\n", NOBJ); + LOG_INFO("Received %d data objects:\n", NOBJ); for (i = 0; i < my_read_obj; i++) { - printf("Proc %d - [%s]: [%c] ... [%c], size %" PRId64 "\n", rank, obj_names[i], - ((char **)out_buf)[i][0], ((char **)out_buf)[i][out_buf_sizes[i] - 1], out_buf_sizes[i]); + LOG_INFO("Proc %d - [%s]: [%c] ... [%c], size %" PRId64 "\n", rank, obj_names[i], + ((char **)out_buf)[i][0], ((char **)out_buf)[i][out_buf_sizes[i] - 1], out_buf_sizes[i]); fflush(stdout); } @@ -147,14 +147,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read.c b/src/tests/data_server_read.c index f56ac5f09..38dbc9f8e 100644 --- a/src/tests/data_server_read.c +++ b/src/tests/data_server_read.c @@ -10,7 +10,7 @@ void print_usage() { - printf("Usage: srun -n ./data_server_read obj_name readsize\n"); + LOG_JUST_PRINT("Usage: srun -n ./data_server_read obj_name readsize\n"); } int @@ -54,12 +54,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); PDC_Client_query_metadata_name_timestep(argv[1], 0, &metadata); @@ -88,7 +88,7 @@ main(int argc, char **argv) ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to read data with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to read data with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -98,14 +98,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read_multi.c b/src/tests/data_server_read_multi.c index 9d6cdafda..8b8249b9b 100644 --- a/src/tests/data_server_read_multi.c +++ b/src/tests/data_server_read_multi.c @@ -12,7 +12,7 @@ void print_usage() { - printf("Usage: srun -n ./data_server_read obj_name size_MB n_timestep sleepseconds\n"); + LOG_JUST_PRINT("Usage: srun -n ./data_server_read obj_name size_MB n_timestep sleepseconds\n"); } int @@ -53,33 +53,32 @@ main(int argc, char **argv) long microseconds = (long)(sleepseconds * 1000000); if (rank == 0) { - printf("Reading a %lu MB object [%s]: %d timesteps, %.2fs sleep time, and %d clients.\n", size_MB, - obj_name, ntimestep, sleepseconds, size); + LOG_INFO("Reading a %lu MB object [%s]: %d timesteps, %.2fs sleep time, and %d clients.\n", size_MB, + obj_name, ntimestep, sleepseconds, size); } size_B = size_MB * 1048576; // create a pdc pdcid_t pdc = PDC_init("pdc"); - /* printf("create a new pdc, pdc id is: %lld\n", pdc); */ // create a container property pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); goto done; } // create a container pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); goto done; } // create an object property pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); goto done; } @@ -112,23 +111,18 @@ main(int argc, char **argv) // Query the created object if (rank == 0) - printf("%d: Start to query object just created ...", rank); + LOG_INFO("%d: Start to query object just created ...", rank); PDC_Client_query_metadata_name_timestep_agg(obj_name, ts, &metadata); - /* if (rank == 1) { */ - /* PDC_print_metadata(metadata); */ - /* } */ if (metadata == NULL || metadata->obj_id == 0) { - printf("[%d]: Error with metadata!\n", rank); + LOG_ERROR("[%d]: Error with metadata!\n", rank); exit(-1); } - /* printf("%d: reading to (%llu, %llu) of %llu bytes\n", rank, region.offset[0], region.offset[1], - * region.size[0]*region.size[1]); */ #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif if (rank == 0) - printf(" done\n", rank); + LOG_INFO(" done\n", rank); gettimeofday(&meta_end, 0); meta_elapsed = @@ -136,7 +130,7 @@ main(int argc, char **argv) total_meta_sec += meta_elapsed / 1000000.0; if (rank == 0) { - printf("Sleep %.2f seconds.\n", sleepseconds); + LOG_INFO("Sleep %.2f seconds.\n", sleepseconds); fflush(stdout); } @@ -148,7 +142,7 @@ main(int argc, char **argv) // Wait for previous read completion before reading current timestep ret_value = PDC_Client_wait(&request, 60000, 100); if (ret_value != SUCCEED) { - printf("==PDC_CLIENT: PDC_Client_read - PDC_Client_wait error\n"); + LOG_ERROR("==PDC_CLIENT: PDC_Client_read - PDC_Client_wait error\n"); goto done; } @@ -161,29 +155,18 @@ main(int argc, char **argv) wait_elapsed = (wait_end.tv_sec - wait_start.tv_sec) * 1000000LL + wait_end.tv_usec - wait_start.tv_usec; total_wait_sec += wait_elapsed / 1000000.0; - printf("Timestep %d read, metadata %.2f s, wait %.2f s.\n", ts, meta_elapsed / 1000000.0, - wait_elapsed / 1000000.0); + LOG_INFO("Timestep %d read, metadata %.2f s, wait %.2f s.\n", ts, meta_elapsed / 1000000.0, + wait_elapsed / 1000000.0); fflush(stdout); } } - /* PDC_Client_read_wait_notify(metadata, ®ion, mydata); */ - - /* if (rank == 0) */ - /* printf("Before iread\n"); */ - /* fflush(stdout); */ - - // (pdc_metadata_t *meta, struct PDC_region_info *region, PDC_Request_t *request, void *buf) ret_value = PDC_Client_iread(metadata, ®ion, &request, mydata); if (ret_value != SUCCEED) { - printf("[%d] Error with PDC_Client_iread!\n", rank); + LOG_ERROR("[%d] Error with PDC_Client_iread!\n", rank); goto done; } - /* if (rank == 0) */ - /* printf("After iread\n"); */ - /* fflush(stdout); */ - } /* End of for ntimestep */ #ifdef ENABLE_MPI @@ -206,14 +189,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container %ld\n", cont); + LOG_ERROR("Fail to close container %ld\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read_vpic.c b/src/tests/data_server_read_vpic.c index 2dd77651c..721b1c92c 100644 --- a/src/tests/data_server_read_vpic.c +++ b/src/tests/data_server_read_vpic.c @@ -103,12 +103,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // Query obj metadata and create read region one by one for (i = 0; i < NUM_VAR; i++) { @@ -119,7 +119,7 @@ main(int argc, char **argv) ret = PDC_Client_query_metadata_name_timestep(obj_names[i], 0, &obj_metas[i]); #endif if (ret != SUCCEED || obj_metas[i] == NULL || obj_metas[i]->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); exit(-1); } @@ -141,7 +141,7 @@ main(int argc, char **argv) #endif if (rank == 0) - printf("Read %d variables\n", read_var); + LOG_INFO("Read %d variables\n", read_var); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -157,7 +157,7 @@ main(int argc, char **argv) request[i].n_update = read_var; ret = PDC_Client_iread(obj_metas[i], &obj_regions[i], &request[i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iread!\n"); + LOG_ERROR("Error with PDC_Client_iread!\n"); goto done; } @@ -170,13 +170,13 @@ main(int argc, char **argv) } if (rank == 0) - printf("Finished sending all read requests, now waiting\n"); + LOG_ERROR("Finished sending all read requests, now waiting\n"); gettimeofday(&pdc_timer_start_1, 0); for (i = 0; i < read_var; i++) { ret = PDC_Client_wait(&request[i], 200000, 100); if (ret != SUCCEED) { - printf("Error with PDC_Client_wait!\n"); + LOG_ERROR("Error with PDC_Client_wait!\n"); goto done; } } @@ -192,45 +192,45 @@ main(int argc, char **argv) read_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); total_size = NPARTICLES * 4.0 * 8.0 * size / 1024.0 / 1024.0; if (rank == 0) { - printf("Read %.2f MB data with %d ranks\nTotal read time: %.2f\nSent %.2f, wait %.2f, Throughput " - "%.2f MB/s\n", - total_size, size, read_time, sent_time_total, wait_time_total, total_size / read_time); + LOG_INFO("Read %.2f MB data with %d ranks\nTotal read time: %.2f\nSent %.2f, wait %.2f, Throughput " + "%.2f MB/s\n", + total_size, size, read_time, sent_time_total, wait_time_total, total_size / read_time); fflush(stdout); } int verify = 1; if (rank == 0) - printf("Verifying data correctness ... "); + LOG_INFO("Verifying data correctness ..."); // Data verification for (i = 0; i < NPARTICLES; i++) { if (((int *)mydata[7])[i] != i * 2 || ((int *)mydata[6])[i] != i || ((float *)mydata[5])[i] != (i * 2.0 / NPARTICLES) * ZDIM || ((float *)mydata[2])[i] != (i * 1.0 / NPARTICLES) * ZDIM) { - printf("\nERROR on rank %d at element %d. [%d %d %.2f %.2f]/[%d %d %.2f %.2f]\n", rank, i, - ((int *)mydata[7])[i], ((int *)mydata[6])[i], ((float *)mydata[5])[i], - ((float *)mydata[2])[i], i * 2, i, (i * 2.0 / NPARTICLES) * ZDIM, - (i * 1.0 / NPARTICLES) * ZDIM); + LOG_ERROR("\nERROR on rank %d at element %d. [%d %d %.2f %.2f]/[%d %d %.2f %.2f]\n", rank, i, + ((int *)mydata[7])[i], ((int *)mydata[6])[i], ((float *)mydata[5])[i], + ((float *)mydata[2])[i], i * 2, i, (i * 2.0 / NPARTICLES) * ZDIM, + (i * 1.0 / NPARTICLES) * ZDIM); verify = 0; break; } // end if } // end of if (verify == 1) { if (rank == 0) - printf("SUCCEED\n"); + LOG_INFO("succeED\n"); } done: fflush(stdout); if (PDCcont_close(cont_id) < 0) - printf("Fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close container property\n"); + LOG_ERROR("Fail to close container property\n"); if (PDCclose(pdc_id) < 0) - printf("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read_vpic_multits.c b/src/tests/data_server_read_vpic_multits.c index f260e8cfb..81c7bcb5f 100644 --- a/src/tests/data_server_read_vpic_multits.c +++ b/src/tests/data_server_read_vpic_multits.c @@ -54,7 +54,7 @@ uniform_random_number() void usage(const char *name) { - printf( + LOG_INFO( "Usage:\n./%s num_variable(up to 8) variable_size_per_proc_MB n_timestep compute_time\nexiting...\n", name); } @@ -121,8 +121,8 @@ main(int argc, char **argv) sleep_time = 15; if (rank == 0) { - printf("read %d variables, each %dMB per proc, %d timesteps, %.1f compute time\n", n_var, - size_per_proc_var_MB, n_ts, sleep_time); + LOG_INFO("read %d variables, each %dMB per proc, %d timesteps, %.1f compute time\n", n_var, + size_per_proc_var_MB, n_ts, sleep_time); fflush(stdout); } @@ -137,12 +137,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // Float vars are first in the array follow by int vars for (i = 0; i < n_var; i++) { @@ -186,7 +186,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_query_metadata_name_timestep_agg(obj_names[i], ts, &obj_metas[ts][i]); if (ret != SUCCEED || obj_metas[ts][i] == NULL || obj_metas[ts][i]->obj_id == 0) { - printf("Error with metadata! ts=%d\n", ts); + LOG_ERROR("Error with metadata! ts=%d\n", ts); exit(-1); } } @@ -200,7 +200,7 @@ main(int argc, char **argv) query_time_total += query_time; if (rank == 0) { - printf("Query done!\n"); + LOG_INFO("Query done!\n"); fflush(stdout); } @@ -213,7 +213,7 @@ main(int argc, char **argv) // First timestep is always sync read, then start async (prefetching) if (ts == 0) { if (rank == 0) - printf("Timestep %d: sync read start\n", ts); + LOG_INFO("Timestep %d: sync read start\n", ts); fflush(stdout); // Timing @@ -222,7 +222,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_read(obj_metas[ts][i], &obj_regions[ts][i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_read!\n"); + LOG_ERROR("Error with PDC_Client_read!\n"); goto done; } } // end of for @@ -236,7 +236,7 @@ main(int argc, char **argv) wait_time_total += wait_time; if (rank == 0) { - printf("sync read done\n"); + LOG_INFO("sync read done\n"); fflush(stdout); } } @@ -251,7 +251,7 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_start_1, 0); if (rank == 0) { - printf("Timestep %d: Wait for prefetch.\n", ts); + LOG_INFO("Timestep %d: Wait for prefetch.\n", ts); fflush(stdout); } @@ -259,7 +259,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_wait(&request[ts][i], 90000, 100); if (ret != SUCCEED) { - printf("Error with PDC_Client_wait!\n"); + LOG_ERROR("Error with PDC_Client_wait!\n"); goto done; } } @@ -271,25 +271,22 @@ main(int argc, char **argv) wait_time_total += wait_time; if (rank == 0) { - printf("Timestep %d: prefetch finished.\n", ts); + LOG_INFO("Timestep %d: prefetch finished.\n", ts); fflush(stdout); } } - /* - * PREFETCH - */ // Prefetch next ts except the last read if (ts != n_ts - 1) { if (rank == 0) - printf("Timestep %d: prefetch timestep %d.\n", ts, ts + 1); + LOG_INFO("Timestep %d: prefetch timestep %d.\n", ts, ts + 1); for (i = 0; i < n_var; i++) { request[ts + 1][i].n_update = n_var; ret = PDC_Client_iread(obj_metas[ts + 1][i], &obj_regions[ts + 1][i], &request[ts + 1][i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iread!\n"); + LOG_ERROR("Error with PDC_Client_iread!\n"); goto done; } } // end of for @@ -310,7 +307,7 @@ main(int argc, char **argv) true_sleep_time = 0; if (rank == 0) { - printf("Compute for %d seconds.\n", (int)(true_sleep_time)); + LOG_INFO("Compute for %d seconds.\n", (int)(true_sleep_time)); fflush(stdout); } @@ -322,8 +319,8 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); #endif if (rank == 0) - printf("Timestep %d: query time %.5e, read time %.5e, wait time %.5e, compute time %.5e\n", ts, - query_time, read_time, wait_time, true_sleep_time); + LOG_INFO("Timestep %d: query time %.5e, read time %.5e, wait time %.5e, compute time %.5e\n", ts, + query_time, read_time, wait_time, true_sleep_time); } // end of for ts #ifdef ENABLE_MPI @@ -333,10 +330,10 @@ main(int argc, char **argv) total_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); total_size = n_particles * 4.0 * 8 * size / 1024.0 / 1024.0; if (rank == 0) { - printf("read %d ts each of %.0fMB data with %d ranks: total %.2f\n" - "query %.2f, read %.2f, wait %.2f, compute %.2f\n", - n_ts, total_size, size, total_time, query_time_total, read_time_total, wait_time_total, - compute_total); + LOG_INFO("read %d ts each of %.0fMB data with %d ranks: total %.2f\n" + "query %.2f, read %.2f, wait %.2f, compute %.2f\n", + n_ts, total_size, size, total_time, query_time_total, read_time_total, wait_time_total, + compute_total); fflush(stdout); } @@ -348,13 +345,13 @@ main(int argc, char **argv) done: if (PDCcont_close(cont_id) < 0) - printf("Fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close container property\n"); + LOG_ERROR("Fail to close container property\n"); if (PDCclose(pdc_id) < 0) - printf("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/data_server_read_vpic_spatial.c b/src/tests/data_server_read_vpic_spatial.c index e5fdd16c8..81fcdcaac 100644 --- a/src/tests/data_server_read_vpic_spatial.c +++ b/src/tests/data_server_read_vpic_spatial.c @@ -46,7 +46,8 @@ void usage(const char *name) { - printf("Usage:\n./%s num_variable(up to 8) selectivity_percentage (0.0 to 1.0)\nexiting...\n", name); + LOG_JUST_PRINT("Usage:\n./%s num_variable(up to 8) selectivity_percentage (0.0 to 1.0)\nexiting...\n", + name); } float @@ -113,7 +114,7 @@ main(int argc, char **argv) selectivity = 1.0; if (rank == 0) - printf("Read %d variables with selectivity %.2f\n", read_var, selectivity); + LOG_INFO("Read %d variables with selectivity %.2f\n", read_var, selectivity); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -125,12 +126,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // Query obj metadata and create read region one by one for (i = 0; i < NUM_VAR; i++) { @@ -141,7 +142,7 @@ main(int argc, char **argv) ret = PDC_Client_query_metadata_name_timestep(obj_names[i], 0, &obj_metas[i]); #endif if (ret != SUCCEED || obj_metas[i] == NULL || obj_metas[i]->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); exit(-1); } @@ -171,7 +172,7 @@ main(int argc, char **argv) request[i].n_update = 1; ret = PDC_Client_iread(obj_metas[i], &obj_regions[i], &request[i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iread!\n"); + LOG_ERROR("Error with PDC_Client_iread!\n"); goto done; } @@ -187,7 +188,7 @@ main(int argc, char **argv) ret = PDC_Client_wait(&request[i], 60000, 100); if (ret != SUCCEED) { - printf("Error with PDC_Client_wait!\n"); + LOG_ERROR("Error with PDC_Client_wait!\n"); goto done; } @@ -207,9 +208,9 @@ main(int argc, char **argv) read_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); total_size = NPARTICLES * selectivity * 4.0 * 8.0 * size / 1024.0 / 1024.0; if (rank == 0) { - printf("Read %.2f MB data with %d ranks\nTotal read time: %.2f\nSent %.2f, wait %.2f, Throughput " - "%.2f MB/s\n", - total_size, size, read_time, sent_time_total, wait_time_total, total_size / read_time); + LOG_INFO("Read %.2f MB data with %d ranks\nTotal read time: %.2f\nSent %.2f, wait %.2f, Throughput " + "%.2f MB/s\n", + total_size, size, read_time, sent_time_total, wait_time_total, total_size / read_time); fflush(stdout); } @@ -217,13 +218,13 @@ main(int argc, char **argv) fflush(stdout); if (PDCcont_close(cont_id) < 0) - printf("Fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close container property\n"); + LOG_ERROR("Fail to close container property\n"); if (PDCclose(pdc_id) < 0) - printf("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/data_server_read_vpic_spatial_multits.c b/src/tests/data_server_read_vpic_spatial_multits.c index e667736cf..a67da9c2a 100644 --- a/src/tests/data_server_read_vpic_spatial_multits.c +++ b/src/tests/data_server_read_vpic_spatial_multits.c @@ -54,7 +54,7 @@ uniform_random_number() void usage(const char *name) { - printf( + LOG_INFO( "Usage:\n./%s num_variable(up to 8) variable_size_per_proc_MB n_timestep compute_time selectivity\n" "exiting...\n", name); @@ -131,8 +131,8 @@ main(int argc, char **argv) } if (rank == 0) { - printf("read %d variables, each %dMB per proc, %d timesteps, %.1f compute time, %.2f selectivity\n", - n_var, size_per_proc_var_MB, n_ts, sleep_time, selectivity); + LOG_INFO("read %d variables, each %dMB per proc, %d timesteps, %.1f compute time, %.2f selectivity\n", + n_var, size_per_proc_var_MB, n_ts, sleep_time, selectivity); fflush(stdout); } @@ -142,12 +142,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // Float vars are first in the array follow by int vars for (i = 0; i < n_var; i++) { @@ -191,7 +191,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_query_metadata_name_timestep_agg(obj_names[i], ts, &obj_metas[ts][i]); if (ret != SUCCEED || obj_metas[ts][i] == NULL || obj_metas[ts][i]->obj_id == 0) { - printf("Error with metadata! ts=%d\n", ts); + LOG_ERROR("Error with metadata! ts=%d\n", ts); exit(-1); } } @@ -206,7 +206,7 @@ main(int argc, char **argv) query_time_total += query_time; if (rank == 0) - printf("Query done!\n"); + LOG_INFO("Query done!\n"); fflush(stdout); for (ts = 0; ts < n_ts; ts++) { @@ -218,7 +218,7 @@ main(int argc, char **argv) // First timestep is always sync read, then start async (prefetching) if (ts == 0) { if (rank == 0) - printf("Timestep %d: sync read start\n", ts); + LOG_INFO("Timestep %d: sync read start\n", ts); fflush(stdout); // Timing @@ -227,7 +227,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_read(obj_metas[ts][i], &obj_regions[ts][i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_read!\n"); + LOG_ERROR("Error with PDC_Client_read!\n"); goto done; } } // end of for @@ -241,7 +241,7 @@ main(int argc, char **argv) wait_time_total += wait_time; if (rank == 0) - printf("sync read done\n"); + LOG_INFO("sync read done\n"); fflush(stdout); } else { @@ -255,7 +255,7 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_start_1, 0); if (rank == 0) { - printf("Timestep %d: Wait for prefetch.\n", ts); + LOG_INFO("Timestep %d: Wait for prefetch.\n", ts); fflush(stdout); } @@ -263,7 +263,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_wait(&request[ts][i], 90000, 100); if (ret != SUCCEED) { - printf("Error with PDC_Client_wait!\n"); + LOG_ERROR("Error with PDC_Client_wait!\n"); goto done; } } @@ -275,7 +275,7 @@ main(int argc, char **argv) wait_time_total += wait_time; if (rank == 0) { - printf("Timestep %d: prefetch finished.\n", ts); + LOG_INFO("Timestep %d: prefetch finished.\n", ts); fflush(stdout); } } @@ -286,14 +286,14 @@ main(int argc, char **argv) // Prefetch next ts except the last read if (ts != n_ts - 1) { if (rank == 0) - printf("Timestep %d: prefetch timestep %d.\n", ts, ts + 1); + LOG_INFO("Timestep %d: prefetch timestep %d.\n", ts, ts + 1); for (i = 0; i < n_var; i++) { request[ts + 1][i].n_update = n_var; ret = PDC_Client_iread(obj_metas[ts + 1][i], &obj_regions[ts + 1][i], &request[ts + 1][i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iread!\n"); + LOG_ERROR("Error with PDC_Client_iread!\n"); goto done; } } // end of for @@ -314,7 +314,7 @@ main(int argc, char **argv) true_sleep_time = 0; if (rank == 0) { - printf("Compute for %d seconds.\n", (int)(true_sleep_time)); + LOG_INFO("Compute for %d seconds.\n", (int)(true_sleep_time)); fflush(stdout); } @@ -326,8 +326,8 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); #endif if (rank == 0) - printf("Timestep %d: query time %.5e, read time %.5e, wait time %.5e, compute time %.5e\n", ts, - query_time, read_time, wait_time, true_sleep_time); + LOG_INFO("Timestep %d: query time %.5e, read time %.5e, wait time %.5e, compute time %.5e\n", ts, + query_time, read_time, wait_time, true_sleep_time); } // end of for ts #ifdef ENABLE_MPI @@ -337,10 +337,10 @@ main(int argc, char **argv) total_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); total_size = n_particles * selectivity * 4.0 * 8 * size / 1024.0 / 1024.0; if (rank == 0) { - printf("read %d ts each of %.0fMB data with %d ranks: total %.2f\n" - "query %.2f, read %.2f, wait %.2f, compute %.2f\n", - n_ts, total_size, size, total_time, query_time_total, read_time_total, wait_time_total, - compute_total); + LOG_INFO("read %d ts each of %.0fMB data with %d ranks: total %.2f\n" + "query %.2f, read %.2f, wait %.2f, compute %.2f\n", + n_ts, total_size, size, total_time, query_time_total, read_time_total, wait_time_total, + compute_total); fflush(stdout); } @@ -352,13 +352,13 @@ main(int argc, char **argv) done: if (PDCcont_close(cont_id) < 0) - printf("Fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close container property\n"); + LOG_ERROR("Fail to close container property\n"); if (PDCclose(pdc_id) < 0) - printf("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/data_server_write.c b/src/tests/data_server_write.c index 174d780fe..d401f8e37 100644 --- a/src/tests/data_server_write.c +++ b/src/tests/data_server_write.c @@ -12,7 +12,7 @@ void print_usage() { - printf("Usage: srun -n ./data_server_read obj_name size_MB\n"); + LOG_JUST_PRINT("Usage: srun -n ./data_server_read obj_name size_MB\n"); } int @@ -50,7 +50,7 @@ main(int argc, char **argv) size_MB = atoi(argv[2]); if (rank == 0) { - printf("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); + LOG_INFO("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); } size_MB *= 1048576; @@ -60,17 +60,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); my_data_size = size_MB / size; dims[0] = my_data_size; @@ -84,7 +84,7 @@ main(int argc, char **argv) if (rank == 0) { test_obj = PDCobj_create(cont, obj_name, obj_prop); if (test_obj <= 0) { - printf("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); exit(-1); } } @@ -96,7 +96,7 @@ main(int argc, char **argv) // Query the created object PDC_Client_query_metadata_name_timestep(obj_name, 0, &metadata); if (metadata == NULL || metadata->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); } region.ndim = ndim; @@ -124,20 +124,20 @@ main(int argc, char **argv) ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to write data with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to write data with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_write_multi.c b/src/tests/data_server_write_multi.c index fd5a02478..95c8e2782 100644 --- a/src/tests/data_server_write_multi.c +++ b/src/tests/data_server_write_multi.c @@ -12,7 +12,7 @@ void print_usage() { - printf("Usage: srun -n ./data_server_write obj_name size_MB n_timestep sleepseconds\n"); + LOG_JUST_PRINT("Usage: srun -n ./data_server_write obj_name size_MB n_timestep sleepseconds\n"); } int @@ -53,33 +53,32 @@ main(int argc, char **argv) long microseconds = (long)(sleepseconds * 1000000); if (rank == 0) { - printf("Writing a %lu MB object [%s]: %d timesteps, %.2fs sleep time, and %d clients.\n", size_MB, - obj_name, ntimestep, sleepseconds, size); + LOG_INFO("Writing a %lu MB object [%s]: %d timesteps, %.2fs sleep time, and %d clients.\n", size_MB, + obj_name, ntimestep, sleepseconds, size); } size_B = size_MB * 1048576; // create a pdc pdcid_t pdc = PDC_init("pdc"); - /* printf("create a new pdc, pdc id is: %lld\n", pdc); */ // create a container property pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); goto done; } // create a container pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); goto done; } // create an object property pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); goto done; } @@ -122,39 +121,33 @@ main(int argc, char **argv) // Create a object with only rank 0 if (rank == 0) { - printf("Creating an object with name [%s], timestep %u\n", obj_name, ts); + LOG_INFO("Creating an object with name [%s], timestep %u\n", obj_name, ts); /* fflush(stdout); */ test_obj = PDCobj_create(cont, obj_name, obj_prop); if (test_obj <= 0) { - printf("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); exit(-1); } } - /* printf("%d: object created.\n", rank); */ #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif // Query the created object if (rank == 0) - printf("%d: Start to query object just created ...", rank); + LOG_INFO("%d: Start to query object just created ...", rank); PDC_Client_query_metadata_name_timestep_agg(obj_name, ts, &metadata); - /* if (rank == 1) { */ - /* PDC_print_metadata(metadata); */ - /* } */ if (metadata == NULL || metadata->obj_id == 0) { - printf("[%d]: Error with metadata!\n", rank); + LOG_ERROR("[%d]: Error with metadata!\n", rank); exit(-1); } - /* printf("%d: writing to (%llu, %llu) of %llu bytes\n", rank, region.offset[0], region.offset[1], - * region.size[0]*region.size[1]); */ #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif if (rank == 0) - printf(" done\n", rank); + LOG_INFO(" done\n", rank); gettimeofday(&meta_end, 0); meta_elapsed = @@ -162,7 +155,7 @@ main(int argc, char **argv) total_meta_sec += meta_elapsed / 1000000.0; if (rank == 0) { - printf("Sleep %.2f seconds.\n", sleepseconds); + LOG_INFO("Sleep %.2f seconds.\n", sleepseconds); fflush(stdout); } @@ -174,7 +167,7 @@ main(int argc, char **argv) // Wait for previous write completion before writting current timestep ret_value = PDC_Client_wait(&request, 60000, 100); if (ret_value != SUCCEED) { - printf("==PDC_CLIENT: PDC_Client_write - PDC_Client_wait error\n"); + LOG_INFO("==PDC_CLIENT: PDC_Client_write - PDC_Client_wait error\n"); goto done; } @@ -188,29 +181,19 @@ main(int argc, char **argv) wait_elapsed = (wait_end.tv_sec - wait_start.tv_sec) * 1000000LL + wait_end.tv_usec - wait_start.tv_usec; total_wait_sec += wait_elapsed / 1000000.0; - printf("Timestep %d written, metadata %.2f s, wait %.2f s.\n", ts, meta_elapsed / 1000000.0, - wait_elapsed / 1000000.0); + LOG_INFO("Timestep %d written, metadata %.2f s, wait %.2f s.\n", ts, meta_elapsed / 1000000.0, + wait_elapsed / 1000000.0); fflush(stdout); } } - /* PDC_Client_write_wait_notify(metadata, ®ion, mydata); */ - - /* if (rank == 0) */ - /* printf("Before iwrite\n"); */ - /* fflush(stdout); */ - // (pdc_metadata_t *meta, struct PDC_region_info *region, PDC_Request_t *request, void *buf) ret_value = PDC_Client_iwrite(metadata, ®ion, &request, mydata); if (ret_value != SUCCEED) { - printf("[%d] Error with PDC_Client_iwrite!\n", rank); + LOG_ERROR("[%d] Error with PDC_Client_iwrite!\n", rank); goto done; } - /* if (rank == 0) */ - /* printf("After iwrite\n"); */ - /* fflush(stdout); */ - } /* End of for ntimestep */ #ifdef ENABLE_MPI @@ -223,7 +206,7 @@ main(int argc, char **argv) (total_end.tv_sec - total_start.tv_sec) * 1000000LL + total_end.tv_usec - total_start.tv_usec; if (rank == 0) { - printf( + LOG_INFO( "Total time write %d ts data each %luMB with %d ranks: %.5e, meta %.2f, wait %.2f, sleep %.2f\n", ntimestep, size_MB, size, total_elapsed / 1000000.0, total_meta_sec, total_wait_sec, sleepseconds * ntimestep); @@ -233,14 +216,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container %ld\n", cont); + LOG_ERROR("Fail to close container %ld\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_write_vpic.c b/src/tests/data_server_write_vpic.c index 2a5f9d646..d6b0c4543 100644 --- a/src/tests/data_server_write_vpic.c +++ b/src/tests/data_server_write_vpic.c @@ -61,7 +61,7 @@ main(int argc, char **argv) MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); #else - printf("MPI NOT Enabled!\n"); + LOG_INFO("MPI NOT Enabled!\n"); fflush(stdout); #endif @@ -113,12 +113,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create object property for float and int obj_prop_float = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -143,7 +143,7 @@ main(int argc, char **argv) if (rank == 0) { obj_ids[i] = PDCobj_create(cont_id, obj_names[i], obj_prop_float); if (obj_ids[i] <= 0) { - printf("Error getting an object %s from server, exit...\n", obj_names[i]); + LOG_ERROR("Error getting an object %s from server, exit...\n", obj_names[i]); goto done; } } @@ -159,7 +159,7 @@ main(int argc, char **argv) if (rank == 0) { obj_ids[i] = PDCobj_create(cont_id, obj_names[i], obj_prop_int); if (obj_ids[i] <= 0) { - printf("Error getting an object %s from server, exit...\n", obj_names[i]); + LOG_ERROR("Error getting an object %s from server, exit...\n", obj_names[i]); goto done; } } @@ -181,7 +181,7 @@ main(int argc, char **argv) ret = PDC_Client_query_metadata_name_timestep(obj_names[i], 0, &obj_metas[i]); #endif if (ret != SUCCEED || obj_metas[i] == NULL || obj_metas[i]->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); exit(-1); } } @@ -198,7 +198,7 @@ main(int argc, char **argv) } if (rank == 0) - printf("Write out %d variables\n", write_var); + LOG_INFO("Write out %d variables\n", write_var); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -215,7 +215,7 @@ main(int argc, char **argv) request[i].n_update = write_var; ret = PDC_Client_iwrite(obj_metas[i], &obj_regions[i], &request[i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iwrite!\n"); + LOG_ERROR("Error with PDC_Client_iwrite!\n"); goto done; } @@ -225,14 +225,14 @@ main(int argc, char **argv) } if (rank == 0) - printf("Finished sending all write requests, now waiting\n"); + LOG_ERROR("Finished sending all write requests, now waiting\n"); gettimeofday(&pdc_timer_start_1, 0); for (i = 0; i < write_var; i++) { ret = PDC_Client_wait(&request[i], 200000, 500); if (ret != SUCCEED) { - printf("Error with PDC_Client_wait!\n"); + LOG_ERROR("Error with PDC_Client_wait!\n"); goto done; } } @@ -248,27 +248,27 @@ main(int argc, char **argv) write_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); total_size = NPARTICLES * 4.0 * 8.0 * size / 1024.0 / 1024.0; if (rank == 0) { - printf("Write %f MB data with %d ranks\nTotal write time: %.2f\nSent %.2f, wait %.2f, Throughput " - "%.2f MB/s\n", - total_size, size, write_time, sent_time_total, wait_time_total, total_size / write_time); + LOG_INFO("Write %f MB data with %d ranks\nTotal write time: %.2f\nSent %.2f, wait %.2f, Throughput " + "%.2f MB/s\n", + total_size, size, write_time, sent_time_total, wait_time_total, total_size / write_time); fflush(stdout); } done: if (PDCprop_close(obj_prop_float) < 0) - printf("Fail to close float obj property \n"); + LOG_ERROR("Fail to close float obj property \n"); if (PDCprop_close(obj_prop_int) < 0) - printf("Fail to close int obj property \n"); + LOG_ERROR("Fail to close int obj property \n"); if (PDCcont_close(cont_id) < 0) - printf("Fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close container property\n"); + LOG_ERROR("Fail to close container property\n"); if (PDCclose(pdc_id) < 0) - printf("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_write_vpic_multits.c b/src/tests/data_server_write_vpic_multits.c index 6a943bb58..ef136c1bd 100644 --- a/src/tests/data_server_write_vpic_multits.c +++ b/src/tests/data_server_write_vpic_multits.c @@ -54,7 +54,7 @@ uniform_random_number() void usage(const char *name) { - printf( + LOG_INFO( "Usage:\n./%s num_variable(up to 8) variable_size_per_proc_MB n_timestep compute_time\nexiting...\n", name); } @@ -131,8 +131,8 @@ main(int argc, char **argv) sleep_time = 15; if (rank == 0) { - printf("Write %d variables, each %dMB per proc, %d timesteps, %.1f compute time\n", n_var, - size_per_proc_var_MB, n_ts, sleep_time); + LOG_INFO("Write %d variables, each %dMB per proc, %d timesteps, %.1f compute time\n", n_var, + size_per_proc_var_MB, n_ts, sleep_time); fflush(stdout); } @@ -142,12 +142,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create object property for float and int obj_prop_float = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -213,7 +213,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("Compute for %.2f seconds\n", gen_time + true_sleep_time); + LOG_INFO("Compute for %.2f seconds\n", gen_time + true_sleep_time); } fflush(stdout); @@ -226,7 +226,7 @@ main(int argc, char **argv) #endif if (rank == 0) { - printf("Compute done\n"); + LOG_INFO("Compute done\n"); fflush(stdout); } @@ -239,7 +239,7 @@ main(int argc, char **argv) if (rank == 0) { obj_ids[ts][i] = PDCobj_create(cont_id, obj_names[i], obj_prop_float); if (obj_ids[ts][i] <= 0) { - printf("Error creating object %s, exit...\n", obj_names[i]); + LOG_ERROR("Error creating object %s, exit...\n", obj_names[i]); goto done; } } @@ -250,7 +250,7 @@ main(int argc, char **argv) if (rank == 0) { obj_ids[ts][i] = PDCobj_create(cont_id, obj_names[i], obj_prop_int); if (obj_ids[ts][i] <= 0) { - printf("Error creating object %s, exit...\n", obj_names[i]); + LOG_ERROR("Error creating object %s, exit...\n", obj_names[i]); goto done; } } @@ -272,14 +272,14 @@ main(int argc, char **argv) create_time_total += create_time; if (rank == 0) { - printf("%d: start querying objects\n", rank); + LOG_INFO("%d: start querying objects\n", rank); fflush(stdout); } for (i = 0; i < n_var; i++) { ret = PDC_Client_query_metadata_name_timestep_agg(obj_names[i], ts, &obj_metas[ts][i]); if (ret != SUCCEED || obj_metas[ts][i] == NULL || obj_metas[ts][i]->obj_id == 0) { - printf("Error with metadata! ts=%d\n", ts); + LOG_ERROR("Error with metadata! ts=%d\n", ts); exit(-1); } } @@ -292,7 +292,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); #endif if (rank == 0) { - printf("%d: querying done\n", rank); + LOG_INFO("%d: querying done\n", rank); fflush(stdout); } @@ -304,7 +304,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_wait(&request[ts - 1][i], 30000, 100); if (ret != SUCCEED) { - printf("Error with PDC_Client_wait!\n"); + LOG_ERROR("Error with PDC_Client_wait!\n"); goto done; } } @@ -317,7 +317,7 @@ main(int argc, char **argv) } if (rank == 0) - printf("Timestep %d: start to write.\n", ts); + LOG_INFO("Timestep %d: start to write.\n", ts); fflush(stdout); // Last ts is sync IO @@ -332,7 +332,7 @@ main(int argc, char **argv) request[ts][i].n_update = n_var; ret = PDC_Client_iwrite(obj_metas[ts][i], &obj_regions[ts][i], &request[ts][i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iwrite!\n"); + LOG_ERROR("Error with PDC_Client_iwrite!\n"); goto done; } } // end of for @@ -346,8 +346,8 @@ main(int argc, char **argv) } if (rank == 0) - printf("Timestep %d: create time %.5e, query time %.5e, write time %.5e, wait time %.5e\n", ts, - create_time, query_time, write_time, wait_time); + LOG_INFO("Timestep %d: create time %.5e, query time %.5e, write time %.5e, wait time %.5e\n", ts, + create_time, query_time, write_time, wait_time); } // Perform last timestep write @@ -360,7 +360,7 @@ main(int argc, char **argv) for (i = 0; i < n_var; i++) { ret = PDC_Client_write(obj_metas[n_ts - 1][i], &obj_regions[n_ts - 1][i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iwrite!\n"); + LOG_ERROR("Error with PDC_Client_iwrite!\n"); goto done; } } // end of for @@ -375,16 +375,16 @@ main(int argc, char **argv) wait_time_total += wait_time; if (rank == 0) - printf("Timestep %d: write time %.2f, wait time %.2f\n", ts, write_time, wait_time); + LOG_INFO("Timestep %d: write time %.2f, wait time %.2f\n", ts, write_time, wait_time); gettimeofday(&pdc_timer_end, 0); total_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); total_size = n_particles * 4.0 * 8 * size / 1024.0 / 1024.0; if (rank == 0) { - printf("Write %d ts each of %.0fMB data with %d ranks: total %.2f\n" - "create %.2f, query %.2f, write %.2f, wait %.2f, compute %.2f\n", - n_ts, total_size, size, total_time, create_time_total, query_time_total, write_time_total, - wait_time_total, compute_total); + LOG_INFO("Write %d ts each of %.0fMB data with %d ranks: total %.2f\n" + "create %.2f, query %.2f, write %.2f, wait %.2f, compute %.2f\n", + n_ts, total_size, size, total_time, create_time_total, query_time_total, write_time_total, + wait_time_total, compute_total); fflush(stdout); } @@ -396,19 +396,19 @@ main(int argc, char **argv) done: if (PDCprop_close(obj_prop_float) < 0) - printf("Fail to close float obj property \n"); + LOG_ERROR("Fail to close float obj property \n"); if (PDCprop_close(obj_prop_int) < 0) - printf("Fail to close int obj property \n"); + LOG_ERROR("Fail to close int obj property \n"); if (PDCcont_close(cont_id) < 0) - printf("Fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close container property\n"); + LOG_ERROR("Fail to close container property\n"); if (PDCclose(pdc_id) < 0) - printf("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/delete_obj.c b/src/tests/delete_obj.c index 22265de88..ec6878022 100644 --- a/src/tests/delete_obj.c +++ b/src/tests/delete_obj.c @@ -52,7 +52,7 @@ rand_string(char *str, size_t size) void print_usage() { - printf("Usage: srun -n ./delete_obj -r total_objects_to_create_delete\n"); + LOG_INFO("Usage: srun -n ./delete_obj -r total_objects_to_create_delete\n"); } int @@ -84,11 +84,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -103,7 +103,7 @@ main(int argc, char **argv) count /= size; if (rank == 0) - printf("Delete %d objects per MPI rank\n", count); + LOG_INFO("Delete %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -112,17 +112,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); create_obj_ids = (pdcid_t *)malloc(sizeof(pdcid_t) * count); @@ -132,7 +132,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); fflush(stdout); } @@ -157,7 +157,7 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop, i / 4 + rank * count); } else { - printf("Unsupported name choice\n"); + LOG_ERROR("Unsupported name choice\n"); goto done; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -167,7 +167,7 @@ main(int argc, char **argv) // Create object create_obj_ids[i] = PDCobj_create(cont, obj_name, obj_prop); if (create_obj_ids[i] == 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name); exit(-1); } } @@ -180,25 +180,25 @@ main(int argc, char **argv) for (i = 0; i < count; i++) { ret = PDC_Client_delete_metadata_by_id(create_obj_ids[i]); if (ret != SUCCEED) { - printf("Delete fail with process %d, exiting\n", rank); + LOG_ERROR("Delete fail with process %d, exiting\n", rank); goto done; } } if (rank == 0) { - printf("Delete test SUCCEED.\n"); + LOG_INFO("Delete test SUCCEED.\n"); } done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/delete_obj_scale.c b/src/tests/delete_obj_scale.c index e97aa409f..9e3108665 100644 --- a/src/tests/delete_obj_scale.c +++ b/src/tests/delete_obj_scale.c @@ -52,7 +52,7 @@ rand_string(char *str, size_t size) void print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -87,11 +87,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -106,7 +106,7 @@ main(int argc, char **argv) count /= size; if (rank == 0) - printf("Creating %d objects per MPI rank\n", count); + LOG_INFO("Creating %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -115,17 +115,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -133,7 +133,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } srand(rank + 1); @@ -159,7 +159,7 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop, i / 4 + rank * count); } else { - printf("Unsupported name choice\n"); + LOG_ERROR("Unsupported name choice\n"); goto done; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -168,7 +168,7 @@ main(int argc, char **argv) ret = PDC_Client_delete_metadata(obj_name, obj_prop); if (ret != SUCCEED) - printf("%d: Cannot delete object [%s]\n", rank, obj_name); + LOG_ERROR("%d: Cannot delete object [%s]\n", rank, obj_name); // Print progress progress_factor = count < 10 ? 1 : 10; @@ -178,7 +178,7 @@ main(int argc, char **argv) ht_total_end.tv_usec - ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; - printf("%10d deleted ... %.2fs\n", i * size, ht_total_sec); + LOG_INFO("%10d deleted ... %.2fs\n", i * size, ht_total_sec); fflush(stdout); } } @@ -191,21 +191,21 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); + LOG_INFO("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); fflush(stdout); } done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/dt_conv.c b/src/tests/dt_conv.c index 16d5c1f9e..66e36a16b 100644 --- a/src/tests/dt_conv.c +++ b/src/tests/dt_conv.c @@ -40,7 +40,7 @@ main(int argc, char **argv) // create a pdc pdcid_t pdc = PDC_init("pdc"); - printf("generated new pdc, id is %lld\n", pdc); + LOG_INFO("generated new pdc, id is %lld\n", pdc); float a[10] = {1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 8.1, 9.1, 10.1}; int b[5]; @@ -48,12 +48,12 @@ main(int argc, char **argv) int i; for (i = 0; i < 5; i++) - printf("b[%d] is %d\n", i, b[i]); + LOG_INFO("b[%d] is %d\n", i, b[i]); // close pdc if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); else - printf("PDC is closed\n"); + LOG_INFO("PDC is closed\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/dup_prop.c b/src/tests/dup_prop.c index a8eda35f1..37548942a 100644 --- a/src/tests/dup_prop.c +++ b/src/tests/dup_prop.c @@ -46,43 +46,43 @@ main(int argc, char **argv) // create an object property create_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop1 <= 0) { - printf("Fail to create @ line %d\n", __LINE__); + LOG_ERROR("Fail to create"); ret_value = 1; } // create another object property create_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop2 <= 0) { - printf("Fail to create @ line %d\n", __LINE__); + LOG_ERROR("Fail to create"); ret_value = 1; } dup_prop = PDCprop_obj_dup(create_prop2); if (PDCprop_close(dup_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close first property\n"); + LOG_INFO("successfully close first property\n"); } if (PDCprop_close(create_prop1) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close first property\n"); + LOG_INFO("successfully close first property\n"); } if (PDCprop_close(create_prop2) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close second property\n"); + LOG_INFO("successfully close second property\n"); } // close a pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/gen_fastbit_idx.c b/src/tests/gen_fastbit_idx.c index 14afc92d7..1eeab5259 100644 --- a/src/tests/gen_fastbit_idx.c +++ b/src/tests/gen_fastbit_idx.c @@ -20,7 +20,7 @@ main(int argc, char **argv) float preload_value = -2000000000.0; if (argc < 2) { - printf("Please enter var name as input!\n"); + LOG_ERROR("Please enter var name as input!\n"); fflush(stdout); } var_name = argv[1]; @@ -30,7 +30,7 @@ main(int argc, char **argv) // Query the created object PDC_Client_query_metadata_name_timestep(var_name, 0, &meta); if (meta == NULL || meta->obj_id == 0) { - printf("Error with [%s] metadata!\n", var_name); + LOG_ERROR("Error with [%s] metadata!\n", var_name); goto done; } id = meta->obj_id; @@ -38,12 +38,12 @@ main(int argc, char **argv) qpreload_x = PDCquery_create(id, PDC_GT, PDC_FLOAT, &preload_value); PDCquery_get_nhits(qpreload_x, &nhits); - printf("Generated Fastbit index for [%s], total %" PRIu64 " elements\n", var_name, nhits); + LOG_INFO("Generated Fastbit index for [%s], total %" PRIu64 " elements\n", var_name, nhits); PDCquery_free_all(qpreload_x); done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/hash_table.c b/src/tests/hash_table.c index dac6cf357..1e856c487 100644 --- a/src/tests/hash_table.c +++ b/src/tests/hash_table.c @@ -108,7 +108,6 @@ main(int argc, char *argv[]) value2->obj_id = 20; for (i = 0; i < num; i++) { - /* printf("Iter[%d]\n", i); */ keys[i] = (int *)malloc(sizeof(int)); *keys[i] = 1000 + i; values[i] = (hash_value_metadata_t *)malloc(sizeof(hash_value_metadata_t)); @@ -120,56 +119,30 @@ main(int argc, char *argv[]) hg_hash_table_insert(hash_table, keys[i], values[i]); } - printf("Entries: %d\n", hg_hash_table_num_entries(hash_table)); + LOG_INFO("Entries: %d\n", hg_hash_table_num_entries(hash_table)); lookup_key = *key2; lookup_value = hg_hash_table_lookup(hash_table, &lookup_key); if (lookup_value != NULL) { - printf("Found in hash table with obj_id=%d, obj_name=%s, test=%s\n", lookup_value->obj_id, - lookup_value->obj_name, lookup_value->test); + LOG_INFO("Found in hash table with obj_id=%d, obj_name=%s, test=%s\n", lookup_value->obj_id, + lookup_value->obj_name, lookup_value->test); sprintf(lookup_value->obj_name, "%s", "SUCCESSFULLY CHANGED HASH VALUE"); lookup_value->test = "World"; } else { - printf("Object with lookup_key=%d not found!\n", lookup_key); + LOG_INFO("Object with lookup_key=%d not found!\n", lookup_key); } - printf("New value after change!\n"); + LOG_INFO("New value after change!\n"); lookup_value = hg_hash_table_lookup(hash_table, &lookup_key); if (lookup_value != NULL) { - printf("Found in hash table with obj_id=%d, obj_name=%s, test=%s\n", lookup_value->obj_id, - lookup_value->obj_name, lookup_value->test); + LOG_INFO("Found in hash table with obj_id=%d, obj_name=%s, test=%s\n", lookup_value->obj_id, + lookup_value->obj_name, lookup_value->test); } else { - printf("Object with lookup_key=%d not found!\n", lookup_key); + LOG_INFO("Object with lookup_key=%d not found!\n", lookup_key); } - /* if (*value1 != *((int *)hg_hash_table_lookup(hash_table, key1))) { */ - /* fprintf(stderr, "Error: values do not match\n"); */ - /* ret = EXIT_FAILURE; */ - /* goto done; */ - /* } */ - /* hg_hash_table_remove(hash_table, key1); */ - - /* if (1 != hg_hash_table_num_entries(hash_table)) { */ - /* fprintf(stderr, "Error: was expecting 1 entry, got %u\n", */ - /* hg_hash_table_num_entries(hash_table)); */ - /* ret = EXIT_FAILURE; */ - /* goto done; */ - /* } */ - - /* hg_hash_table_iterate(hash_table, &hash_table_iter); */ - /* if (!hg_hash_table_iter_has_more(&hash_table_iter)) { */ - /* fprintf(stderr, "Error: there should be more values\n"); */ - /* ret = EXIT_FAILURE; */ - /* goto done; */ - /* } */ - /* if (*value2 != *((int *)hg_hash_table_iter_next(&hash_table_iter))) { */ - /* fprintf(stderr, "Error: values do not match\n"); */ - /* ret = EXIT_FAILURE; */ - /* goto done; */ - /* } */ - hg_hash_table_free(hash_table); return ret; } diff --git a/src/tests/helper/julia_helper_loader.c b/src/tests/helper/julia_helper_loader.c index 887051e46..56d255688 100644 --- a/src/tests/helper/julia_helper_loader.c +++ b/src/tests/helper/julia_helper_loader.c @@ -1,4 +1,5 @@ #include "julia_helper_loader.h" +#include "pdc_logger.h" void jl_load_module(const char *mod_name) @@ -7,16 +8,16 @@ jl_load_module(const char *mod_name) const char *julia_module_dir = getenv("PDC_JULIA_MODULE_DIR"); if (julia_module_dir == NULL || strlen(julia_module_dir) == 0) { // try to get it from PWD - printf("[PDC_JL_HELPER] Warning: PDC_JULIA_MODULE_DIR is not set, fallback to PWD!\n"); + LOG_WARNING("[PDC_JL_HELPER] Warning: PDC_JULIA_MODULE_DIR is not set, fallback to PWD!\n"); julia_module_dir = getenv("PWD"); } if (julia_module_dir == NULL || strlen(julia_module_dir) == 0) { // No way to find julia module directory - printf("[PDC_JL_HELPER] Error: Not able to find Julia module directory!\n"); + LOG_ERROR("[PDC_JL_HELPER] Error: Not able to find Julia module directory!\n"); exit(-1); } - printf("[PDC_JL_HELPER] Julia module directory: %s\n", julia_module_dir); + LOG_INFO("[PDC_JL_HELPER] Julia module directory: %s\n", julia_module_dir); /* get julia helper path */ char *julia_module_path = malloc(strlen(julia_module_dir) + strlen(mod_name) + 5); @@ -24,7 +25,7 @@ jl_load_module(const char *mod_name) strcat(julia_module_path, "/"); strcat(julia_module_path, mod_name); strcat(julia_module_path, ".jl"); - printf("[PDC_JL_HELPER] Julia module path: %s\n", julia_module_path); + LOG_INFO("[PDC_JL_HELPER] Julia module path: %s\n", julia_module_path); /* get include command */ char include_cmd[strlen(julia_module_path) + 30]; sprintf(include_cmd, "Base.include(Main, \"%s\")", julia_module_path); @@ -35,7 +36,7 @@ jl_load_module(const char *mod_name) jl_eval_string(include_cmd); jl_eval_string(using_cmd); - printf("[PDC_JL_HELPER] Loaded module %s\n", mod_name); + LOG_INFO("[PDC_JL_HELPER] Loaded module %s\n", mod_name); } void @@ -58,7 +59,7 @@ run_jl_function(const char *mod_name, const char *fun_name, jl_fn_args_t *args) jl_module_t * JuliaModule = (jl_module_t *)jl_eval_string(module_eval_cmd); jl_function_t *jl_func = jl_get_function(JuliaModule, fun_name); jl_value_t * result = jl_call(jl_func, args->args, args->nargs); - printf("[PDC_JL_HELPER] Function called: %s.%s\n", mod_name, fun_name); + LOG_INFO("[PDC_JL_HELPER] Function called: %s.%s\n", mod_name, fun_name); return result; } diff --git a/src/tests/idioms_ci_test.c b/src/tests/idioms_ci_test.c index 9f290dd07..fcbebaad1 100644 --- a/src/tests/idioms_ci_test.c +++ b/src/tests/idioms_ci_test.c @@ -45,11 +45,12 @@ compare_uint64(const void *a, const void *b) void print_usage(char *name) { - printf("%s \n", name); - printf("Summary: This test will create a number of objects which are attached with a number of tags. " - "Then, it will" - "perform different types queries supported by IDIOMS to retrieve the object IDs, and perform the " - "necessary validation.\n"); + LOG_JUST_PRINT("%s \n", name); + LOG_JUST_PRINT( + "Summary: This test will create a number of objects which are attached with a number of tags. " + "Then, it will" + "perform different types queries supported by IDIOMS to retrieve the object IDs, and perform the " + "necessary validation.\n"); } perr_t @@ -62,20 +63,20 @@ prepare_container(pdcid_t *pdc, pdcid_t *cont_prop, pdcid_t *cont, pdcid_t *obj_ // create a container property *cont_prop = PDCprop_create(PDC_CONT_CREATE, *pdc); if (*cont_prop <= 0) { - printf("[Client %d] Fail to create container property @ line %d!\n", world_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container property!\n", world_rank); goto done; } // create a container *cont = PDCcont_create("c1", *cont_prop); if (*cont <= 0) { - printf("[Client %d] Fail to create container @ line %d!\n", world_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container!\n", world_rank); goto done; } // create an object property *obj_prop = PDCprop_create(PDC_OBJ_CREATE, *pdc); if (*obj_prop <= 0) { - printf("[Client %d] Fail to create object property @ line %d!\n", world_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create object property!\n", world_rank); goto done; } @@ -99,7 +100,8 @@ insert_index_records(int world_rank, int world_size) snprintf(value, 63, "str%03dstr", i); if (PDC_Client_insert_obj_ref_into_dart(hash_algo, key, value, strlen(value) + 1, PDC_STRING, ref_type, i) < 0) { - printf("CLIENT %d failed to create index record %s %s %" PRIu64 "\n", world_rank, key, value, i); + LOG_ERROR("CLIENT %d failed to create index record %s %s %" PRIu64 "\n", world_rank, key, value, + i); ret_value |= FAIL; } free(key); @@ -111,7 +113,8 @@ insert_index_records(int world_rank, int world_size) *((int64_t *)value) = i; if (PDC_Client_insert_obj_ref_into_dart(hash_algo, key, value, sizeof(int64_t), PDC_INT64, ref_type, i) < 0) { - printf("CLIENT %d failed to create index record %s %" PRId64 " %d\n", world_rank, key, value, i); + LOG_ERROR("CLIENT %d failed to create index record %s %" PRId64 " %d\n", world_rank, key, value, + i); ret_value |= FAIL; } free(key); @@ -135,7 +138,8 @@ delete_index_records(int world_rank, int world_size) snprintf(value, 63, "str%03dstr", i); if (PDC_Client_delete_obj_ref_from_dart(hash_algo, key, value, strlen(value) + 1, PDC_STRING, ref_type, i) < 0) { - printf("CLIENT %d failed to create index record %s %s %" PRIu64 "\n", world_rank, key, value, i); + LOG_ERROR("CLIENT %d failed to create index record %s %s %" PRIu64 "\n", world_rank, key, value, + i); ret_value |= FAIL; } free(key); @@ -147,7 +151,8 @@ delete_index_records(int world_rank, int world_size) *((int64_t *)value) = i; if (PDC_Client_delete_obj_ref_from_dart(hash_algo, key, value, sizeof(int64_t), PDC_INT64, ref_type, i) < 0) { - printf("CLIENT %d failed to create index record %s %" PRId64 " %d\n", world_rank, key, value, i); + LOG_ERROR("CLIENT %d failed to create index record %s %" PRId64 " %d\n", world_rank, key, value, + i); ret_value |= FAIL; } free(key); @@ -161,7 +166,7 @@ validate_empty_result(int world_rank, int nres, uint64_t *pdc_ids) { int query_series = world_rank % 6; if (nres > 0) { - printf("fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); return query_series; } return -1; @@ -176,24 +181,24 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) switch (query_series) { case 0: if (nres != 1) { - printf("fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); step_failed = 0; } if (pdc_ids[0] != 109) { - printf("fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); step_failed = 0; } break; case 1: if (nres != 10) { - printf("fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); step_failed = 1; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { - printf("fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); step_failed = 1; break; } @@ -201,14 +206,14 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 2: if (nres != 10) { - printf("fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); step_failed = 2; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i * 100 + 9) { - printf("fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); step_failed = 2; break; } @@ -216,8 +221,8 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 3: if (nres != 20) { - printf("fail to query kvtag [%s] with rank %d, nres = %d, expected 20\n", "*09*=*09*", - world_rank, nres); + LOG_ERROR("Fail to query kvtag [%s] with rank %d, nres = %d, expected 20\n", "*09*=*09*", + world_rank, nres); step_failed = 3; } // the result is not in order, so we need to sort the result first @@ -226,9 +231,9 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) 99, 109, 209, 309, 409, 509, 609, 709, 809, 909}; for (i = 0; i < nres; i++) { if (pdc_ids[i] != expected[i]) { - printf("fail to query kvtag [%s] with rank %d, pdc_ids[%d]=%" PRIu64 ", expected %" PRIu64 - "\n", - "*09*=*09*", world_rank, i, pdc_ids[i], expected[i]); + LOG_ERROR("Fail to query kvtag [%s] with rank %d, pdc_ids[%d]=%" PRIu64 + ", expected %" PRIu64 "\n", + "*09*=*09*", world_rank, i, pdc_ids[i], expected[i]); step_failed = 3; break; } @@ -236,24 +241,24 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 4: if (nres != 1) { - printf("fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); step_failed = 4; } if (pdc_ids[0] != 109) { - printf("fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); step_failed = 4; } break; case 5: if (nres != 10) { - printf("fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); step_failed = 5; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { - printf("fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); step_failed = 5; break; } @@ -277,7 +282,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // exact string query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "str109str=\"str109str\"", ref_type, &nres, &pdc_ids) < 0) { - printf("fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); step_failed = 0; }; break; @@ -285,7 +290,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // prefix string query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "str09*=\"str09*\"", ref_type, &nres, &pdc_ids) < 0) { - printf("fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); step_failed = 1; } break; @@ -293,7 +298,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // suffix string query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "*09str=\"*09str\"", ref_type, &nres, &pdc_ids) < 0) { - printf("fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); step_failed = 2; } break; @@ -301,7 +306,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // // infix string query // if (PDC_Client_search_obj_ref_through_dart(hash_algo, "*09*=\"*09*\"", ref_type, &nres, // &pdc_ids) < 0) { - // printf("fail to query kvtag [%s] with rank %d\n", "*09*=*09*", world_rank); + // LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09*=*09*", world_rank); // step_failed = 3; // } // break; @@ -309,7 +314,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // exact integer query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "intkey=109", ref_type, &nres, &pdc_ids) < 0) { - printf("fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); step_failed = 4; } break; @@ -317,7 +322,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // range integer query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "intkey=90|~|99", ref_type, &nres, &pdc_ids) < 0) { - printf("fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); step_failed = 5; } break; @@ -345,7 +350,7 @@ main(int argc, char *argv[]) // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, world_rank) < 0) { - println("fail to prepare container @ line %d", __LINE__); + println("fail to prepare container"); goto done; } @@ -380,7 +385,7 @@ main(int argc, char *argv[]) // we are performing 1000 insertion operations for string value and 1000 times for numerical values. perr_t ret_value = insert_index_records(world_rank, world_size); if (ret_value == FAIL) { - printf("CLIENT %d failed to insert index records\n", world_rank); + LOG_ERROR("CLIENT %d failed to insert index records\n", world_rank); } assert(ret_value == SUCCEED); @@ -391,8 +396,8 @@ main(int argc, char *argv[]) #endif // print performance and timing information if (world_rank == 0) { - printf("Index Insertion 2000 times, time: %.5f ms, TPS = %.5f\n", total_time * 1000.0, - 2000.0 / total_time); + LOG_INFO("Index Insertion 2000 times, time: %.5f ms, TPS = %.5f\n", total_time * 1000.0, + 2000.0 / total_time); } // perform 1000 times query test, each test will be performed by a different client, @@ -402,8 +407,8 @@ main(int argc, char *argv[]) int step_failed = search_through_index(world_rank, world_size, validate_query_result); char query_types[6][20] = {"EXACT STRING", "PREFIX", "SUFFIX", "INFIX", "EXACT NUMBER", "RANGE"}; if (step_failed >= 0) { - printf("CLIENT %d failed to search index for query type %s\n", world_rank, - query_types[step_failed]); + LOG_ERROR("CLIENT %d failed to search index for query type %s\n", world_rank, + query_types[step_failed]); } assert(step_failed < 0); } @@ -415,14 +420,14 @@ main(int argc, char *argv[]) #endif // print performance and timing information if (world_rank == 0) { - printf("Index Query %d times, time: %.5f ms, TPS = %.5f\n", 1000 * world_size, total_time * 1000.0, - 1000.0 * world_size / total_time); + LOG_INFO("Index Query %d times, time: %.5f ms, TPS = %.5f\n", 1000 * world_size, total_time * 1000.0, + 1000.0 * world_size / total_time); } // delete the index records. ret_value = delete_index_records(world_rank, world_size); if (ret_value == FAIL) { - printf("CLIENT %d failed to delete index records\n", world_rank); + LOG_ERROR("CLIENT %d failed to delete index records\n", world_rank); } assert(ret_value == SUCCEED); @@ -433,16 +438,16 @@ main(int argc, char *argv[]) #endif // print performance and timing information if (world_rank == 0) { - printf("Index Deletion 2000 times, time: %.5f ms, TPS = %.5f\n", total_time * 1000.0, - 2000.0 / total_time); + LOG_INFO("Index Deletion 2000 times, time: %.5f ms, TPS = %.5f\n", total_time * 1000.0, + 2000.0 / total_time); } for (i = 0; i < 1000; i++) { int step_failed = search_through_index(world_rank, world_size, validate_empty_result); char query_types[6][20] = {"EXACT STRING", "PREFIX", "SUFFIX", "INFIX", "EXACT NUMBER", "RANGE"}; if (step_failed >= 0) { - printf("CLIENT %d failed to search index for query type %s\n", world_rank, - query_types[step_failed]); + LOG_ERROR("CLIENT %d failed to search index for query type %s\n", world_rank, + query_types[step_failed]); } assert(step_failed < 0); } @@ -453,46 +458,46 @@ main(int argc, char *argv[]) #endif // print performance and timing information if (world_rank == 0) { - printf("EMPTY Query %d times, time: %.5f ms, TPS = %.5f\n", 1000 * world_size, total_time * 1000.0, - 1000.0 * world_size / total_time); + LOG_INFO("EMPTY Query %d times, time: %.5f ms, TPS = %.5f\n", 1000 * world_size, total_time * 1000.0, + 1000.0 * world_size / total_time); } done: // close a container if (PDCcont_close(cont) < 0) { if (world_rank == 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); } } else { if (world_rank == 0) - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close an object property if (PDCprop_close(obj_prop) < 0) { if (world_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (world_rank == 0) - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { if (world_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (world_rank == 0) - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { if (world_rank == 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/import_vpic.c b/src/tests/import_vpic.c index ea1aeaa77..efa6f25ac 100644 --- a/src/tests/import_vpic.c +++ b/src/tests/import_vpic.c @@ -14,7 +14,7 @@ void print_usage(char *name) { - printf("Usage: %s /path/to/file region_size_MB\n", name); + LOG_JUST_PRINT("Usage: %s /path/to/file region_size_MB\n", name); } int @@ -52,7 +52,7 @@ main(int argc, char *argv[]) region_size = region_MB * 1048576; if (my_rank == 0) { - printf("Region size = %d MB, reading from file [%s], \n", region_MB, file_name); + LOG_INFO("Region size = %d MB, reading from file [%s], \n", region_MB, file_name); } fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -63,21 +63,21 @@ main(int argc, char *argv[]) file_id = H5Fopen(file_name, H5F_ACC_RDONLY, fapl); if (file_id < 0) { - printf("Error opening file [%s]!\n", file_name); + LOG_ERROR("Error opening file [%s]!\n", file_name); goto done; } group_name = "Step#0"; group_id = H5Gopen(file_id, group_name, H5P_DEFAULT); if (group_id < 0) { - printf("Error opening group [%s]!\n", group_name); + LOG_ERROR("Error opening group [%s]!\n", group_name); goto done; } for (i = 0; i < NVAR; i++) { dset_ids[i] = H5Dopen(group_id, dset_names[i], H5P_DEFAULT); if (dset_ids[i] < 0) { - printf("Error opening dataset [%s]!\n", dset_names[i]); + LOG_ERROR("Error opening dataset [%s]!\n", dset_names[i]); goto done; } } @@ -118,7 +118,7 @@ main(int argc, char *argv[]) if (my_rank == 0) { obj_ids[i] = PDCobj_create(cont_id, dset_names[i], obj_prop); if (obj_ids[i] <= 0) { - printf("Error getting an object %s from server, exit...\n", dset_names[i]); + LOG_ERROR("Error getting an object %s from server, exit...\n", dset_names[i]); goto done; } } @@ -130,7 +130,7 @@ main(int argc, char *argv[]) ret = PDC_Client_query_metadata_name_timestep(dset_names[i], 0, &obj_meta); #endif if (ret != SUCCEED || obj_meta == NULL || obj_meta->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); exit(-1); } @@ -143,7 +143,7 @@ main(int argc, char *argv[]) memspace = H5Screate_simple(1, &elem_count, NULL); H5Sselect_hyperslab(filespace, H5S_SELECT_SET, &elem_offset, NULL, &elem_count, NULL); if (elem_offset + elem_count > dims[0]) { - printf("%d ERROR - off %llu count %llu\n", my_rank, elem_offset, elem_count); + LOG_ERROR("%d ERROR - off %llu count %llu\n", my_rank, elem_offset, elem_count); } hg_ret = H5Dread(dset_ids[i], H5T_NATIVE_FLOAT, memspace, filespace, H5P_DEFAULT, data); H5Sclose(memspace); @@ -151,18 +151,15 @@ main(int argc, char *argv[]) obj_region.offset[0] = elem_offset * sizeof(float); obj_region.size[0] = elem_count * sizeof(float); - /* printf("%d HDF5 off %llu count %llu, PDC off %lu count %lu\n", */ - /* my_rank, elem_offset, elem_count, obj_region.offset[0], obj_region.size[0]); */ - ret = PDC_Client_write(obj_meta, &obj_region, data); if (ret != SUCCEED) { - printf("Error with PDC_Client_write!\n"); + LOG_ERROR("Error with PDC_Client_write!\n"); exit(-1); } if ((my_rank == 0 || my_rank == num_procs - 1) && j > 0 && j % (my_nregion / 10) == 0) - printf("Rank %d - obj [%s] Imported %lld/%lld regions\n", my_rank, dset_names[i], j, - my_nregion); + LOG_INFO("Rank %d - obj [%s] Imported %lld/%lld regions\n", my_rank, dset_names[i], j, + my_nregion); } // End for j @@ -171,7 +168,7 @@ main(int argc, char *argv[]) #endif if (my_rank == 0) - printf("\n\nFinished import object %s\n\n", dset_names[i]); + LOG_INFO("\n\nFinished import object %s\n\n", dset_names[i]); fflush(stdout); } // End for i diff --git a/src/tests/init_only.c b/src/tests/init_only.c index 3f69028de..cff092bc8 100644 --- a/src/tests/init_only.c +++ b/src/tests/init_only.c @@ -8,7 +8,7 @@ void print_usage() { - printf("Usage: srun -n ./data_server_read obj_name size_MB\n"); + LOG_JUST_PRINT("Usage: srun -n ./data_server_read obj_name size_MB\n"); } int @@ -29,25 +29,25 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); - printf("PROC[%d] FINISHED!\n", rank); + LOG_INFO("PROC[%d] FINISHED!\n", rank); // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container\n"); + LOG_ERROR("Fail to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/kvtag_add_get.c b/src/tests/kvtag_add_get.c index ad06b506b..dc19b30fd 100644 --- a/src/tests/kvtag_add_get.c +++ b/src/tests/kvtag_add_get.c @@ -44,48 +44,48 @@ main() // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); else - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont > 0) - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); else - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop1 > 0) - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); else - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop2 > 0) - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); else - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); // create first object obj1 = PDCobj_create(cont, "o1", obj_prop1); if (obj1 > 0) - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); else - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); // create second object obj2 = PDCobj_create(cont, "o2", obj_prop2); if (obj2 > 0) - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); else - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); kvtag1.name = "key1string"; kvtag1.value = (void *)v1; @@ -103,55 +103,55 @@ main() kvtag3.size = sizeof(double); if (PDCobj_put_tag(obj1, kvtag1.name, kvtag1.value, kvtag1.type, kvtag1.size) < 0) - printf("fail to add a kvtag to o1\n"); + LOG_ERROR("Fail to add a kvtag to o1\n"); else - printf("successfully added a kvtag to o1\n"); + LOG_INFO("successfully added a kvtag to o1\n"); if (PDCobj_put_tag(obj2, kvtag2.name, kvtag2.value, kvtag2.type, kvtag2.size) < 0) - printf("fail to add a kvtag to o1\n"); + LOG_ERROR("Fail to add a kvtag to o1\n"); else - printf("successfully added a kvtag to o1\n"); + LOG_INFO("successfully added a kvtag to o1\n"); if (PDCobj_put_tag(obj2, kvtag3.name, kvtag3.value, kvtag3.type, kvtag3.size) < 0) - printf("fail to add a kvtag to o1\n"); + LOG_ERROR("Fail to add a kvtag to o1\n"); else - printf("successfully added a kvtag to o1\n"); + LOG_INFO("successfully added a kvtag to o1\n"); if (PDCobj_get_tag(obj1, kvtag1.name, (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - printf("fail to get a kvtag from o1\n"); + LOG_ERROR("Fail to get a kvtag from o1\n"); else - printf("successfully retrieved a kvtag [%s] = [%s] from o1\n", kvtag1.name, (char *)value1); + LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", kvtag1.name, (char *)value1); if (PDCobj_get_tag(obj2, kvtag2.name, (void *)&value2, (void *)&type2, (void *)&value_size) < 0) - printf("fail to get a kvtag from o2\n"); + LOG_ERROR("Fail to get a kvtag from o2\n"); else - printf("successfully retrieved a kvtag [%s] = [%d] from o2\n", kvtag2.name, *(int *)value2); + LOG_INFO("successfully retrieved a kvtag [%s] = [%d] from o2\n", kvtag2.name, *(int *)value2); if (PDCobj_get_tag(obj2, kvtag3.name, (void *)&value3, (void *)&type3, (void *)&value_size) < 0) - printf("fail to get a kvtag from o2\n"); + LOG_ERROR("Fail to get a kvtag from o2\n"); else - printf("successfully retrieved a kvtag [%s] = [%f] from o2\n", kvtag3.name, *(double *)value3); + LOG_INFO("successfully retrieved a kvtag [%s] = [%f] from o2\n", kvtag3.name, *(double *)value3); if (PDCobj_del_tag(obj1, kvtag1.name) < 0) - printf("fail to delete a kvtag from o1\n"); + LOG_ERROR("Fail to delete a kvtag from o1\n"); else - printf("successfully deleted a kvtag [%s] from o1\n", kvtag1.name); + LOG_INFO("successfully deleted a kvtag [%s] from o1\n", kvtag1.name); v1 = "New Value After Delete"; kvtag1.value = (void *)v1; kvtag1.type = PDC_STRING; kvtag1.size = strlen(v1) + 1; if (PDCobj_put_tag(obj1, kvtag1.name, kvtag1.value, kvtag1.type, kvtag1.size) < 0) - printf("fail to add a kvtag to o1\n"); + LOG_ERROR("Fail to add a kvtag to o1\n"); else - printf("successfully added a kvtag to o1\n"); + LOG_INFO("successfully added a kvtag to o1\n"); /* PDC_free_kvtag(&value1); */ if (PDCobj_get_tag(obj1, kvtag1.name, (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - printf("fail to get a kvtag from o1\n"); + LOG_ERROR("Fail to get a kvtag from o1\n"); else - printf("successfully retrieved a kvtag [%s] = [%s] from o1\n", kvtag1.name, (char *)value1); + LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", kvtag1.name, (char *)value1); /* PDC_free_kvtag(&value1); */ /* PDC_free_kvtag(&value2); */ @@ -159,41 +159,41 @@ main() // close first object if (PDCobj_close(obj1) < 0) - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); else - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); // close second object if (PDCobj_close(obj2) < 0) - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); else - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); else - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); // close a container property if (PDCprop_close(obj_prop1) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); if (PDCprop_close(obj_prop2) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); // close pdc if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/kvtag_add_get_benchmark.c b/src/tests/kvtag_add_get_benchmark.c index a682e30ee..5f84c9eb0 100644 --- a/src/tests/kvtag_add_get_benchmark.c +++ b/src/tests/kvtag_add_get_benchmark.c @@ -38,7 +38,7 @@ atoui64(char *arg) uint64_t num = strtoull(arg, &endptr, 10); if (*endptr != '\0') { - printf("Invalid input: %s\n", arg); + LOG_ERROR("Invalid input: %s\n", arg); return 1; } return num; @@ -64,7 +64,7 @@ int assign_work_to_rank(uint64_t rank, uint64_t size, uint64_t nwork, uint64_t *my_count, uint64_t *my_start) { if (rank > size || my_count == NULL || my_start == NULL) { - printf("assign_work_to_rank(): Error with input!\n"); + LOG_ERROR("assign_work_to_rank(): Error with input!\n"); return -1; } if (nwork < size) { @@ -114,16 +114,16 @@ gen_strings(int n_strings, int string_len) void print_usage(char *name) { - printf("Usage: %s \n\n", name); + LOG_JUST_PRINT("Usage: %s \n\n", name); - printf(" n_obj : The total number of objects (positive integer).\n"); - printf(" n_obj_incr : The increment in the number of objects per step (positive integer).\n"); - printf(" n_attr : The number of attributes per object (positive integer).\n"); - printf(" n_attr_len : The length of each attribute (positive integer).\n"); - printf(" n_query : The number of queries to be performed (positive integer).\n\n"); + LOG_JUST_PRINT(" n_obj : The total number of objects (positive integer).\n"); + LOG_JUST_PRINT(" n_obj_incr : The increment in the number of objects per step (positive integer).\n"); + LOG_JUST_PRINT(" n_attr : The number of attributes per object (positive integer).\n"); + LOG_JUST_PRINT(" n_attr_len : The length of each attribute (positive integer).\n"); + LOG_JUST_PRINT(" n_query : The number of queries to be performed (positive integer).\n\n"); - printf("Example:\n"); - printf(" %s 100 10 5 20 50\n\n", name); + LOG_JUST_PRINT("Example:\n"); + LOG_JUST_PRINT(" %s 100 10 5 20 50\n\n", name); } /** @@ -153,20 +153,20 @@ init_test(int my_rank, int proc_num, uint64_t n_obj_incr, uint64_t n_query, uint // create a container property *cont_prop = PDCprop_create(PDC_CONT_CREATE, *pdc); if (*cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container *cont = PDCcont_create("c1", *cont_prop); if (*cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property *obj_prop = PDCprop_create(PDC_OBJ_CREATE, *pdc); if (*obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); if (my_rank == 0) - printf("create obj_ids array\n"); + LOG_INFO("create obj_ids array\n"); // Create a number of objects, add at least one tag to that object assign_work_to_rank((uint64_t)my_rank, (uint64_t)proc_num, n_obj_incr, my_obj, my_obj_s); @@ -195,7 +195,7 @@ create_object(uint64_t my_obj, uint64_t my_obj_s, pdcid_t cont, pdcid_t obj_prop sprintf(obj_name, "obj%" PRIu64 "", v); obj_ids[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj_ids[i] <= 0) - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); } } @@ -222,7 +222,7 @@ add_n_tags(uint64_t my_obj, uint64_t my_obj_s, uint64_t n_attr, char **tag_value sprintf(tag_name, "tag%" PRIu64 ".%" PRIu64 "", v, j); if (PDCobj_put_tag(obj_ids[i], tag_name, (void *)tag_values[j], PDC_STRING, tag_value_len + 1) < 0) - printf("fail to add a kvtag to o%" PRIu64 "\n", v); + LOG_ERROR("Fail to add a kvtag to o%" PRIu64 "\n", v); } } } @@ -246,7 +246,7 @@ get_object_tags(pdcid_t obj_id, uint64_t obj_name_v, uint64_t n_attr, void **tag for (i = 0; i < n_attr; i++) { sprintf(tag_name, "tag%" PRIu64 ".%" PRIu64 "", obj_name_v, i); if (PDCobj_get_tag(obj_id, tag_name, (void **)&tag_values[i], &tag_type, (void *)&value_size[i]) < 0) - printf("fail to get a kvtag from o%" PRIu64 "\n", obj_name_v); + LOG_ERROR("Fail to get a kvtag from o%" PRIu64 "\n", obj_name_v); } } @@ -288,8 +288,8 @@ check_and_release_query_result(uint64_t n_query, uint64_t my_obj, uint64_t my_ob for (j = 0; j < n_attr; j++) { char *query_rst = (char *)values[j + i * n_attr]; if (strcmp(query_rst, tag_values[j]) != 0) { - printf("Error with retrieved tag from o%" PRIu64 ". Expected %s, Found %s \n", v, - tag_values[j], query_rst); + LOG_ERROR("Error with retrieved tag from o%" PRIu64 ". Expected %s, Found %s \n", v, + tag_values[j], query_rst); } free(values[j + i * n_attr]); } @@ -299,7 +299,7 @@ check_and_release_query_result(uint64_t n_query, uint64_t my_obj, uint64_t my_ob // for (i = 0; i < my_obj; i++) { // v = i + my_obj_s; // if (PDCobj_close(obj_ids[i]) < 0) - // printf("fail to close object o%" PRIu64 "\n", v); + // LOG_ERROR("Fail to close object o%" PRIu64 "\n", v); // } } @@ -308,18 +308,18 @@ closePDC(pdcid_t pdc, pdcid_t cont_prop, pdcid_t cont, pdcid_t obj_prop) { // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(obj_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); // close pdc if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); } int @@ -358,19 +358,19 @@ main(int argc, char *argv[]) if (n_obj_incr > n_obj) { if (my_rank == 0) - printf("n_obj_incr cannot be larger than n_obj! Exiting...\n"); + LOG_ERROR("n_obj_incr cannot be larger than n_obj! Exiting...\n"); goto done; } if (n_query > n_obj_incr) { if (my_rank == 0) { - printf("n_query cannot be larger than n_obj_incr! Exiting...\n"); + LOG_ERROR("n_query cannot be larger than n_obj_incr! Exiting...\n"); } goto done; } if (my_rank == 0) - printf("Create %" PRIu64 " obj, %" PRIu64 " tags, query %" PRIu64 "\n", n_obj, n_attr, n_query); + LOG_INFO("Create %" PRIu64 " obj, %" PRIu64 " tags, query %" PRIu64 "\n", n_obj, n_attr, n_query); // making necessary preparation for the test. @@ -400,15 +400,15 @@ main(int argc, char *argv[]) total_object_count += n_obj_incr; if (my_rank == 0) { - printf("Iteration %" PRIu64 " : Objects: %" PRIu64 - " , Time: %.5e sec. Object throughput in this iteration: " - "%.5e .\n", - k, n_obj_incr, step_elapse, ((double)n_obj_incr) / step_elapse); - printf("Overall %" PRIu64 " : Objects: %" PRIu64 - " , Time: %.5e sec. Overall object throughput: " - "%.5e .\n", - k, total_object_count, total_object_time, - ((double)total_object_count) / total_object_time); + LOG_INFO("Iteration %" PRIu64 " : Objects: %" PRIu64 + " , Time: %.5e sec. Object throughput in this iteration: " + "%.5e .\n", + k, n_obj_incr, step_elapse, ((double)n_obj_incr) / step_elapse); + LOG_INFO("Overall %" PRIu64 " : Objects: %" PRIu64 + " , Time: %.5e sec. Overall object throughput: " + "%.5e .\n", + k, total_object_count, total_object_time, + ((double)total_object_count) / total_object_time); } #ifdef ENABLE_MPI @@ -425,12 +425,12 @@ main(int argc, char *argv[]) total_tag_count += n_obj_incr * n_attr; #endif if (my_rank == 0) { - printf("Iteration %" PRIu64 " : Tags: %" PRIu64 - " , Time: %.5e sec. Tag throughput in this iteration: %.5e .\n", - k, n_obj_incr * n_attr, step_elapse, (double)(n_obj_incr * n_attr) / step_elapse); - printf("Overall %" PRIu64 " : Tags: %" PRIu64 - " , Time: %.5e sec. Overall tag throughput: %.5e .\n", - k, total_tag_count, total_tag_time, ((double)total_tag_count) / total_tag_time); + LOG_INFO("Iteration %" PRIu64 " : Tags: %" PRIu64 + " , Time: %.5e sec. Tag throughput in this iteration: %.5e .\n", + k, n_obj_incr * n_attr, step_elapse, (double)(n_obj_incr * n_attr) / step_elapse); + LOG_INFO("Overall %" PRIu64 " : Tags: %" PRIu64 + " , Time: %.5e sec. Overall tag throughput: %.5e .\n", + k, total_tag_count, total_tag_time, ((double)total_tag_count) / total_tag_time); } query_rst_cache = (void **)malloc(my_query * n_attr * sizeof(void *)); @@ -449,14 +449,14 @@ main(int argc, char *argv[]) total_query_count += n_query * n_attr; #endif if (my_rank == 0) { - printf("Iteration %" PRIu64 " : Queries: %" PRIu64 - " , Time: %.5e sec. Query throughput in this iteration: " - "%.5e .\n", - k, n_query * n_attr, step_elapse, (double)(n_query * n_attr) / step_elapse); - printf("Overall %" PRIu64 " : Queries: %" PRIu64 - " , Time: %.5e sec. Overall query throughput: " - "%.5e .\n", - k, total_query_count, total_query_time, ((double)total_query_count) / total_query_time); + LOG_INFO("Iteration %" PRIu64 " : Queries: %" PRIu64 + " , Time: %.5e sec. Query throughput in this iteration: " + "%.5e .\n", + k, n_query * n_attr, step_elapse, (double)(n_query * n_attr) / step_elapse); + LOG_INFO("Overall %" PRIu64 " : Queries: %" PRIu64 + " , Time: %.5e sec. Overall query throughput: " + "%.5e .\n", + k, total_query_count, total_query_time, ((double)total_query_count) / total_query_time); } check_and_release_query_result(my_query, my_obj, my_obj_s, n_attr, tag_values, query_rst_cache, @@ -469,17 +469,17 @@ main(int argc, char *argv[]) } while (total_object_count < n_obj); if (my_rank == 0) { - printf("Final Report: \n"); - printf("[Final Report 1] Servers: %" PRIu64 " , Clients: %" PRIu64 " , C/S ratio: %.5e \n", n_servers, - n_clients, (double)n_clients / (double)n_servers); - printf("[Final Report 2] Iterations: %" PRIu64 " , Objects: %" PRIu64 " , Tags/Object: %" PRIu64 - " , Queries/Iteration: " - "%" PRIu64 " , \n", - k, total_object_count, n_attr, n_query); - printf("[Final Report 3] Object throughput: %.5e , Tag Throughput: %.5e , Query Throughput: %.5e ,", - (double)total_object_count / total_object_time, - (double)(total_object_count * n_attr) / total_tag_time, - (double)(total_query_count * n_attr) / total_query_time); + LOG_ERROR("Final Report: \n"); + LOG_INFO("[Final Report 1] Servers: %" PRIu64 " , Clients: %" PRIu64 " , C/S ratio: %.5e \n", + n_servers, n_clients, (double)n_clients / (double)n_servers); + LOG_INFO("[Final Report 2] Iterations: %" PRIu64 " , Objects: %" PRIu64 " , Tags/Object: %" PRIu64 + " , Queries/Iteration: " + "%" PRIu64 " , \n", + k, total_object_count, n_attr, n_query); + LOG_INFO("[Final Report 3] Object throughput: %.5e , Tag Throughput: %.5e , Query Throughput: %.5e ,", + (double)total_object_count / total_object_time, + (double)(total_object_count * n_attr) / total_tag_time, + (double)(total_query_count * n_attr) / total_query_time); } for (i = 0; i < n_attr; i++) { diff --git a/src/tests/kvtag_add_get_scale.c b/src/tests/kvtag_add_get_scale.c index dc14c597e..3a3b9b476 100644 --- a/src/tests/kvtag_add_get_scale.c +++ b/src/tests/kvtag_add_get_scale.c @@ -34,7 +34,7 @@ int assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) { if (rank > size || my_count == NULL || my_start == NULL) { - printf("assign_work_to_rank(): Error with input!\n"); + LOG_INFO("assign_work_to_rank(): Error with input!\n"); return -1; } if (nwork < size) { @@ -61,7 +61,7 @@ assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) void print_usage(char *name) { - printf("%s n_obj n_add_tag n_query\n", name); + LOG_JUST_PRINT("%s n_obj n_add_tag n_query\n", name); } int @@ -94,7 +94,7 @@ main(int argc, char *argv[]) if (n_add_tag > n_obj || n_query > n_obj) { if (my_rank == 0) - printf("n_add_tag or n_query larger than n_obj! Exiting...\n"); + LOG_ERROR("n_add_tag or n_query larger than n_obj! Exiting...\n"); goto done; } @@ -107,7 +107,7 @@ main(int argc, char *argv[]) query_1percent = my_query / 100; if (my_rank == 0) - printf("Create %d obj, %d tags, query %d\n", my_obj, my_add_tag, my_query); + LOG_INFO("Create %d obj, %d tags, query %d\n", my_obj, my_add_tag, my_query); // create a pdc pdc = PDCinit("pdc"); @@ -115,17 +115,17 @@ main(int argc, char *argv[]) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); // Create a number of objects, add at least one tag to that object obj_ids = (pdcid_t *)calloc(my_obj, sizeof(pdcid_t)); @@ -139,7 +139,7 @@ main(int argc, char *argv[]) sprintf(obj_name, "obj%d", my_obj_s + i); obj_ids[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj_ids[i] <= 0) - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); if (i > 0 && i % obj_1percent == 0) { #ifdef ENABLE_MPI @@ -149,8 +149,8 @@ main(int argc, char *argv[]) int current_percentage = i / obj_1percent; int estimated_current_object_number = n_obj / 100 * current_percentage; double tps = estimated_current_object_number / percent_time; - printf("[OBJ PROGRESS %3d%% ] %11d objects, %7.2f seconds, TPS: %10.2f \n", - current_percentage, estimated_current_object_number, percent_time, tps); + LOG_INFO("[OBJ PROGRESS %3d%% ] %11d objects, %7.2f seconds, TPS: %10.2f \n", + current_percentage, estimated_current_object_number, percent_time, tps); } #endif } @@ -162,8 +162,8 @@ main(int argc, char *argv[]) #endif if (my_rank == 0) - printf("Total time to create %11d objects: %7.2f , throughput %10.2f \n", n_obj, total_time, - n_obj / total_time); + LOG_INFO("Total time to create %11d objects: %7.2f , throughput %10.2f \n", n_obj, total_time, + n_obj / total_time); // Add tags kvtag.name = "Group"; @@ -178,7 +178,7 @@ main(int argc, char *argv[]) for (i = 0; i < my_add_tag; i++) { v = i + my_add_tag_s; if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); if (i % tag_1percent == 0) { #ifdef ENABLE_MPI @@ -188,8 +188,8 @@ main(int argc, char *argv[]) int current_percentage = i / tag_1percent; int estimated_current_tag_number = n_obj / 100 * current_percentage; double tps = estimated_current_tag_number / percent_time; - printf("[TAG PROGRESS %3d%% ] %11d tags, %7.2f seconds, TPS: %10.2f \n", current_percentage, - estimated_current_tag_number, percent_time, tps); + LOG_INFO("[TAG PROGRESS %3d%% ] %11d tags, %7.2f seconds, TPS: %10.2f \n", current_percentage, + estimated_current_tag_number, percent_time, tps); } #endif } @@ -200,8 +200,8 @@ main(int argc, char *argv[]) total_time = MPI_Wtime() - stime; #endif if (my_rank == 0) - printf("Total time to add tags to %11d objects: %7.2f , throughput %10.2f \n", n_add_tag, total_time, - n_add_tag / total_time); + LOG_INFO("Total time to add tags to %11d objects: %7.2f , throughput %10.2f \n", n_add_tag, + total_time, n_add_tag / total_time); values = (void **)calloc(my_query, sizeof(void *)); @@ -212,7 +212,7 @@ main(int argc, char *argv[]) for (i = 0; i < my_query; i++) { if (PDCobj_get_tag(obj_ids[i], kvtag.name, (void *)&values[i], (void *)&value_type, (void *)&value_size) < 0) - printf("fail to get a kvtag from o%d\n", i + my_query_s); + LOG_ERROR("Fail to get a kvtag from o%d\n", i + my_query_s); if (i % query_1percent == 0) { #ifdef ENABLE_MPI @@ -222,8 +222,8 @@ main(int argc, char *argv[]) int current_percentage = i / query_1percent; int estimated_current_query_number = n_obj / 100 * current_percentage; double tps = estimated_current_query_number / percent_time; - printf("[QRY PROGRESS %3d%% ] %11d queries, %7.2f seconds, TPS: %10.2f \n", - current_percentage, estimated_current_query_number, percent_time, tps); + LOG_INFO("[QRY PROGRESS %3d%% ] %11d queries, %7.2f seconds, TPS: %10.2f \n", + current_percentage, estimated_current_query_number, percent_time, tps); } #endif } @@ -234,48 +234,22 @@ main(int argc, char *argv[]) total_time = MPI_Wtime() - stime; #endif if (my_rank == 0) - printf("Total time to retrieve 1 tag from %11d objects: %7.2f , throughput %10.2f \n", n_query, - total_time, n_query / total_time); + LOG_INFO("Total time to retrieve 1 tag from %11d objects: %7.2f , throughput %10.2f \n", n_query, + total_time, n_query / total_time); fflush(stdout); for (i = 0; i < my_query; i++) { if (*(int *)(values[i]) != i + my_add_tag_s) - printf("Error with retrieved tag from o%d\n", i + my_query_s); + LOG_ERROR("Error with retrieved tag from o%d\n", i + my_query_s); free(values[i]); } free(values); if (my_rank == 0) { - printf("Done checking values\n"); + LOG_INFO("Done checking values\n"); fflush(stdout); } - /* // close first object */ - /* for (i = 0; i < my_obj; i++) { */ - /* if (PDCobj_close(obj_ids[i]) < 0) */ - /* printf("fail to close object o%d\n", i + my_obj_s); */ - /* } */ - - /* // close a container */ - /* if (PDCcont_close(cont) < 0) */ - /* printf("fail to close container c1\n"); */ - - /* // close a container property */ - /* if (PDCprop_close(obj_prop) < 0) */ - /* printf("Fail to close property @ line %d\n", __LINE__); */ - - /* if (PDCprop_close(cont_prop) < 0) */ - /* printf("Fail to close property @ line %d\n", __LINE__); */ - - /* // close pdc */ - /* if (PDCclose(pdc) < 0) */ - /* printf("fail to close PDC\n"); */ - - /* if (my_rank == 0) { */ - /* printf("Done closing PDC\n"); */ - /* fflush(stdout); */ - /* } */ - done: #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/kvtag_affix_query_scale.c b/src/tests/kvtag_affix_query_scale.c index 434292f62..40986aa27 100644 --- a/src/tests/kvtag_affix_query_scale.c +++ b/src/tests/kvtag_affix_query_scale.c @@ -37,7 +37,7 @@ int assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) { if (rank > size || my_count == NULL || my_start == NULL) { - printf("assign_work_to_rank(): Error with input!\n"); + LOG_ERROR("assign_work_to_rank(): Error with input!\n"); return -1; } if (nwork < size) { @@ -64,19 +64,21 @@ assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) void print_usage(char *name) { - printf("%s n_obj n_round n_selectivity is_using_dart query_type comm_type\n", name); - printf("Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " - "will " - "perform n_round collective queries against the tags, each query from each client should get " - "a whole result set.\n"); - printf("Parameters:\n"); - printf(" n_obj: number of objects\n"); - printf(" n_round: number of rounds, it can be the total number of tags too, as each round will perform " - "one query against one tag\n"); - printf(" n_selectivity: selectivity, on a 100 scale. \n"); - printf(" is_using_dart: 1 for using dart, 0 for not using dart\n"); - printf(" query_type: -1 for no query, 0 for exact, 1 for prefix, 2 for suffix, 3 for infix\n"); - printf(" comm_type: 0 for point-to-point, 1 for collective\n"); + LOG_JUST_PRINT("%s n_obj n_round n_selectivity is_using_dart query_type comm_type\n", name); + LOG_JUST_PRINT( + "Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " + "will " + "perform n_round collective queries against the tags, each query from each client should get " + "a whole result set.\n"); + LOG_JUST_PRINT("Parameters:\n"); + LOG_JUST_PRINT(" n_obj: number of objects\n"); + LOG_JUST_PRINT( + " n_round: number of rounds, it can be the total number of tags too, as each round will perform " + "one query against one tag\n"); + LOG_JUST_PRINT(" n_selectivity: selectivity, on a 100 scale. \n"); + LOG_JUST_PRINT(" is_using_dart: 1 for using dart, 0 for not using dart\n"); + LOG_JUST_PRINT(" query_type: -1 for no query, 0 for exact, 1 for prefix, 2 for suffix, 3 for infix\n"); + LOG_JUST_PRINT(" comm_type: 0 for point-to-point, 1 for collective\n"); } perr_t @@ -89,20 +91,20 @@ prepare_container(pdcid_t *pdc, pdcid_t *cont_prop, pdcid_t *cont, pdcid_t *obj_ // create a container property *cont_prop = PDCprop_create(PDC_CONT_CREATE, *pdc); if (*cont_prop <= 0) { - printf("[Client %d] Fail to create container property @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container property\n", my_rank); goto done; } // create a container *cont = PDCcont_create("c1", *cont_prop); if (*cont <= 0) { - printf("[Client %d] Fail to create container @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container!\n", my_rank); goto done; } // create an object property *obj_prop = PDCprop_create(PDC_OBJ_CREATE, *pdc); if (*obj_prop <= 0) { - printf("[Client %d] Fail to create object property @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create object property!\n", my_rank); goto done; } @@ -122,7 +124,7 @@ creating_objects(pdcid_t **obj_ids, int my_obj, int my_obj_s, pdcid_t cont, pdci sprintf(obj_name, "obj%" PRId64 "%d", timestamp, my_obj_s + i); (*obj_ids)[i] = PDCobj_create(cont, obj_name, obj_prop); if ((*obj_ids)[i] <= 0) { - printf("[Client %d] Fail to create object @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create object!\n", my_rank); goto done; } } @@ -167,7 +169,7 @@ main(int argc, char *argv[]) int bypass_query = query_type == -1 ? 1 : 0; // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, my_rank) < 0) { - println("fail to prepare container @ line %d", __LINE__); + println("fail to prepare container"); goto done; } // Create a number of objects, add at least one tag to that object @@ -211,16 +213,16 @@ main(int argc, char *argv[]) pdcid_t meta_id = PDC_obj_get_info(obj_ids[i])->obj_info_pub->meta_id; if (is_using_dart) { if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); } if (PDC_Client_insert_obj_ref_into_dart(hash_algo, kvtag.name, kvtag.value, kvtag.size, kvtag.type, ref_type, meta_id) < 0) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail 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) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); } } free(kvtag.name); @@ -328,17 +330,11 @@ main(int argc, char *argv[]) #endif } if (ret_value < 0) { - printf("fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); break; } - // TODO: This is for checking the correctness of the query results. - // if (iter >= 0) { - // if (nres != total_cnt_round[iter]) - // printf("Rank %d: query %d, comm %d, round %d - results %d do not match expected - // %d\n", - // my_rank, query_type, comm_type, iter, nres, total_cnt_round[iter]); - // } + // TODO: Check correctness of query results round_total += nres; free(kvtag.name); @@ -415,38 +411,38 @@ main(int argc, char *argv[]) // close a container if (PDCcont_close(cont) < 0) { if (my_rank == 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); } } else { if (my_rank == 0) - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close an object property if (PDCprop_close(obj_prop) < 0) { if (my_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (my_rank == 0) - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { if (my_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (my_rank == 0) - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { if (my_rank == 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/kvtag_get.c b/src/tests/kvtag_get.c index 7ca1e7c0e..8cc5545d0 100644 --- a/src/tests/kvtag_get.c +++ b/src/tests/kvtag_get.c @@ -40,71 +40,71 @@ main() // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); else - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont > 0) - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); else - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop1 > 0) - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); else - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop2 > 0) - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); else - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); // create first object obj1 = PDCobj_create(cont, "o1", obj_prop1); if (obj1 > 0) - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); else - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); // create second object obj2 = PDCobj_create(cont, "o2", obj_prop2); if (obj2 > 0) - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); else - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); if (PDCobj_get_tag(obj1, "key1string", (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - printf("fail to get a kvtag from o1\n"); + LOG_ERROR("Fail to get a kvtag from o1\n"); else - printf("successfully retrieved a kvtag [%s] = [%s] from o1\n", value1->name, (char *)value1->value); + LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", value1->name, (char *)value1->value); if (PDCobj_get_tag(obj2, "key2int", (void *)&value2, (void *)&type2, (void *)&value_size) < 0) - printf("fail to get a kvtag from o2\n"); + LOG_ERROR("Fail to get a kvtag from o2\n"); else - printf("successfully retrieved a kvtag [%s] = [%d] from o2\n", value2->name, *(int *)value2->value); + LOG_INFO("successfully retrieved a kvtag [%s] = [%d] from o2\n", value2->name, *(int *)value2->value); if (PDCobj_get_tag(obj2, "key3double", (void *)&value3, (void *)&type3, (void *)&value_size) < 0) - printf("fail to get a kvtag from o2\n"); + LOG_ERROR("Fail to get a kvtag from o2\n"); else - printf("successfully retrieved a kvtag [%s] = [%f] from o2\n", value3->name, - *(double *)value3->value); + LOG_INFO("successfully retrieved a kvtag [%s] = [%f] from o2\n", value3->name, + *(double *)value3->value); PDC_free_kvtag(&value1); if (PDCobj_get_tag(obj1, "key1string", (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - printf("fail to get a kvtag from o1\n"); + LOG_ERROR("Fail to get a kvtag from o1\n"); else - printf("successfully retrieved a kvtag [%s] = [%s] from o1\n", value1->name, (char *)value1->value); + LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", value1->name, (char *)value1->value); PDC_free_kvtag(&value1); PDC_free_kvtag(&value2); @@ -112,41 +112,41 @@ main() // close first object if (PDCobj_close(obj1) < 0) - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); else - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); // close second object if (PDCobj_close(obj2) < 0) - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); else - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); else - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); // close a container property if (PDCprop_close(obj_prop1) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); if (PDCprop_close(obj_prop2) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); // close pdc if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/kvtag_query.c b/src/tests/kvtag_query.c index fb58b2e20..ea42c517d 100644 --- a/src/tests/kvtag_query.c +++ b/src/tests/kvtag_query.c @@ -34,7 +34,7 @@ int assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) { if (rank > size || my_count == NULL || my_start == NULL) { - printf("assign_work_to_rank(): Error with input!\n"); + LOG_ERROR("assign_work_to_rank(): Error with input!\n"); return -1; } if (nwork < size) { @@ -61,17 +61,19 @@ assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) void print_usage(char *name) { - printf("%s n_obj n_round n_selectivity is_using_dart\n", name); - printf("Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " - "will " - "perform n_round collective queries against the tags, each query from each client should get " - "a whole result set.\n"); - printf("Parameters:\n"); - printf(" n_obj: number of objects\n"); - printf(" n_round: number of rounds, it can be the total number of tags too, as each round will perform " - "one query against one tag\n"); - printf(" n_selectivity: selectivity, on a 100 scale. \n"); - printf(" is_using_dart: 1 for using dart, 0 for not using dart\n"); + LOG_JUST_PRINT("%s n_obj n_round n_selectivity is_using_dart\n", name); + LOG_JUST_PRINT( + "Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " + "will " + "perform n_round collective queries against the tags, each query from each client should get " + "a whole result set.\n"); + LOG_JUST_PRINT("Parameters:\n"); + LOG_JUST_PRINT(" n_obj: number of objects\n"); + LOG_JUST_PRINT( + " n_round: number of rounds, it can be the total number of tags too, as each round will perform " + "one query against one tag\n"); + LOG_JUST_PRINT(" n_selectivity: selectivity, on a 100 scale. \n"); + LOG_JUST_PRINT(" is_using_dart: 1 for using dart, 0 for not using dart\n"); } int @@ -110,33 +112,33 @@ main(int argc, char *argv[]) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); // Create a number of objects, add at least one tag to that object assign_work_to_rank(my_rank, proc_num, n_obj, &my_obj, &my_obj_s); if (my_rank == 0) - printf("I will create %d obj\n", my_obj); + LOG_INFO("I will create %d obj\n", my_obj); obj_ids = (pdcid_t *)calloc(my_obj, sizeof(pdcid_t)); for (i = 0; i < my_obj; i++) { sprintf(obj_name, "obj%d", my_obj_s + i); obj_ids[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj_ids[i] <= 0) - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); } if (my_rank == 0) - printf("Created %d objects\n", n_obj); + LOG_INFO("Created %d objects\n", n_obj); fflush(stdout); char *attr_name_per_rank = gen_random_strings(1, 6, 8, 26)[0]; @@ -163,13 +165,13 @@ main(int argc, char *argv[]) if (is_using_dart) { if (PDC_Client_insert_obj_ref_into_dart(hash_algo, kvtag.name, value, strlen(value), PDC_STRING, ref_type, (uint64_t)obj_ids[i]) < 0) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); } } else { /* println("Rank %d: [%s] [%d], len %d\n", my_rank, kvtag.name, v, kvtag.size); */ if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); } } } @@ -211,7 +213,7 @@ main(int argc, char *argv[]) #else if (PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) < 0) { #endif - printf("fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); break; } } @@ -229,25 +231,25 @@ main(int argc, char *argv[]) #endif // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); else - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); // close an object property if (PDCprop_close(obj_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); else - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); // close pdc if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); done: #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/kvtag_range_query_scale.c b/src/tests/kvtag_range_query_scale.c index a6d3b3975..1943604de 100644 --- a/src/tests/kvtag_range_query_scale.c +++ b/src/tests/kvtag_range_query_scale.c @@ -36,7 +36,7 @@ int assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) { if (rank > size || my_count == NULL || my_start == NULL) { - printf("assign_work_to_rank(): Error with input!\n"); + LOG_ERROR("assign_work_to_rank(): Error with input!\n"); return -1; } if (nwork < size) { @@ -63,19 +63,21 @@ assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) void print_usage(char *name) { - printf("%s n_obj n_round n_selectivity is_using_dart query_type comm_type\n", name); - printf("Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " - "will " - "perform n_round collective queries against the tags, each query from each client should get " - "a whole result set.\n"); - printf("Parameters:\n"); - printf(" n_obj: number of objects\n"); - printf(" n_round: number of rounds, it can be the total number of tags too, as each round will perform " - "one query against one tag\n"); - printf(" n_selectivity: selectivity, on a 100 scale. \n"); - printf(" is_using_dart: 1 for using dart, 0 for not using dart\n"); - printf(" query_type: -1 for no query, 0 for exact, 1 for prefix, 2 for suffix, 3 for infix\n"); - printf(" comm_type: 0 for point-to-point, 1 for collective\n"); + LOG_JUST_PRINT("%s n_obj n_round n_selectivity is_using_dart query_type comm_type\n", name); + LOG_JUST_PRINT( + "Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " + "will " + "perform n_round collective queries against the tags, each query from each client should get " + "a whole result set.\n"); + LOG_JUST_PRINT("Parameters:\n"); + LOG_JUST_PRINT(" n_obj: number of objects\n"); + LOG_JUST_PRINT( + " n_round: number of rounds, it can be the total number of tags too, as each round will perform " + "one query against one tag\n"); + LOG_JUST_PRINT(" n_selectivity: selectivity, on a 100 scale. \n"); + LOG_JUST_PRINT(" is_using_dart: 1 for using dart, 0 for not using dart\n"); + LOG_JUST_PRINT(" query_type: -1 for no query, 0 for exact, 1 for prefix, 2 for suffix, 3 for infix\n"); + LOG_JUST_PRINT(" comm_type: 0 for point-to-point, 1 for collective\n"); } perr_t @@ -88,20 +90,20 @@ prepare_container(pdcid_t *pdc, pdcid_t *cont_prop, pdcid_t *cont, pdcid_t *obj_ // create a container property *cont_prop = PDCprop_create(PDC_CONT_CREATE, *pdc); if (*cont_prop <= 0) { - printf("[Client %d] Fail to create container property @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container property!\n", my_rank); goto done; } // create a container *cont = PDCcont_create("c1", *cont_prop); if (*cont <= 0) { - printf("[Client %d] Fail to create container @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container!\n", my_rank); goto done; } // create an object property *obj_prop = PDCprop_create(PDC_OBJ_CREATE, *pdc); if (*obj_prop <= 0) { - printf("[Client %d] Fail to create object property @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create object property!\n", my_rank); goto done; } @@ -119,10 +121,9 @@ creating_objects(pdcid_t **obj_ids, int my_obj, int my_obj_s, pdcid_t cont, pdci *obj_ids = (pdcid_t *)calloc(my_obj, sizeof(pdcid_t)); for (int i = 0; i < my_obj; i++) { sprintf(obj_name, "obj%" PRId64 "%d", timestamp, my_obj_s + i); - // printf("Rank %d: Creating object %s\n", my_rank, obj_name); (*obj_ids)[i] = PDCobj_create(cont, obj_name, obj_prop); if ((*obj_ids)[i] <= 0) { - printf("[Client %d] Fail to create object @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create object!\n", my_rank); goto done; } } @@ -167,21 +168,21 @@ main(int argc, char *argv[]) int bypass_query = query_type == -1 ? 1 : 0; // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, my_rank) < 0) { - println("fail to prepare container @ line %d", __LINE__); + LOG_ERROR("fail to prepare container"); goto done; } // Create a number of objects, add at least one tag to that object assign_work_to_rank(my_rank, proc_num, n_obj, &my_obj, &my_obj_s); if (my_rank == 0) { - println("Each client will create about %d obj", my_obj); + LOG_INFO("Each client will create about %d obj", my_obj); } // creating objects creating_objects(&obj_ids, my_obj, my_obj_s, cont, obj_prop, my_rank); if (my_rank == 0) - println("All clients created %d objects", n_obj); + LOG_INFO("All clients created %d objects", n_obj); dart_object_ref_type_t ref_type = REF_PRIMARY_ID; dart_hash_algo_t hash_algo = DART_HASH; @@ -203,12 +204,11 @@ main(int argc, char *argv[]) for (i = 0; i < my_obj_after_selectivity; i++) { for (iter = 0; iter < round; iter++) { char *attr_name = (char *)calloc(64, sizeof(char)); - // snprintf(attr_name, 63, "%03d%03dattr_name%03d%03d", iter, iter, iter, iter); snprintf(attr_name, 63, "attr_name"); kvtag.name = strdup(attr_name); kvtag.value = malloc(sizeof(int64_t)); if (kvtag.value == NULL) { - printf("fail to allocate tag_value\n"); + LOG_ERROR("Fail to allocate tag_value\n"); goto done; } int64_t iter_val = iter; @@ -218,22 +218,20 @@ main(int argc, char *argv[]) pdcid_t meta_id = PDC_obj_get_info(obj_ids[i])->obj_info_pub->meta_id; if (is_using_dart) { if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); } // NOTE: object ID is a local ID, we need to get the global object metadata ID if (PDC_Client_insert_obj_ref_into_dart(hash_algo, kvtag.name, kvtag.value, kvtag.size, kvtag.type, ref_type, meta_id) < 0) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); } total_insert++; } else { if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - printf("fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); } } - // printf("Rank %d: Added kvtag \"%s\": %" PRId64 " -> %" PRIu64 "\n", my_rank, kvtag.name, - // *((int64_t *)kvtag.value), meta_id); free(kvtag.name); free(kvtag.value); // TODO: this is for checking the correctness of the query results. @@ -294,7 +292,6 @@ main(int argc, char *argv[]) #endif char * attr_name = (char *)calloc(64, sizeof(char)); int64_t *tag_value; - // snprintf(attr_name, 63, "%03d%03dattr_name%03d%03d", iter, iter, iter, iter); snprintf(attr_name, 63, "attr_name"); tag_value = malloc(sizeof(int64_t)); tag_value[0] = (int64_t)iter; @@ -332,7 +329,7 @@ main(int argc, char *argv[]) else { kvtag.name = output.key_query; kvtag.value = output.value_query; - /* fprintf(stderr, " Rank %d: key [%s] value [%s]\n", my_rank, kvtag.name, + /* LOG_ERROR(" Rank %d: key [%s] value [%s]\n", my_rank, kvtag.name, * kvtag.value); */ #ifdef ENABLE_MPI @@ -344,14 +341,14 @@ main(int argc, char *argv[]) #endif } if (ret_value < 0) { - printf("fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); + LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); break; } // TODO: This is for checking the correctness of the query results. if (iter >= 0) { if (nres != total_cnt_round[iter]) - printf( + LOG_ERROR( "Rank %d: query %d, comm %d, round %d - results %d do not match expected %d\n ", my_rank, query_type, comm_type, iter, nres, total_cnt_round[iter]); } @@ -397,12 +394,11 @@ main(int argc, char *argv[]) for (iter = 0; iter < round; iter++) { char attr_name[64]; char tag_value[64]; - // snprintf(attr_name, 63, "%03d%03dattr_name%03d%03d", iter, iter, iter, iter); snprintf(attr_name, 63, "attr_name"); kvtag.name = strdup(attr_name); kvtag.value = malloc(sizeof(int64_t)); if (kvtag.value == NULL) { - printf("fail to allocate tag_value\n"); + LOG_ERROR("Fail to allocate tag_value\n"); goto done; } int64_t iter_val = iter; @@ -435,38 +431,38 @@ main(int argc, char *argv[]) // close a container if (PDCcont_close(cont) < 0) { if (my_rank == 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); } } else { if (my_rank == 0) - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close an object property if (PDCprop_close(obj_prop) < 0) { if (my_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (my_rank == 0) - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { if (my_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (my_rank == 0) - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { if (my_rank == 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/list_all.c b/src/tests/list_all.c index 508d23db6..f0bd5b503 100644 --- a/src/tests/list_all.c +++ b/src/tests/list_all.c @@ -53,7 +53,7 @@ rand_string(char *str, size_t size) void print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -92,11 +92,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -111,7 +111,7 @@ main(int argc, char **argv) count /= size; if (rank == 0) - printf("Creating %d objects per MPI rank\n", count); + LOG_INFO("Creating %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -120,17 +120,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -140,7 +140,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } srand(rank + 1); @@ -165,7 +165,7 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop, i / 4 + rank * count); } else { - printf("Unsupported name choice\n"); + LOG_ERROR("Unsupported name choice\n"); goto done; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -174,7 +174,7 @@ main(int argc, char **argv) test_obj = PDCobj_create(cont, obj_name, obj_prop); if (test_obj == 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name); exit(-1); } } @@ -187,13 +187,13 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); + LOG_INFO("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); fflush(stdout); } - printf("Listing all objects\n"); + LOG_INFO("Listing all objects\n"); PDC_Client_list_all(&n_obj, &out); - printf("Received %d metadata objects\n", n_obj); + LOG_INFO("Received %d metadata objects\n", n_obj); for (i = 0; i < n_obj; i++) { PDC_print_metadata(out[i]); @@ -203,16 +203,16 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop, 0); test_obj = PDCobj_create(cont, "test_obj_name0", obj_prop); test_obj = PDCobj_create(cont, "test_obj_name1", obj_prop); - printf("Searching for objects with tag1=2\n"); + LOG_INFO("Searching for objects with tag1=2\n"); PDC_partial_query(0, -1, NULL, NULL, -1, -1, -1, "tag1=2", &n_obj, &out); - printf("Received %d metadata objects\n", n_obj); + LOG_INFO("Received %d metadata objects\n", n_obj); for (i = 0; i < n_obj; i++) { PDC_print_metadata(out[i]); } - printf("Searching for objects with timestep from 2 to 4\n"); + LOG_INFO("Searching for objects with timestep from 2 to 4\n"); PDC_partial_query(0, -1, NULL, NULL, 2, 4, -1, NULL, &n_obj, &out); - printf("Received %d metadata objects\n", n_obj); + LOG_INFO("Received %d metadata objects\n", n_obj); for (i = 0; i < n_obj; i++) { PDC_print_metadata(out[i]); } @@ -220,14 +220,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index 28096b867..f2db8dff8 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -17,7 +17,7 @@ int assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) { if (rank > size || my_count == NULL || my_start == NULL) { - printf("assign_work_to_rank(): Error with input!\n"); + LOG_ERROR("assign_work_to_rank(): Error with input!\n"); return -1; } if (nwork < size) { @@ -44,19 +44,21 @@ assign_work_to_rank(int rank, int size, int nwork, int *my_count, int *my_start) void print_usage(char *name) { - printf("%s n_obj n_round n_selectivity is_using_dart query_type comm_type\n", name); - printf("Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " - "will " - "perform n_round collective queries against the tags, each query from each client should get " - "a whole result set.\n"); - printf("Parameters:\n"); - printf(" n_obj: number of objects\n"); - printf(" n_round: number of rounds, it can be the total number of tags too, as each round will perform " - "one query against one tag\n"); - printf(" n_selectivity: selectivity, on a 100 scale. \n"); - printf(" is_using_dart: 1 for using dart, 0 for not using dart\n"); - printf(" query_type: -1 for no query, 0 for exact, 1 for prefix, 2 for suffix, 3 for infix\n"); - printf(" comm_type: 0 for point-to-point, 1 for collective\n"); + LOG_JUST_PRINT("%s n_obj n_round n_selectivity is_using_dart query_type comm_type\n", name); + LOG_JUST_PRINT( + "Summary: This test will create n_obj objects, and add n_selectivity tags to each object. Then it " + "will " + "perform n_round collective queries against the tags, each query from each client should get " + "a whole result set.\n"); + LOG_JUST_PRINT("Parameters:\n"); + LOG_JUST_PRINT(" n_obj: number of objects\n"); + LOG_JUST_PRINT( + " n_round: number of rounds, it can be the total number of tags too, as each round will perform " + "one query against one tag\n"); + LOG_JUST_PRINT(" n_selectivity: selectivity, on a 100 scale. \n"); + LOG_JUST_PRINT(" is_using_dart: 1 for using dart, 0 for not using dart\n"); + LOG_JUST_PRINT(" query_type: -1 for no query, 0 for exact, 1 for prefix, 2 for suffix, 3 for infix\n"); + LOG_JUST_PRINT(" comm_type: 0 for point-to-point, 1 for collective\n"); } perr_t @@ -69,20 +71,20 @@ prepare_container(pdcid_t *pdc, pdcid_t *cont_prop, pdcid_t *cont, pdcid_t *obj_ // create a container property *cont_prop = PDCprop_create(PDC_CONT_CREATE, *pdc); if (*cont_prop <= 0) { - printf("[Client %d] Fail to create container property @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container property\n", my_rank); goto done; } // create a container *cont = PDCcont_create("c1", *cont_prop); if (*cont <= 0) { - printf("[Client %d] Fail to create container @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create container\n", my_rank); goto done; } // create an object property *obj_prop = PDCprop_create(PDC_OBJ_CREATE, *pdc); if (*obj_prop <= 0) { - printf("[Client %d] Fail to create object property @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create object property!\n", my_rank); goto done; } @@ -109,7 +111,7 @@ create_objects(pdcid_t **obj_ids, int my_csv_rows, int csv_expand_factor, pdcid_ (*obj_ids)[obj_created] = obj_id; if ((*obj_ids)[obj_created] <= 0) { - printf("[Client %d] Fail to create object @ line %d!\n", my_rank, __LINE__); + LOG_ERROR("[Client %d] Fail to create object!\n", my_rank); goto done; } @@ -194,7 +196,7 @@ add_tag_to_one_object(pid_t obj_id, char *attr_name, char *attr_value, int is_us struct _pdc_obj_info *obj_prop = PDC_obj_get_info(obj_id); uint64_t meta_id = obj_prop->obj_info_pub->meta_id; if (PDCobj_put_tag(obj_id, kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - printf("Fail to add tag to object %" PRIu64 "\n", obj_id); + LOG_ERROR("Fail to add tag to object %" PRIu64 "\n", obj_id); return -1; } if (is_using_dart) { @@ -293,7 +295,7 @@ read_csv_from_buffer(char *data, char ***csv_header, char ****csv_data, int *num // Read the header line char *line = strtok(data, "\n"); if (line == NULL) { - fprintf(stderr, "Error reading headers from CSV\n"); + LOG_ERROR("Error reading headers from CSV\n"); return -1; } @@ -306,7 +308,7 @@ read_csv_from_buffer(char *data, char ***csv_header, char ****csv_data, int *num while (data_line_count < rows_to_read) { line = strtok(NULL, "\n"); if (line == NULL) { - fprintf(stderr, "Error reading data from CSV\n"); + LOG_ERROR("Error reading data from CSV\n"); // free(buffer); return -1; } @@ -379,8 +381,6 @@ perform_search(int is_using_dart, int query_type, int comm_type, int iter_round) else { kvtag.name = output.key_query; kvtag.value = output.value_query; - /* fprintf(stderr, " Rank %d: key [%s] value [%s]\n", my_rank, kvtag.name, - * kvtag.value); */ #ifdef ENABLE_MPI ret_value = (comm_type == 0) ? PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) @@ -432,7 +432,7 @@ main(int argc, char *argv[]) int bypass_query = query_type == -1 ? 1 : 0; // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, my_rank) < 0) { - println("fail to prepare container @ line %d", __LINE__); + println("fail to prepare container"); goto done; } @@ -442,7 +442,7 @@ main(int argc, char *argv[]) if (my_rank == 0) { if (read_lines_to_buffer(file_name, &data, rows_to_read + 1, &data_size) != 0) { - fprintf(stderr, "Failed to read lines from the file\n"); + LOG_ERROR("Failed to read lines from the file\n"); #ifdef ENABLE_MPI MPI_Abort(MPI_COMM_WORLD, 1); #endif @@ -456,7 +456,7 @@ main(int argc, char *argv[]) if (my_rank != 0) { data = (char *)malloc(data_size * sizeof(char)); if (data == NULL) { - fprintf(stderr, "Failed to allocate buffer\n"); + LOG_ERROR("Failed to allocate buffer\n"); MPI_Abort(MPI_COMM_WORLD, 1); } } @@ -587,38 +587,38 @@ main(int argc, char *argv[]) // close a container if (PDCcont_close(cont) < 0) { if (my_rank == 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); } } else { if (my_rank == 0) - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close an object property if (PDCprop_close(obj_prop) < 0) { if (my_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (my_rank == 0) - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { if (my_rank == 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } else { if (my_rank == 0) - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { if (my_rank == 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/obj_buf.c b/src/tests/obj_buf.c index 6da89387c..6eac5e5a6 100644 --- a/src/tests/obj_buf.c +++ b/src/tests/obj_buf.c @@ -45,34 +45,34 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container\n"); + LOG_INFO("Create a container\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, myArray); @@ -81,52 +81,52 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // set and retrieve the object buffer rbuf = PDCobj_buf_retrieve(obj1); - printf("first number to retrieve is: %d\n", *((int *)*rbuf)); + LOG_ERROR("First number to retrieve is: %d\n", *((int *)*rbuf)); // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } // close object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_del.c b/src/tests/obj_del.c index e7dc0ed05..e274f32c3 100644 --- a/src/tests/obj_del.c +++ b/src/tests/obj_del.c @@ -45,100 +45,100 @@ main(int argc, char **argv) #endif pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } // create first object sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } if (PDCobj_del(obj1) != SUCCEED) { - printf("Fail to delete object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to delete object"); } if (PDCobj_del(obj2) != SUCCEED) { - printf("Fail to delete object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to delete object"); } // close first object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } // close second object if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_dim.c b/src/tests/obj_dim.c index c2772a633..2371d9a92 100644 --- a/src/tests/obj_dim.c +++ b/src/tests/obj_dim.c @@ -49,29 +49,29 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c%d\n", rank); + LOG_INFO("Create a container c%d\n", rank); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } // set object dimension @@ -83,47 +83,47 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an objec o1\n"); + LOG_INFO("Create an objec o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } // close object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_get_data.c b/src/tests/obj_get_data.c index 841a35591..ec805a8ff 100644 --- a/src/tests/obj_get_data.c +++ b/src/tests/obj_get_data.c @@ -50,25 +50,25 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container %s\n", rank, cont_name); + LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } @@ -76,10 +76,10 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_put_data(obj_name1, (void *)data, BUF_LEN * sizeof(double), cont); if (obj1 > 0) { - printf("Rank %d Put data to %s\n", rank, obj_name1); + LOG_INFO("Rank %d Put data to %s\n", rank, obj_name1); } else { - printf("Fail to put data into object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to put data into object"); ret_value = 1; } @@ -87,22 +87,22 @@ main(int argc, char **argv) sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_put_data(obj_name2, (void *)data, BUF_LEN * sizeof(double), cont); if (obj2 > 0) { - printf("Rank %d Put data to %s\n", rank, obj_name2); + LOG_INFO("Rank %d Put data to %s\n", rank, obj_name2); } else { - printf("Fail to put data into object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to put data into object"); ret_value = 1; } memset(data, 0, BUF_LEN * sizeof(double)); error_code = PDCobj_get_data(obj1, (void *)(data), BUF_LEN * sizeof(double)); if (error_code != SUCCEED) { - printf("Fail to get obj 1 data\n"); + LOG_ERROR("Fail to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < BUF_LEN * sizeof(double); ++i) { if (data[i] != 1) { - printf("wrong value at obj 1\n"); + LOG_ERROR("wrong value at obj 1\n"); ret_value = 1; break; } @@ -110,12 +110,12 @@ main(int argc, char **argv) memset(data, 0, BUF_LEN * sizeof(double)); error_code = PDCobj_get_data(obj2, (void *)(data), BUF_LEN * sizeof(double)); if (error_code != SUCCEED) { - printf("Fail to get obj 1 data\n"); + LOG_ERROR("Fail to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < BUF_LEN * sizeof(double); ++i) { if (data[i] != 2) { - printf("wrong value at obj 2\n"); + LOG_ERROR("wrong value at obj 2\n"); ret_value = 1; break; } @@ -123,39 +123,39 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_info.c b/src/tests/obj_info.c index 776b6fea0..960fb018d 100644 --- a/src/tests/obj_info.c +++ b/src/tests/obj_info.c @@ -52,44 +52,44 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } @@ -97,120 +97,120 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } obj1_info = PDCobj_get_info(obj1); obj2_info = PDCobj_get_info(obj2); if (strcmp(obj1_info->name, obj_name1) != 0) { - printf("Object 1 name is wrong\n"); + LOG_ERROR("Object 1 name is wrong\n"); ret_value = 1; } if (obj1_info->obj_pt->type != PDC_DOUBLE) { - printf("Type is not properly inherited from object property.\n"); + LOG_ERROR("Type is not properly inherited from object property.\n"); ret_value = 1; } if (obj1_info->obj_pt->ndim != ndim) { - printf("Number of dimensions is not properly inherited from object property.\n"); + LOG_ERROR("Number of dimensions is not properly inherited from object property.\n"); ret_value = 1; } if (obj1_info->obj_pt->dims[0] != dims[0]) { - printf("First dimension is not properly inherited from object property.\n"); + LOG_ERROR("First dimension is not properly inherited from object property.\n"); ret_value = 1; } if (obj1_info->obj_pt->dims[1] != dims[1]) { - printf("Second dimension is not properly inherited from object property.\n"); + LOG_ERROR("Second dimension is not properly inherited from object property.\n"); ret_value = 1; } if (obj1_info->obj_pt->dims[2] != dims[2]) { - printf("Third dimension is not properly inherited from object property.\n"); + LOG_ERROR("Third dimension is not properly inherited from object property.\n"); ret_value = 1; } if (strcmp(obj2_info->name, obj_name2) != 0) { - printf("Object 2 name is wrong\n"); + LOG_ERROR("Object 2 name is wrong\n"); ret_value = 1; } if (obj2_info->obj_pt->type != PDC_DOUBLE) { - printf("Type is not properly inherited from object property.\n"); + LOG_ERROR("Type is not properly inherited from object property.\n"); ret_value = 1; } if (obj2_info->obj_pt->ndim != ndim) { - printf("Number of dimensions is not properly inherited from object property.\n"); + LOG_ERROR("Number of dimensions is not properly inherited from object property.\n"); ret_value = 1; } if (obj2_info->obj_pt->dims[0] != dims[0]) { - printf("First dimension is not properly inherited from object property.\n"); + LOG_ERROR("First dimension is not properly inherited from object property.\n"); ret_value = 1; } if (obj2_info->obj_pt->dims[1] != dims[1]) { - printf("Second dimension is not properly inherited from object property.\n"); + LOG_ERROR("Second dimension is not properly inherited from object property.\n"); ret_value = 1; } if (obj2_info->obj_pt->dims[2] != dims[2]) { - printf("Third dimension is not properly inherited from object property.\n"); + LOG_ERROR("Third dimension is not properly inherited from object property.\n"); ret_value = 1; } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_iter.c b/src/tests/obj_iter.c index bc96d56a3..3c1077e15 100644 --- a/src/tests/obj_iter.c +++ b/src/tests/obj_iter.c @@ -51,44 +51,44 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } @@ -96,30 +96,30 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create third object sprintf(obj_name3, "o3_%d", rank); obj3 = PDCobj_create(cont, obj_name3, obj_prop); if (obj3 > 0) { - printf("Create an object o3\n"); + LOG_INFO("Create an object o3\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // start object iteration @@ -128,23 +128,23 @@ main(int argc, char **argv) while (!PDCobj_iter_null(oh)) { info = PDCobj_iter_get_info(oh); if (info->obj_pt->type != PDC_DOUBLE) { - printf("Type is not properly inherited from object property.\n"); + LOG_ERROR("Type is not properly inherited from object property.\n"); ret_value = 1; } if (info->obj_pt->ndim != ndim) { - printf("Number of dimensions is not properly inherited from object property.\n"); + LOG_ERROR("Number of dimensions is not properly inherited from object property.\n"); ret_value = 1; } if (info->obj_pt->dims[0] != dims[0]) { - printf("First dimension is not properly inherited from object property.\n"); + LOG_ERROR("First dimension is not properly inherited from object property.\n"); ret_value = 1; } if (info->obj_pt->dims[1] != dims[1]) { - printf("Second dimension is not properly inherited from object property.\n"); + LOG_ERROR("Second dimension is not properly inherited from object property.\n"); ret_value = 1; } if (info->obj_pt->dims[2] != dims[2]) { - printf("Third dimension is not properly inherited from object property.\n"); + LOG_ERROR("Third dimension is not properly inherited from object property.\n"); ret_value = 1; } @@ -153,55 +153,55 @@ main(int argc, char **argv) // close first object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } // close second object if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close third object if (PDCobj_close(obj3) < 0) { - printf("fail to close object o3\n"); + LOG_ERROR("Fail to close object o3\n"); ret_value = 1; } else { - printf("successfully close object o3\n"); + LOG_INFO("successfully close object o3\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_life.c b/src/tests/obj_life.c index 913dd45fb..ffc32b392 100644 --- a/src/tests/obj_life.c +++ b/src/tests/obj_life.c @@ -45,40 +45,40 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); return 1; } // create a container cont = PDCcont_create("c1", cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); return 1; } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); return 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); return 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_lock.c b/src/tests/obj_lock.c index 8a3ea71d3..1069c75e5 100644 --- a/src/tests/obj_lock.c +++ b/src/tests/obj_lock.c @@ -64,17 +64,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); // set object dimension PDCprop_set_obj_dims(obj_prop, 3, d); @@ -85,7 +85,7 @@ main(int argc, char **argv) sprintf(obj_name, "test_obj"); obj1 = PDCobj_create(cont, obj_name, obj_prop); if (obj1 <= 0) - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); } for (i = 0; i < 3; i++) { @@ -104,10 +104,10 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj1, reg, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("[%d] Failed to obtain lock for region (%" PRIu64 ",%" PRIu64 ",%" PRIu64 ") (%" PRIu64 - ",%" PRIu64 ",%" PRIu64 ") ... error\n", - rank, region->offset[0], region->offset[1], region->offset[2], region->size[0], - region->size[1], region->size[2]); + LOG_ERROR("[%d] Failed to obtain lock for region (%" PRIu64 ",%" PRIu64 ",%" PRIu64 ") (%" PRIu64 + ",%" PRIu64 ",%" PRIu64 ") ... error\n", + rank, region->offset[0], region->offset[1], region->offset[2], region->size[0], + region->size[1], region->size[2]); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -118,7 +118,7 @@ main(int argc, char **argv) total_lock_overhead = elapsed / 1000000.0; if (rank == 0) { - printf("Total lock overhead : %.5e\n", total_lock_overhead); + LOG_INFO("Total lock overhead : %.5e\n", total_lock_overhead); } #ifdef ENABLE_MPI @@ -128,10 +128,10 @@ main(int argc, char **argv) ret = PDCreg_release_lock(obj1, reg, PDC_WRITE); if (ret != SUCCEED) - printf("[%d] Failed to release lock for region (%" PRIu64 ",%" PRIu64 ",%" PRIu64 ") (%" PRIu64 - ",%" PRIu64 ",%" PRIu64 ") ... error\n", - rank, region->offset[0], region->offset[1], region->offset[2], region->size[0], - region->size[1], region->size[2]); + LOG_ERROR("[%d] Failed to release lock for region (%" PRIu64 ",%" PRIu64 ",%" PRIu64 ") (%" PRIu64 + ",%" PRIu64 ",%" PRIu64 ") ... error\n", + rank, region->offset[0], region->offset[1], region->offset[2], region->size[0], + region->size[1], region->size[2]); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -142,30 +142,30 @@ main(int argc, char **argv) total_lock_overhead = elapsed / 1000000.0; if (rank == 0) { - printf("Total lock release overhead: %.5e\n", total_lock_overhead); + LOG_INFO("Total lock release overhead: %.5e\n", total_lock_overhead); } // close object if (rank == 0) { if (PDCobj_close(obj1) < 0) - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); } // close object property if (PDCprop_close(obj_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); // close pdc if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/obj_map.c b/src/tests/obj_map.c index 2efae2e43..b31efb722 100644 --- a/src/tests/obj_map.c +++ b/src/tests/obj_map.c @@ -87,12 +87,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -102,7 +102,7 @@ main(int argc, char **argv) if (env_str != NULL) { use_name = atoi(env_str); } - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); srand(rank + 1); sprintf(srank, "%d", rank); @@ -138,19 +138,19 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont_id, obj_name1, obj_prop1); if (obj1 == 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name1); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name1); exit(-1); } obj2 = PDCobj_create(cont_id, obj_name2, obj_prop2); if (obj2 == 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name2); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name2); exit(-1); } obj3 = PDCobj_create(cont_id, obj_name3, obj_prop3); if (obj3 == 0) { - printf("Error getting an object id of %s from server, exit...\n", obj_name3); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", obj_name3); exit(-1); } @@ -168,32 +168,32 @@ main(int argc, char **argv) ht_total_elapsed = (ht_total_end.tv_sec - ht_total_start.tv_sec) * 1000000LL + ht_total_end.tv_usec - ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; - printf("Total map overhead : %.5e\n", ht_total_sec); + LOG_INFO("Total map overhead : %.5e\n", ht_total_sec); fflush(stdout); gettimeofday(&ht_total_start, 0); ret = PDCreg_unmap(obj1, r1); if (ret != SUCCEED) - printf("region unmap failed\n"); + LOG_ERROR("region unmap failed\n"); gettimeofday(&ht_total_end, 0); ht_total_elapsed = (ht_total_end.tv_sec - ht_total_start.tv_sec) * 1000000LL + ht_total_end.tv_usec - ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; - printf("Total unmap overhead : %.5e\n", ht_total_sec); + LOG_INFO("Total unmap overhead : %.5e\n", ht_total_sec); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDC_close(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/obj_put_data.c b/src/tests/obj_put_data.c index dcad172dd..531083c10 100644 --- a/src/tests/obj_put_data.c +++ b/src/tests/obj_put_data.c @@ -49,83 +49,83 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container %s\n", rank, cont_name); + LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_put_data(obj_name1, (void *)data, BUF_LEN * sizeof(double), cont); if (obj1 > 0) { - printf("Rank %d Put data to %s\n", rank, obj_name1); + LOG_INFO("Rank %d Put data to %s\n", rank, obj_name1); } else { - printf("Fail to put data into object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to put data into object"); ret_value = 1; } sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_put_data(obj_name2, (void *)data, BUF_LEN * sizeof(double), cont); if (obj2 > 0) { - printf("Rank %d Put data to %s\n", rank, obj_name2); + LOG_INFO("Rank %d Put data to %s\n", rank, obj_name2); } else { - printf("Fail to put data into object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to put data into object"); ret_value = 1; } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_round_robin_io.c b/src/tests/obj_round_robin_io.c index c70b6a32f..050d8e780 100644 --- a/src/tests/obj_round_robin_io.c +++ b/src/tests/obj_round_robin_io.c @@ -117,15 +117,15 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Rank %d Create a container property\n", rank); + LOG_INFO("Rank %d Create a container property\n", rank); } else { - printf("Rank %d Fail to create container property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create container property!\n", rank); ret_value = 1; } // create a container @@ -133,30 +133,30 @@ main(int argc, char **argv) cont = PDCcont_create_col(cont_name, cont_prop); // cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container %s\n", rank, cont_name); + LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - printf("Rank %d Fail to create container @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create container!\n", rank); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Rank %d Create an object property\n", rank); + LOG_INFO("Rank %d Create an object property\n", rank); } else { - printf("Rank %d Fail to create object property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create object property!\n", rank); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } PDCprop_set_obj_type(obj_prop, var_type); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } @@ -167,10 +167,10 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Rank %d Create an object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Create an object %s\n", rank, obj_name1); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create object\n", rank); ret_value = 1; } for (i = 0; i < (int)my_data_size; i++) { @@ -180,34 +180,34 @@ main(int argc, char **argv) } transfer_request = PDCregion_transfer_create(mydata, PDC_WRITE, obj1, local_region, global_region); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create failed"); ret_value = 1; } ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_start for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_start for region"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_wait for region"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } @@ -218,10 +218,10 @@ main(int argc, char **argv) local_region = PDCregion_create(1, offset, mysize); global_region = PDCregion_create(ndim, offset, dims); if (obj2 > 0) { - printf("Rank %d Create an object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Create an object %s\n", rank, obj_name2); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create object!\n", rank); ret_value = 1; } for (i = 0; i < (int)my_data_size; i++) { @@ -231,51 +231,51 @@ main(int argc, char **argv) } transfer_request = PDCregion_transfer_create(mydata, PDC_WRITE, obj2, local_region, global_region); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create failed"); ret_value = 1; } ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_start for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_start for region"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_wait for region"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } // close created objects if (PDCobj_close(obj1) < 0) { - printf("Rank %d fail to close object o1_%d %d\n", rank, rank, __LINE__); + LOG_ERROR("Rank %d fail to close object o1_%d %d\n", rank, rank); ret_value = 1; } else { - printf("Rank %d successfully close object o1_%d\n", rank, rank); + LOG_INFO("Rank %d successfully close object o1_%d\n", rank, rank); } if (PDCobj_close(obj2) < 0) { - printf("Rank %d fail to close object o2_%d %d\n", rank, rank, __LINE__); + LOG_ERROR("Rank %d fail to close object o2_%d\n", rank, rank); ret_value = 1; } else { - printf("Rank %d successfully close object o2_%d\n", rank, rank); + LOG_INFO("Rank %d successfully close object o2_%d\n", rank, rank); } // Wait for all processes to finish their object creation #ifdef ENABLE_MPI @@ -286,20 +286,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", target_rank); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 == 0) { - printf("Rank %d Fail to open object %s %d\n", rank, obj_name1, __LINE__); + LOG_ERROR("Rank %d fail to open object %s\n", rank, obj_name1); ret_value = 1; } else { - printf("Rank %d Opened object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Opened object %s\n", rank, obj_name1); } sprintf(obj_name2, "o2_%d", target_rank); obj2 = PDCobj_open(obj_name2, pdc); if (obj2 == 0) { - printf("Rank %d Fail to open object %s %d\n", rank, obj_name2, __LINE__); + LOG_ERROR("Rank %d fail to open object %s\n", rank, obj_name2); ret_value = 1; } else { - printf("Rank %d Open object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Open object %s\n", rank, obj_name2); } dims[0] = target_rank * 2 + 16; @@ -317,32 +317,32 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data_read, PDC_READ, obj2, local_region, global_region); if (transfer_request == 0) { - printf("PDCregion_transfer_create for read obj2 failed %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create for read obj2 failed\n"); ret_value = 1; } ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_start for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_start for region"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_wait for region"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } for (j = 0; j < (int)(my_data_size * type_size); ++j) { if (data_read[j] != (char)(j + target_rank * 5 + 3)) { - printf("rank %d, i = %d, j = %d, wrong value %d!=%d %d\n", rank, i, j, data_read[j], - (char)(j + target_rank * 5 + 3), __LINE__); + LOG_ERROR("rank %d, i = %d, j = %d, wrong value %d!=%d\n", rank, i, j, data_read[j], + (char)(j + target_rank * 5 + 3)); ret_value = 1; break; } @@ -351,58 +351,58 @@ main(int argc, char **argv) free(data_read); if (PDCregion_close(local_region) < 0) { - printf("fail to close local region %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("Rank %d fail to close object %s %d\n", rank, obj_name1, __LINE__); + LOG_ERROR("Rank %d fail to close object %s\n", rank, obj_name1); ret_value = 1; } else { - printf("Rank %d successfully close object %s\n", rank, obj_name1); + LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name1); } if (PDCobj_close(obj2) < 0) { - printf("Rank %d fail to close object %s %d\n", rank, obj_name2, __LINE__); + LOG_ERROR("Rank %d fail to close object %s\n", rank, obj_name2); ret_value = 1; } else { - printf("Rank %d successfully close object %s\n", rank, obj_name2); + LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name2); } } // close a container if (PDCcont_close(cont) < 0) { - printf("Rank %d fail to close container c %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close container\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container c\n", rank); + LOG_INFO("Rank %d successfully close container c\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d successfully close object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d successfully close container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { - printf("Rank %d fail to close PDC %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close PDC\n", rank); ret_value = 1; } diff --git a/src/tests/obj_round_robin_io_all.c b/src/tests/obj_round_robin_io_all.c index 4070107a7..cae6b84fb 100644 --- a/src/tests/obj_round_robin_io_all.c +++ b/src/tests/obj_round_robin_io_all.c @@ -121,15 +121,15 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Rank %d Create a container property\n", rank); + LOG_INFO("Rank %d Create a container property\n", rank); } else { - printf("Rank %d Fail to create container property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create container property\n", rank); ret_value = 1; } // create a container @@ -137,30 +137,30 @@ main(int argc, char **argv) cont = PDCcont_create_col(cont_name, cont_prop); // cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container %s\n", rank, cont_name); + LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - printf("Rank %d Fail to create container @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create container\n", rank); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Rank %d Create an object property\n", rank); + LOG_INFO("Rank %d Create an object property\n", rank); } else { - printf("Rank %d Fail to create object property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create object property\n", rank); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } PDCprop_set_obj_type(obj_prop, var_type); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } @@ -171,10 +171,10 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Rank %d Create an object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Create an object %s\n", rank, obj_name1); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create object\n", rank); ret_value = 1; } for (i = 0; i < (int)my_data_size; i++) { @@ -191,16 +191,16 @@ main(int argc, char **argv) transfer_request[0] = PDCregion_transfer_create(mydata[0], PDC_WRITE, obj1, local_region, global_region); if (transfer_request[0] == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create failed"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } @@ -211,66 +211,66 @@ main(int argc, char **argv) local_region = PDCregion_create(1, offset, mysize); global_region = PDCregion_create(ndim, offset, dims); if (obj2 > 0) { - printf("Rank %d Create an object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Create an object %s\n", rank, obj_name2); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to create object!\n", rank); ret_value = 1; } transfer_request[1] = PDCregion_transfer_create(mydata[1], PDC_WRITE, obj2, local_region, global_region); if (transfer_request[1] == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create failed"); ret_value = 1; } ret = PDCregion_transfer_start_all(transfer_request, WRITE_REQ_SIZE); if (ret != SUCCEED) { - printf("Failed to region_transfer_start for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_start for region"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, WRITE_REQ_SIZE); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_wait for region"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request[0]); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request[1]); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } // close created objects if (PDCobj_close(obj1) < 0) { - printf("Rank %d fail to close object o1_%d %d\n", rank, rank, __LINE__); + LOG_ERROR("Rank %d fail to close object o1_%d\n", rank, rank); ret_value = 1; } else { - printf("Rank %d successfully close object o1_%d\n", rank, rank); + LOG_INFO("Rank %d successfully close object o1_%d\n", rank, rank); } if (PDCobj_close(obj2) < 0) { - printf("Rank %d fail to close object o2_%d %d\n", rank, rank, __LINE__); + LOG_ERROR("Rank %d fail to close object o2_%d\n", rank, rank); ret_value = 1; } else { - printf("Rank %d successfully close object o2_%d\n", rank, rank); + LOG_INFO("Rank %d successfully close object o2_%d\n", rank, rank); } // Wait for all processes to finish their object creation #ifdef ENABLE_MPI @@ -286,11 +286,11 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", target_rank); obj1_list[i - 1] = PDCobj_open(obj_name1, pdc); if (obj1_list[i - 1] == 0) { - printf("Rank %d Fail to open object %s %d\n", rank, obj_name1, __LINE__); + LOG_ERROR("Rank %d fail to open object %s\n", rank, obj_name1); ret_value = 1; } else { - printf("Rank %d Opened object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Opened object %s\n", rank, obj_name1); } dims[0] = target_rank * 2 + 16; @@ -309,28 +309,28 @@ main(int argc, char **argv) transfer_request[(i - 1)] = PDCregion_transfer_create(data_read[(i - 1)], PDC_READ, obj2, local_region, global_region); if (transfer_request[(i - 1)] == 0) { - printf("PDCregion_transfer_create for read obj2 failed %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create for read obj2 failed\n"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } sprintf(obj_name2, "o2_%d", target_rank); obj2_list[i - 1] = PDCobj_open(obj_name2, pdc); if (obj2_list[i - 1] == 0) { - printf("Rank %d Fail to open object %s %d\n", rank, obj_name2, __LINE__); + LOG_ERROR("Rank %d fail to open object %s\n", rank, obj_name2); ret_value = 1; } else { - printf("Rank %d Open object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Open object %s\n", rank, obj_name2); } mysize[0] = my_data_size; @@ -341,30 +341,30 @@ main(int argc, char **argv) transfer_request[(i - 1) + size - 1] = PDCregion_transfer_create( data_read[(i - 1) + size - 1], PDC_READ, obj2, local_region, global_region); if (transfer_request[(i - 1) + size - 1] == 0) { - printf("PDCregion_transfer_create for read obj2 failed %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create for read obj2 failed\n"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } } ret = PDCregion_transfer_start_all(transfer_request, (size - 1) * 2); if (ret != SUCCEED) { - printf("Failed to region_transfer_start_all for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_start_all for region"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, (size - 1) * 2); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait_all for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_wait_all for region"); ret_value = 1; } @@ -372,20 +372,20 @@ main(int argc, char **argv) target_rank = (rank + i) % size; ret = PDCregion_transfer_close(transfer_request[(i - 1)]); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request[(i - 1) + size - 1]); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } for (j = 0; j < (int)(my_data_size * type_size); ++j) { if (data_read[(i - 1)][j] != (char)(j + target_rank)) { - printf("rank %d, i = %d, j = %d, wrong value %d!=%d %d\n", rank, i, j, data_read[(i - 1)][j], - (char)(j + target_rank), __LINE__); + LOG_ERROR("rank %d, i = %d, j = %d, wrong value %d!=%d\n", rank, i, j, data_read[(i - 1)][j], + (char)(j + target_rank)); ret_value = 1; break; } @@ -393,8 +393,8 @@ main(int argc, char **argv) for (j = 0; j < (int)(my_data_size * type_size); ++j) { if (data_read[(i - 1) + size - 1][j] != (char)(j + target_rank * 5 + 3)) { - printf("rank %d, i = %d, j = %d, wrong value %d!=%d %d\n", rank, i, j, - data_read[(i - 1) + size - 1][j], (char)(j + target_rank * 5 + 3), __LINE__); + LOG_ERROR("rank %d, i = %d, j = %d, wrong value %d!=%d\n", rank, i, j, + data_read[(i - 1) + size - 1][j], (char)(j + target_rank * 5 + 3)); ret_value = 1; break; } @@ -402,50 +402,50 @@ main(int argc, char **argv) free(data_read[(i - 1)]); free(data_read[(i - 1) + size - 1]); if (PDCobj_close(obj1_list[i - 1]) < 0) { - printf("Rank %d fail to close object %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close object\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object\n", rank); + LOG_INFO("Rank %d successfully close object\n", rank); } if (PDCobj_close(obj2_list[i - 1]) < 0) { - printf("Rank %d fail to close object %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close object\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object\n", rank); + LOG_INFO("Rank %d successfully close object\n", rank); } } // close a container if (PDCcont_close(cont) < 0) { - printf("Rank %d fail to close container c %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close container c\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container c\n", rank); + LOG_INFO("Rank %d successfully close container c\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d successfully close object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d successfully close container property\n", rank); } - printf("total number of read request = %d\n", (size - 1) * 2); + LOG_INFO("total number of read request = %d\n", (size - 1) * 2); // close pdc if (PDCclose(pdc) < 0) { - printf("Rank %d fail to close PDC %d\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to close PDC\n", rank); ret_value = 1; } diff --git a/src/tests/obj_tags.c b/src/tests/obj_tags.c index 5906e3dd9..fd3280073 100644 --- a/src/tests/obj_tags.c +++ b/src/tests/obj_tags.c @@ -57,45 +57,45 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_ERROR("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_ERROR("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_ERROR("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_ERROR("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - printf("Fail to set obj dim @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj dim"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } @@ -103,132 +103,132 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_ERROR("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_ERROR("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } ret = PDCobj_put_tag(obj1, "some tag", tag_value, PDC_STRING, strlen(tag_value) + 1); if (ret != SUCCEED) { - printf("Put tag failed at object 1\n"); + LOG_ERROR("Put tag failed at object 1\n"); ret_value = 1; } ret = PDCobj_put_tag(obj1, "some tag 2", tag_value2, PDC_STRING, strlen(tag_value2) + 1); if (ret != SUCCEED) { - printf("Put tag failed at object 1\n"); + LOG_ERROR("Put tag failed at object 1\n"); ret_value = 1; } ret = PDCobj_put_tag(obj2, "some tag", tag_value, PDC_STRING, strlen(tag_value) + 1); if (ret != SUCCEED) { - printf("Put tag failed at object 2\n"); + LOG_ERROR("Put tag failed at object 2\n"); ret_value = 1; } ret = PDCobj_put_tag(obj2, "some tag 2", tag_value2, PDC_STRING, strlen(tag_value2) + 1); if (ret != SUCCEED) { - printf("Put tag failed at object 2\n"); + LOG_ERROR("Put tag failed at object 2\n"); ret_value = 1; } ret = PDCobj_get_tag(obj1, "some tag", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at object 1\n"); + LOG_ERROR("Get tag failed at object 1\n"); ret_value = 1; } if (strcmp(tag_value, tag_value_ret) != 0) { - printf("Wrong tag value at object 1, expected = %s, get %s\n", tag_value, tag_value_ret); + LOG_ERROR("Wrong tag value at object 1, expected = %s, get %s\n", tag_value, tag_value_ret); ret_value = 1; } ret = PDCobj_get_tag(obj1, "some tag 2", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at object 1\n"); + LOG_ERROR("Get tag failed at object 1\n"); ret_value = 1; } if (strcmp(tag_value2, tag_value_ret) != 0) { - printf("Wrong tag value 2 at object 1, expected = %s, get %s\n", tag_value2, tag_value_ret); + LOG_ERROR("Wrong tag value 2 at object 1, expected = %s, get %s\n", tag_value2, tag_value_ret); ret_value = 1; } ret = PDCobj_get_tag(obj2, "some tag", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at object 2\n"); + LOG_ERROR("Get tag failed at object 2\n"); ret_value = 1; } if (strcmp(tag_value, tag_value_ret) != 0) { - printf("Wrong tag value at object 2, expected = %s, get %s\n", tag_value, tag_value_ret); + LOG_ERROR("Wrong tag value at object 2, expected = %s, get %s\n", tag_value, tag_value_ret); ret_value = 1; } ret = PDCobj_get_tag(obj2, "some tag 2", (void **)&tag_value_ret, &value_type, &value_size); if (ret != SUCCEED) { - printf("Get tag failed at object 2\n"); + LOG_ERROR("Get tag failed at object 2\n"); ret_value = 1; } if (strcmp(tag_value2, tag_value_ret) != 0) { - printf("Wrong tag value 2 at object 2, expected = %s, get %s\n", tag_value2, tag_value_ret); + LOG_ERROR("Wrong tag value 2 at object 2, expected = %s, get %s\n", tag_value2, tag_value_ret); ret_value = 1; } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_transformation.c b/src/tests/obj_transformation.c index a9e2a23d6..63d6c0568 100644 --- a/src/tests/obj_transformation.c +++ b/src/tests/obj_transformation.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int @@ -101,12 +101,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop_xx = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -142,43 +142,43 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, MPI_COMM_WORLD); if (obj_xx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); if (obj_yy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); if (obj_zz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); if (obj_pxx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); if (obj_pyy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); if (obj_pzz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + 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); if (obj_id11 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + 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); if (obj_id22 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } #endif @@ -225,44 +225,44 @@ main(int argc, char **argv) INCR_STATE, DATA_OUT); #endif if (ret < 0) - printf("PDCobj_transform_register(1) failed\n"); + LOG_ERROR("PDCobj_transform_register(1) failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_decompress", NULL, region_x, obj_xx, region_xx, 1, DECR_STATE, DATA_IN); if (ret < 0) - printf("PDCobj_transform_register(2) failed\n"); + LOG_ERROR("PDCobj_transform_register(2) failed\n"); ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx, region_xx); if (ret < 0) - printf("Array x PDCbuf_obj_map failed\n"); + LOG_ERROR("Array x PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy, region_yy); if (ret < 0) - printf("Array y PDCbuf_obj_map failed\n"); + LOG_ERROR("Array y PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz, region_zz); if (ret < 0) - printf("Array z PDCbuf_obj_map failed\n"); + LOG_ERROR("Array z PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx, region_pxx); if (ret < 0) - printf("Array px PDCbuf_obj_map failed\n"); + LOG_ERROR("Array px PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy, region_pyy); if (ret < 0) - printf("Array py PDCbuf_obj_map failed\n"); + LOG_ERROR("Array py PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz, region_pzz); if (ret < 0) - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_ERROR("Array pz PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11, region_id11); if (ret < 0) - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id1 PDCbuf_obj_map failed\n"); ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22, region_id22); if (ret < 0) - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id2 PDCbuf_obj_map failed\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -272,7 +272,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to map with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to map with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -283,35 +283,35 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_WRITE, PDC_NOBLOCK); if (ret < 0) - printf("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_WRITE, PDC_NOBLOCK); if (ret < 0) - printf("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_zz\n"); + LOG_ERROR("Failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("Failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("Failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("Failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id11\n"); + LOG_ERROR("Failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id22\n"); + LOG_ERROR("Failed to obtain lock for region_id22\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -321,7 +321,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to lock with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to lock with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -346,35 +346,35 @@ main(int argc, char **argv) ret = PDCreg_release_lock(obj_xx, region_xx, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_xx\n"); + LOG_ERROR("Failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy, region_yy, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_yy\n"); + LOG_ERROR("Failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz, region_zz, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_zz\n"); + LOG_ERROR("Failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pxx\n"); + LOG_ERROR("Failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pyy\n"); + LOG_ERROR("Failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pzz\n"); + LOG_ERROR("Failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11, region_id11, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_id11\n"); + LOG_ERROR("Failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22, region_id22, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_id22\n"); + LOG_ERROR("Failed to release lock for region_id22\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -384,7 +384,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to update data with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to update data with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } #ifdef ENABLE_MPI @@ -393,146 +393,146 @@ main(int argc, char **argv) ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) - printf("region xx unmap failed\n"); + LOG_ERROR("region xx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_yy, region_yy); if (ret != SUCCEED) - printf("region yy unmap failed\n"); + LOG_ERROR("region yy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_zz, region_zz); if (ret != SUCCEED) - printf("region zz unmap failed\n"); + LOG_ERROR("region zz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pxx, region_pxx); if (ret != SUCCEED) - printf("region pxx unmap failed\n"); + LOG_ERROR("region pxx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pyy, region_pyy); if (ret != SUCCEED) - printf("region pyy unmap failed\n"); + LOG_ERROR("region pyy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pzz, region_pzz); if (ret != SUCCEED) - printf("region pzz unmap failed\n"); + LOG_ERROR("region pzz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id11, region_id11); if (ret != SUCCEED) - printf("region id11 unmap failed\n"); + LOG_ERROR("region id11 unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id22, region_id22); if (ret != SUCCEED) - printf("region id22 unmap failed\n"); + LOG_ERROR("region id22 unmap failed\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif if (PDCobj_close(obj_xx) < 0) - printf("fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - printf("fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - printf("fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - printf("fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - printf("fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - printf("fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - printf("fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - printf("fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); if (PDCprop_close(obj_prop_xx) < 0) - printf("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Fail to close obj property obj_prop_xx\n"); if (PDCprop_close(obj_prop_yy) < 0) - printf("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Fail to close obj property obj_prop_yy\n"); if (PDCprop_close(obj_prop_zz) < 0) - printf("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Fail to close obj property obj_prop_zz\n"); if (PDCprop_close(obj_prop_pxx) < 0) - printf("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); if (PDCprop_close(obj_prop_pyy) < 0) - printf("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); if (PDCprop_close(obj_prop_pzz) < 0) - printf("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); if (PDCprop_close(obj_prop_id11) < 0) - printf("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Fail to close obj property obj_prop_id11\n"); if (PDCprop_close(obj_prop_id22) < 0) - printf("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Fail to close obj property obj_prop_id22\n"); if (PDCregion_close(region_x) < 0) - printf("fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - printf("fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - printf("fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - printf("fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - printf("fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - printf("fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - printf("fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - printf("fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - printf("fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - printf("fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - printf("fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - printf("fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - printf("fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - printf("fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - printf("fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - printf("fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); free(x); free(y); diff --git a/src/tests/open_cont.c b/src/tests/open_cont.c index dc66d0389..b984e0ad2 100644 --- a/src/tests/open_cont.c +++ b/src/tests/open_cont.c @@ -49,13 +49,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -64,7 +64,7 @@ main(int argc, char **argv) cont_id2 = PDCcont_open("c1", pdc_id); if (cont_id2 == 0) { - printf("Fail to open container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to open container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -73,20 +73,20 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont_id) < 0) { - printf("fail to close container cont_id1\n"); + LOG_ERROR("Fail to close container cont_id1\n"); ret_value = 1; } if (PDCcont_close(cont_id2) < 0) { - printf("fail to close container cont_id2\n"); + LOG_ERROR("Fail to close container cont_id2\n"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/open_existing_obj.c b/src/tests/open_existing_obj.c index 3b7fbc49a..94a29ddce 100644 --- a/src/tests/open_existing_obj.c +++ b/src/tests/open_existing_obj.c @@ -43,61 +43,61 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); sprintf(obj_name1, "o1_%d", rank); sprintf(obj_name2, "o2_%d", rank); // open first object twice open11 = PDCobj_open(obj_name1, pdc); if (open11 == 0) { - printf("Rank %d Fail to open object o1\n", rank); + LOG_ERROR("Rank %d Fail to open object o1\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o1\n", rank); + LOG_INFO("Rank %d Open object o1\n", rank); } open12 = PDCobj_open(obj_name1, pdc); if (open12 == 0) { - printf("Rank %d Fail to open object o1\n", rank); + LOG_ERROR("Rank %d Fail to open object o1\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o1\n", rank); + LOG_INFO("Rank %d Open object o1\n", rank); } // open second object once open21 = PDCobj_open(obj_name2, pdc); if (open21 == 0) { - printf("Rank %d Fail to open object o2\n", rank); + LOG_ERROR("Rank %d Fail to open object o2\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o2\n", rank); + LOG_INFO("Rank %d Open object o2\n", rank); } // close object if (PDCobj_close(open11) < 0) { - printf("Rank %d fail to close object open11\n", rank); + LOG_ERROR("Rank %d fail to close object open11\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open11\n", rank); + LOG_INFO("Rank %d successfully close object open11\n", rank); } if (PDCobj_close(open12) < 0) { - printf("Rank %d fail to close object open12\n", rank); + LOG_ERROR("Rank %d fail to close object open12\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open12\n", rank); + LOG_INFO("Rank %d successfully close object open12\n", rank); } if (PDCobj_close(open21) < 0) { - printf("Rank %d fail to close object open21\n", rank); + LOG_ERROR("Rank %d fail to close object open21\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open21\n", rank); + LOG_INFO("Rank %d successfully close object open21\n", rank); } // close pdc if (PDCclose(pdc) < 0) { - printf("Rank %d fail to close PDC\n", rank); + LOG_ERROR("Rank %d fail to close PDC\n", rank); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/open_obj.c b/src/tests/open_obj.c index 49bbacf6f..e8d527a7d 100644 --- a/src/tests/open_obj.c +++ b/src/tests/open_obj.c @@ -43,146 +43,146 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Rank %d Create a container property\n", rank); + LOG_INFO("Rank %d Create a container property\n", rank); } else { - printf("Rank %d Fail to create container property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create container property!\n", rank); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container c1\n", rank); + LOG_INFO("Rank %d Create a container c1\n", rank); } else { - printf("Rank %d Fail to create container @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create container!\n", rank); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Rank %d Create an object property\n", rank); + LOG_INFO("Rank %d Create an object property\n", rank); } else { - printf("Rank %d Fail to create object property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object property!\n", rank); ret_value = 1; } // create first object sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Rank %d Create an object o1\n", rank); + LOG_INFO("Rank %d Create an object o1\n", rank); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object!\n", rank); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Rank %d Create an object o2\n", rank); + LOG_INFO("Rank %d Create an object o2\n", rank); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object!\n", rank); ret_value = 1; } // open first object twice open11 = PDCobj_open(obj_name1, pdc); if (open11 == 0) { - printf("Rank %d Fail to open object o1\n", rank); + LOG_ERROR("Rank %d Fail to open object o1\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o1\n", rank); + LOG_INFO("Rank %d Open object o1\n", rank); } open12 = PDCobj_open(obj_name1, pdc); if (open12 == 0) { - printf("Rank %d Fail to open object o1\n", rank); + LOG_ERROR("Rank %d Fail to open object o1\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o1\n", rank); + LOG_INFO("Rank %d Open object o1\n", rank); } // open second object once open21 = PDCobj_open(obj_name2, pdc); if (open21 == 0) { - printf("Rank %d Fail to open object o2\n", rank); + LOG_ERROR("Rank %d Fail to open object o2\n", rank); ret_value = 1; } else { - printf("Rank %d Open object o2\n", rank); + LOG_INFO("Rank %d Open object o2\n", rank); } // close object if (PDCobj_close(obj1) < 0) { - printf("Rank %d fail to close object o1\n", rank); + LOG_ERROR("Rank %d Fail to close object o1\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object o1\n", rank); + LOG_INFO("Rank %d successfully close object o1\n", rank); } if (PDCobj_close(open11) < 0) { - printf("Rank %d fail to close object open11\n", rank); + LOG_ERROR("Rank %d Fail to close object open11\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open11\n", rank); + LOG_INFO("Rank %d successfully close object open11\n", rank); } if (PDCobj_close(open12) < 0) { - printf("Rank %d fail to close object open12\n", rank); + LOG_ERROR("Rank %d Fail to close object open12\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open12\n", rank); + LOG_INFO("Rank %d successfully close object open12\n", rank); } if (PDCobj_close(obj2) < 0) { - printf("Rank %d fail to close object o2\n", rank); + LOG_ERROR("Rank %d Fail to close object o2\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object o2\n", rank); + LOG_INFO("Rank %d successfully close object o2\n", rank); } if (PDCobj_close(open21) < 0) { - printf("Rank %d fail to close object open21\n", rank); + LOG_ERROR("Rank %d Fail to close object open21\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object open21\n", rank); + LOG_INFO("Rank %d successfully close object open21\n", rank); } // close a container if (PDCcont_close(cont) < 0) { - printf("Rank %d fail to close container c1\n", rank); + LOG_ERROR("Rank %d Fail to close container c1\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container c1\n", rank); + LOG_INFO("Rank %d successfully close container c1\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d successfully close object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d successfully close container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { - printf("Rank %d fail to close PDC\n", rank); + LOG_ERROR("Rank %d Fail to close PDC\n", rank); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/open_obj_round_robin.c b/src/tests/open_obj_round_robin.c index 3c11dba99..02207e968 100644 --- a/src/tests/open_obj_round_robin.c +++ b/src/tests/open_obj_round_robin.c @@ -51,15 +51,15 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Rank %d Create a container property\n", rank); + LOG_INFO("Rank %d Create a container property\n", rank); } else { - printf("Rank %d Fail to create container property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create container property!\n", rank); ret_value = 1; } // create a container @@ -67,29 +67,29 @@ main(int argc, char **argv) cont = PDCcont_create_col(cont_name, cont_prop); // cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Rank %d Create a container %s\n", rank, cont_name); + LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - printf("Rank %d Fail to create container @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create container!\n", rank); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Rank %d Create an object property\n", rank); + LOG_INFO("Rank %d Create an object property\n", rank); } else { - printf("Rank %d Fail to create object property @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object property!\n", rank); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } @@ -97,10 +97,10 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Rank %d Create an object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Create an object %s\n", rank, obj_name1); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object!\n", rank); ret_value = 1; } @@ -108,27 +108,27 @@ main(int argc, char **argv) sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Rank %d Create an object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Create an object %s\n", rank, obj_name2); } else { - printf("Rank %d Fail to create object @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to create object!\n", rank); ret_value = 1; } // close created objects if (PDCobj_close(obj1) < 0) { - printf("Rank %d fail to close object o1\n", rank); + LOG_ERROR("Rank %d Fail to close object o1\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object o1\n", rank); + LOG_INFO("Rank %d successfully close object o1\n", rank); } if (PDCobj_close(obj2) < 0) { - printf("Rank %d fail to close object o2\n", rank); + LOG_ERROR("Rank %d Fail to close object o2\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object o2\n", rank); + LOG_INFO("Rank %d successfully close object o2\n", rank); } // Wait for all processes to finish their object creation #ifdef ENABLE_MPI @@ -138,119 +138,121 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", (rank + i) % size); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 == 0) { - printf("Rank %d Fail to open object %s\n", rank, obj_name1); + LOG_ERROR("Rank %d Fail to open object %s\n", rank, obj_name1); ret_value = 1; } else { - printf("Rank %d Opened object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Opened object %s\n", rank, obj_name1); } sprintf(obj_name2, "o2_%d", (rank + i) % size); obj2 = PDCobj_open(obj_name2, pdc); if (obj2 == 0) { - printf("Rank %d Fail to open object %s\n", rank, obj_name2); + LOG_ERROR("Rank %d Fail to open object %s\n", rank, obj_name2); ret_value = 1; } else { - printf("Rank %d Open object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Open object %s\n", rank, obj_name2); } obj1_info = PDCobj_get_info(obj1); obj2_info = PDCobj_get_info(obj2); if (strcmp(obj1_info->name, obj_name1) != 0) { - printf("Object 1 name is wrong at rank %d\n", rank); + LOG_ERROR("Object 1 name is wrong at rank %d\n", rank); ret_value = 1; } if (obj1_info->obj_pt->type != PDC_DOUBLE) { - printf("Type is not properly inherited from object 1 property at rank %d.\n", rank); + LOG_ERROR("Type is not properly inherited from object 1 property at rank %d.\n", rank); ret_value = 1; } if (obj1_info->obj_pt->ndim != ndim) { - printf("Number of dimensions is not properly inherited from object 1 property at rank %d.\n", - rank); + LOG_ERROR("Number of dimensions is not properly inherited from object 1 property at rank %d.\n", + rank); ret_value = 1; } if (obj1_info->obj_pt->dims[0] != (unsigned)(i + rank) % size * 2 + 1) { - printf("First dimension is not properly inherited from object 1 property at rank %d.\n", rank); + LOG_ERROR("First dimension is not properly inherited from object 1 property at rank %d.\n", rank); ret_value = 1; } if (obj1_info->obj_pt->dims[1] != (unsigned)(i + rank) % size * 3 + 2) { - printf("Second dimension is not properly inherited from object 1 property at rank %d.\n", rank); + LOG_ERROR("Second dimension is not properly inherited from object 1 property at rank %d.\n", + rank); ret_value = 1; } if (obj1_info->obj_pt->dims[2] != (unsigned)(i + rank) % size * 5 + 3) { - printf("Third dimension is not properly inherited from object 1 property at rank %d.\n", rank); + LOG_ERROR("Third dimension is not properly inherited from object 1 property at rank %d.\n", rank); ret_value = 1; } if (strcmp(obj2_info->name, obj_name2) != 0) { - printf("Object 2 name is wrong\n"); + LOG_ERROR("Object 2 name is wrong\n"); ret_value = 1; } if (obj2_info->obj_pt->type != PDC_DOUBLE) { - printf("Type is not properly inherited from object property.\n"); + LOG_ERROR("Type is not properly inherited from object property.\n"); ret_value = 1; } if (obj2_info->obj_pt->ndim != ndim) { - printf("Number of dimensions is not properly inherited from object property at rank %d.\n", rank); + LOG_ERROR("Number of dimensions is not properly inherited from object property at rank %d.\n", + rank); ret_value = 1; } if (obj2_info->obj_pt->dims[0] != (unsigned)(i + rank) % size * 2 + 1) { - printf("First dimension is not properly inherited from object property at rank %d.\n", rank); + LOG_ERROR("First dimension is not properly inherited from object property at rank %d.\n", rank); ret_value = 1; } if (obj2_info->obj_pt->dims[1] != (unsigned)(i + rank) % size * 3 + 2) { - printf("Second dimension is not properly inherited from object property at rank %d.\n", rank); + LOG_ERROR("Second dimension is not properly inherited from object property at rank %d.\n", rank); ret_value = 1; } if (obj2_info->obj_pt->dims[2] != (unsigned)(i + rank) % size * 5 + 3) { - printf("Third dimension is not properly inherited from object property at rank %d.\n", rank); + LOG_ERROR("Third dimension is not properly inherited from object property at rank %d.\n", rank); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("Rank %d fail to close object %s\n", rank, obj_name1); + LOG_ERROR("Rank %d Fail to close object %s\n", rank, obj_name1); ret_value = 1; } else { - printf("Rank %d successfully close object %s\n", rank, obj_name1); + LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name1); } if (PDCobj_close(obj2) < 0) { - printf("Rank %d fail to close object %s\n", rank, obj_name2); + LOG_ERROR("Rank %d Fail to close object %s\n", rank, obj_name2); ret_value = 1; } else { - printf("Rank %d successfully close object %s\n", rank, obj_name2); + LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name2); } } // close a container if (PDCcont_close(cont) < 0) { - printf("Rank %d fail to close container c1\n", rank); + LOG_ERROR("Rank %d Fail to close container c1\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container c1\n", rank); + LOG_INFO("Rank %d successfully close container c1\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d successfully close object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Rank %d Fail to close property @ line %d\n", rank, __LINE__); + LOG_ERROR("Rank %d Fail to close property\n", rank); ret_value = 1; } else { - printf("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d successfully close container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { - printf("Rank %d fail to close PDC\n", rank); + LOG_ERROR("Rank %d Fail to close PDC\n", rank); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/pdc_analysis_lib.c b/src/tests/pdc_analysis_lib.c index 5341bd13f..df877ec06 100644 --- a/src/tests/pdc_analysis_lib.c +++ b/src/tests/pdc_analysis_lib.c @@ -41,21 +41,21 @@ demo_sum(pdcid_t iterIn, pdcid_t iterOut) int *dataIn = NULL; int *dataOut = NULL; int blockLengthOut, blockLengthIn; - printf("Entered: %s\n----------------\n", __func__); + LOG_INFO("Entered: \n----------------\n"); if ((blockLengthOut = PDCobj_data_getNextBlock(iterOut, (void **)&dataOut, NULL)) > 0) { while ((blockLengthIn = PDCobj_data_getNextBlock(iterIn, (void **)&dataIn, NULL)) > 0) { - printf("Summing %d elements\n", blockLengthIn); + LOG_INFO("Summing %d elements\n", blockLengthIn); for (i = 0, k = 0; i < blockLengthIn; i++) { - printf("\t%d\n", dataIn[i]); + LOG_INFO("\t%d\n", dataIn[i]); total += dataIn[i]; } - printf("\nSum = %d\n", total); + LOG_INFO("\nSum = %d\n", total); dataOut[k++] = total; total = 0; } } - printf("Leaving: %s\n----------------\n", __func__); + LOG_INFO("Leaving: \n----------------\n"); return 0; } @@ -74,7 +74,7 @@ check_mpi_access() #ifdef ENABLE_MPI MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); - printf("MPI rank is %d of %d\n", rank, size); + LOG_INFO("MPI rank is %d of %d\n", rank, size); #endif } diff --git a/src/tests/pdc_init.c b/src/tests/pdc_init.c index 4ffb5092e..d74d48b29 100644 --- a/src/tests/pdc_init.c +++ b/src/tests/pdc_init.c @@ -42,11 +42,11 @@ main(int argc, char **argv) #endif pdc = PDCinit("pdc"); - printf("generated new pdc\n"); + LOG_INFO("generated new pdc\n"); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/pdc_transforms_lib.c b/src/tests/pdc_transforms_lib.c index 6397bdc70..a3a65e299 100644 --- a/src/tests/pdc_transforms_lib.c +++ b/src/tests/pdc_transforms_lib.c @@ -436,7 +436,7 @@ pdc_convert_datatype(void *dataIn, PDC_var_type_t srcType, int ndim, uint64_t *d else storage_in_bytes = elements; } - printf("pdc_convert_datatype: elements = %ld\n", elements); + LOG_INFO("pdc_convert_datatype: elements = %ld\n", elements); switch (srcType) { case PDC_INT: { @@ -578,7 +578,7 @@ pdc_transform_increment(void *dataIn, PDC_var_type_t srcType, int ndim, uint64_t typesize = sizeof(short); } - fprintf(stdout, "\n[TRANSFORM] Entering pdc_transform_increment\n"); + LOG_INFO("\n[TRANSFORM] Entering pdc_transform_increment\n"); nval = 1; for (i = 0; i < ndim; i++) { @@ -603,14 +603,14 @@ pdc_transform_increment(void *dataIn, PDC_var_type_t srcType, int ndim, uint64_t } break; default: - fprintf(stdout, "\n[TRANSFORM] Unable to increment values\n"); + LOG_INFO("\n[TRANSFORM] Unable to increment values\n"); return -1; break; } *dataOut = destBuff; - fprintf(stdout, "\n[TRANSFORM] %ld values successfully incremented\n", nval); + LOG_INFO("\n[TRANSFORM] %ld values successfully incremented\n", nval); return nval; } @@ -636,26 +636,26 @@ pdc_transform_compress(void *dataIn, PDC_var_type_t srcType, int ndim, uint64_t else if (srcType == PDC_INT8) typesize = 1; - fprintf(stdout, "\n[TRANSFORM] Entering pdc_transform_compress\n"); + LOG_INFO("\n[TRANSFORM] Entering pdc_transform_compress\n"); nval = 1; for (i = 0; i < ndim; i++) nval *= dims[i]; nbytes = nval * typesize; - fprintf(stdout, "[TRANSFORM] Src Buffer size : %d * %d = %ld\n", nval, typesize, nbytes); + LOG_INFO("[TRANSFORM] Src Buffer size : %d * %d = %ld\n", nval, typesize, nbytes); destsize = nbytes + BLOSC_MAX_OVERHEAD; - fprintf(stdout, "[TRANSFORM] Dest Buffer size : %ld + %d = %ld\n", nbytes, BLOSC_MAX_OVERHEAD, destsize); + LOG_INFO("[TRANSFORM] Dest Buffer size : %ld + %d = %ld\n", nbytes, BLOSC_MAX_OVERHEAD, destsize); destBuff = malloc(destsize); csize = blosc_compress(clevel, doshuffle, typesize, nbytes, dataIn, destBuff, destsize); if (csize < 0) - fprintf(stdout, "[TRANSFORM] Error while compressing data (errcode: %ld)\n", csize); + LOG_INFO("[TRANSFORM] Error while compressing data (errcode: %ld)\n", csize); if (csize == 0) - fprintf(stdout, "[TRANSFORM] Unable to compress data (errcode: %ld)\n", csize); + LOG_INFO("[TRANSFORM] Unable to compress data (errcode: %ld)\n", csize); if (csize > 0) { - fprintf(stdout, "[TRANSFORM] Data sucessfully compressed from %ld B to %ld B\n", nbytes, csize); + LOG_INFO("[TRANSFORM] Data sucessfully compressed from %ld B to %ld B\n", nbytes, csize); } *dataOut = destBuff; return csize; @@ -669,7 +669,7 @@ pdc_transform_decompress(void *dataIn, PDC_var_type_t srcType, int ndim, uint64_ size_t typesize, destsize, dsize; void * destBuff = *dataOut; - fprintf(stdout, "\n[TRANSFORM] Entering pdc_transform_decompress\n"); + LOG_INFO("\n[TRANSFORM] Entering pdc_transform_decompress\n"); if ((destType == PDC_INT) || (destType == PDC_UINT) || (destType == PDC_FLOAT)) typesize = sizeof(int); @@ -688,8 +688,8 @@ pdc_transform_decompress(void *dataIn, PDC_var_type_t srcType, int ndim, uint64_ dsize = (size_t)blosc_decompress(dataIn, destBuff, destsize); if (dsize <= 0) - fprintf(stdout, "[TRANSFORM] Error while decompressing data (errcode: %zu)\n", dsize); + LOG_INFO("[TRANSFORM] Error while decompressing data (errcode: %zu)\n", dsize); else - fprintf(stdout, "[TRANSFORM] Data sucessfully decompressed!\n"); + LOG_INFO("[TRANSFORM] Data sucessfully decompressed!\n"); return dsize; } diff --git a/src/tests/producer_waitall.c b/src/tests/producer_waitall.c index 379b8a255..90eb9f972 100644 --- a/src/tests/producer_waitall.c +++ b/src/tests/producer_waitall.c @@ -38,14 +38,10 @@ write_read_wait_all(pdcid_t obj_id, int iterations) offset_remote += chunk_size; tids[i] = PDCregion_transfer_create(data_out, PDC_WRITE, obj_id, region_local, region_remote); if (tids[i] == 0) - printf("transfer request creation failed\n"); - /* ret = PDCregion_transfer_start(tids[i]); */ - /* if (ret != SUCCEED) */ - /* printf("Failed to start transfer\n"); */ + LOG_ERROR("transfer request creation failed\n"); } - /* printf("rank %d call wait_all on tids.\n", mpi_rank); */ - fprintf(stderr, "Rank %4d: create took %.6f\n", mpi_rank, MPI_Wtime() - stime); + LOG_ERROR("Rank %4d: create took %.6f\n", mpi_rank, MPI_Wtime() - stime); MPI_Barrier(MPI_COMM_WORLD); @@ -53,9 +49,9 @@ write_read_wait_all(pdcid_t obj_id, int iterations) ret = PDCregion_transfer_start_all(tids, iterations); if (ret != SUCCEED) - printf("Failed to start transfer\n"); + LOG_ERROR("Failed to start transfer\n"); - fprintf(stderr, "Rank %4d: start all tids took %.6f\n", mpi_rank, MPI_Wtime() - stime); + LOG_ERROR("Rank %4d: start all tids took %.6f\n", mpi_rank, MPI_Wtime() - stime); stime = MPI_Wtime(); @@ -63,10 +59,9 @@ write_read_wait_all(pdcid_t obj_id, int iterations) ret = PDCregion_transfer_wait_all(tids, iterations); if (ret != SUCCEED) - printf("Failed to wait all transfer\n"); + LOG_ERROR("Failed to wait all transfer\n"); - /* printf("rank %d read before wait_all()\n", mpi_rank); */ - fprintf(stderr, "Rank %4d: wait all tids took %.6f\n", mpi_rank, MPI_Wtime() - stime); + LOG_ERROR("Rank %4d: wait all tids took %.6f\n", mpi_rank, MPI_Wtime() - stime); MPI_Barrier(MPI_COMM_WORLD); @@ -79,8 +74,8 @@ write_read_wait_all(pdcid_t obj_id, int iterations) ret = PDCregion_transfer_start(read_tid); ret = PDCregion_transfer_wait(read_tid); ret = PDCregion_transfer_close(read_tid); - /* printf("rank %d read success!\n", mpi_rank); */ - fprintf(stderr, "Rank %4d: create wait read took %.6f\n", mpi_rank, MPI_Wtime() - stime); + + LOG_ERROR("Rank %4d: create wait read took %.6f\n", mpi_rank, MPI_Wtime() - stime); // Write more stime = MPI_Wtime(); @@ -94,33 +89,26 @@ write_read_wait_all(pdcid_t obj_id, int iterations) offset_remote += chunk_size; tids2[i] = PDCregion_transfer_create(data_out, PDC_WRITE, obj_id, region_local, region_remote); if (tids2[i] == 0) - printf("transfer request creation failed\n"); - /* ret = PDCregion_transfer_start(tids2[i]); */ - /* if (ret != SUCCEED) */ - /* printf("Failed to start transfer\n"); */ + LOG_ERROR("transfer request creation failed\n"); } - fprintf(stderr, "Rank %4d: create tids2 took %.6f\n", mpi_rank, MPI_Wtime() - stime); + LOG_ERROR("Rank %4d: create tids2 took %.6f\n", mpi_rank, MPI_Wtime() - stime); MPI_Barrier(MPI_COMM_WORLD); stime = MPI_Wtime(); ret = PDCregion_transfer_start_all(tids2, N); if (ret != SUCCEED) - printf("Failed to start transfer\n"); + LOG_ERROR("Failed to start transfer\n"); - fprintf(stderr, "Rank %4d: start tids2 took %.6f\n", mpi_rank, MPI_Wtime() - stime); - /* ret = PDCregion_transfer_wait_all(tids, (iterations)); */ - /* if (ret != SUCCEED) */ - /* printf("Failed to transfer wait\n"); */ + LOG_ERROR("Rank %4d: start tids2 took %.6f\n", mpi_rank, MPI_Wtime() - stime); MPI_Barrier(MPI_COMM_WORLD); stime = MPI_Wtime(); - /* printf("rank %d call wait_all on tids2.\n", mpi_rank); */ - ret = PDCregion_transfer_wait_all(tids2, (N)); + ret = PDCregion_transfer_wait_all(tids2, (N)); if (ret != SUCCEED) - printf("Failed to transfer wait\n"); + LOG_ERROR("Failed to transfer wait\n"); - fprintf(stderr, "Rank %4d: wait all tids2 took %.6f\n", mpi_rank, MPI_Wtime() - stime); + LOG_ERROR("Rank %4d: wait all tids2 took %.6f\n", mpi_rank, MPI_Wtime() - stime); MPI_Barrier(MPI_COMM_WORLD); stime = MPI_Wtime(); @@ -128,15 +116,15 @@ write_read_wait_all(pdcid_t obj_id, int iterations) for (int i = 0; i < iterations; i++) { ret = PDCregion_transfer_close(tids[i]); if (ret != SUCCEED) - printf("region transfer close failed\n"); + LOG_ERROR("region transfer close failed\n"); } for (int i = 0; i < N; i++) { ret = PDCregion_transfer_close(tids2[i]); if (ret != SUCCEED) - printf("region transfer close failed\n"); + LOG_ERROR("region transfer close failed\n"); } - fprintf(stderr, "Rank %4d: close all took %.6f\n", mpi_rank, MPI_Wtime() - stime); + LOG_ERROR("Rank %4d: close all took %.6f\n", mpi_rank, MPI_Wtime() - stime); free(data_in); free(data_out); @@ -164,12 +152,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); } // create an object property @@ -191,18 +179,18 @@ main(int argc, char **argv) write_read_wait_all(obj_id, 1000); MPI_Barrier(MPI_COMM_WORLD); - fprintf(stderr, "Rank %4d: Write read wait all took %.6f\n", mpi_rank, MPI_Wtime() - stime); + LOG_ERROR("Rank %4d: Write read wait all took %.6f\n", mpi_rank, MPI_Wtime() - stime); if (PDCobj_close(obj_id) < 0) { - printf("fail to close obj_id\n"); + LOG_ERROR("Fail to close obj_id\n"); } if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); } MPI_Finalize(); diff --git a/src/tests/query_data.c b/src/tests/query_data.c index 62112f6ed..393cc0a12 100644 --- a/src/tests/query_data.c +++ b/src/tests/query_data.c @@ -12,7 +12,7 @@ void print_usage() { - printf("Usage: srun -n ./query_data obj_name size_MB\n"); + LOG_JUST_PRINT("Usage: srun -n ./query_data obj_name size_MB\n"); } int @@ -60,7 +60,7 @@ main(int argc, char **argv) size_MB = atoi(argv[2]); if (rank == 0) { - printf("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); + LOG_INFO("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); } size_MB *= 1048576; @@ -70,19 +70,19 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } my_data_count = size_MB / size; @@ -96,11 +96,11 @@ main(int argc, char **argv) // Create a object with only rank 0 if (rank == 0) { - printf("Creating an object with name [%s]\n", obj_name); + LOG_INFO("Creating an object with name [%s]\n", obj_name); fflush(stdout); obj_id = PDCobj_create(cont, obj_name, obj_prop); if (obj_id <= 0) { - printf("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); ret_value = 1; } } @@ -112,7 +112,7 @@ main(int argc, char **argv) // Query the created object PDC_Client_query_metadata_name_timestep(obj_name, 0, &metadata, &metadata_server_id); if (metadata == NULL || metadata->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); ret_value = 1; } @@ -142,7 +142,7 @@ main(int argc, char **argv) ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to write data with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to write data with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -171,16 +171,16 @@ main(int argc, char **argv) PDCselection_free(&sel); // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/query_metadata_agg.c b/src/tests/query_metadata_agg.c index 7ad9cd4b3..019ff4d9e 100644 --- a/src/tests/query_metadata_agg.c +++ b/src/tests/query_metadata_agg.c @@ -10,7 +10,7 @@ void print_usage() { - printf("Usage: srun -n ./data_server_read obj_name size_MB\n"); + LOG_JUST_PRINT("Usage: srun -n ./data_server_read obj_name size_MB\n"); } int @@ -28,22 +28,21 @@ main(int argc, const char *argv[]) // create a pdc pdcid_t pdc = PDC_init("pdc"); - /* printf("create a new pdc, pdc id is: %lld\n", pdc); */ // create a container property pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); pdcid_t test_obj = -1; uint64_t my_data_size = size_MB / size; @@ -59,26 +58,25 @@ main(int argc, const char *argv[]) // Create a object with only rank 0 if (rank == 0) { - /* printf("Creating an object with name [%s]", obj_name); */ + /* fflush(stdout); */ test_obj = PDCobj_create(cont, obj_name, obj_prop); if (test_obj <= 0) { - printf("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "DataServerTestBin"); exit(-1); } } - /* printf("%d: object created.\n", rank); */ #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif // Query the created object - /* printf("%d: Start to query object just created.\n", rank); */ + pdc_metadata_t *metadata; PDC_Client_query_metadata_name_timestep_agg(obj_name, 0, &metadata); if (metadata == NULL || metadata->obj_id == 0) { - printf("Proc %d: Error with metadata!\n", rank); + LOG_ERROR("Proc %d: Error with metadata!\n", rank); exit(-1); } @@ -89,14 +87,14 @@ main(int argc, const char *argv[]) done: // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container %lu\n", cont); + LOG_ERROR("Fail to close container %lu\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/query_vpic.c b/src/tests/query_vpic.c index 5b3a43305..8371e8fc8 100644 --- a/src/tests/query_vpic.c +++ b/src/tests/query_vpic.c @@ -28,7 +28,7 @@ main(void) PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; @@ -44,9 +44,9 @@ main(void) gettimeofday(&pdc_timer_end, 0); double get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); - printf(" Query results:\n"); + LOG_INFO(" Query results:\n"); if (sel.nhits < 500) PDCselection_print_all(&sel); else @@ -63,22 +63,22 @@ main(void) gettimeofday(&pdc_timer_end, 0); double get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); - printf("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); for (i = 0; i < sel.nhits; i++) { if (energy_data[i] > energy_hi0 || energy_data[i] < energy_lo0) { - printf("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); + LOG_ERROR("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); } } - printf("Verified: all correct!\n"); + LOG_INFO("Verified: all correct!\n"); PDCquery_free_all(q); PDCselection_free(&sel); done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds1_nopreload.c b/src/tests/query_vpic_bin_sds1_nopreload.c index c2ce6e8d2..a91c2edc5 100644 --- a/src/tests/query_vpic_bin_sds1_nopreload.c +++ b/src/tests/query_vpic_bin_sds1_nopreload.c @@ -30,21 +30,21 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("x", 0, &x_meta); if (x_meta == NULL || x_meta->obj_id == 0) { - printf("Error with x metadata!\n"); + LOG_ERROR("Error with x metadata!\n"); goto done; } x_id = x_meta->obj_id; PDC_Client_query_metadata_name_timestep("y", 0, &y_meta); if (y_meta == NULL || y_meta->obj_id == 0) { - printf("Error with y metadata!\n"); + LOG_ERROR("Error with y metadata!\n"); goto done; } y_id = y_meta->obj_id; PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; @@ -64,8 +64,8 @@ main(void) q3 = PDCquery_and(q3_lo, q3_hi); q = PDCquery_and(q3, q12); - printf("Query: Energy > %.1f && %.1f < X < %.1f && %.1f < Y < %.1f\n", energy_lo0, x_lo, x_hi, y_lo, - y_hi); + LOG_INFO("Query: Energy > %.1f && %.1f < X < %.1f && %.1f < Y < %.1f\n", energy_lo0, x_lo, x_hi, y_lo, + y_hi); // Get selection gettimeofday(&pdc_timer_start, 0); @@ -78,8 +78,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Query result in (%" PRIu64 " hits):\n", sel.nhits); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Query result in (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -95,7 +95,7 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); fflush(stdout); } @@ -112,7 +112,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds1_preload.c b/src/tests/query_vpic_bin_sds1_preload.c index b6e3dd5a3..550297bc8 100644 --- a/src/tests/query_vpic_bin_sds1_preload.c +++ b/src/tests/query_vpic_bin_sds1_preload.c @@ -35,27 +35,27 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("x", 0, &x_meta); if (x_meta == NULL || x_meta->obj_id == 0) { - printf("Error with x metadata!\n"); + LOG_ERROR("Error with x metadata!\n"); goto done; } x_id = x_meta->obj_id; PDC_Client_query_metadata_name_timestep("y", 0, &y_meta); if (y_meta == NULL || y_meta->obj_id == 0) { - printf("Error with y metadata!\n"); + LOG_ERROR("Error with y metadata!\n"); goto done; } y_id = y_meta->obj_id; PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; // Construct query constraints - printf("Preload the data\n"); + LOG_INFO("Preload the data\n"); qpreload_energy = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &preload_value); qpreload_x = PDCquery_create(x_id, PDC_GT, PDC_FLOAT, &preload_int); qpreload_y = PDCquery_create(y_id, PDC_GT, PDC_FLOAT, &preload_int); @@ -64,7 +64,7 @@ main(void) qpreload = PDCquery_or(qpreload_energy, qpreload_xy); PDCquery_get_nhits(qpreload, &nhits); - printf("Preload data, total %" PRIu64 " elements\n", nhits); + LOG_INFO("Preload data, total %" PRIu64 " elements\n", nhits); PDCquery_free_all(qpreload); ql = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &energy_lo0); @@ -81,8 +81,8 @@ main(void) q3 = PDCquery_and(q3_lo, q3_hi); q = PDCquery_and(q3, q12); - printf("Query: Energy > %.1f && %.1f < X < %.1f && %.1f < Y < %.1f\n", energy_lo0, x_lo, x_hi, y_lo, - y_hi); + LOG_INFO("Query: Energy > %.1f && %.1f < X < %.1f && %.1f < Y < %.1f\n", energy_lo0, x_lo, x_hi, y_lo, + y_hi); // Get selection gettimeofday(&pdc_timer_start, 0); @@ -91,8 +91,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Query result in (%" PRIu64 " hits):\n", sel.nhits); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Query result in (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -108,7 +108,7 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); fflush(stdout); } @@ -128,7 +128,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds_nopreload.c b/src/tests/query_vpic_bin_sds_nopreload.c index d4a89dd44..9e2373815 100644 --- a/src/tests/query_vpic_bin_sds_nopreload.c +++ b/src/tests/query_vpic_bin_sds_nopreload.c @@ -36,39 +36,39 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("x", 0, &x_meta); if (x_meta == NULL || x_meta->obj_id == 0) { - printf("Error with x metadata!\n"); + LOG_ERROR("Error with x metadata!\n"); goto done; } x_id = x_meta->obj_id; if (rank == 0) - printf("x_id = %" PRIu64 "\n", x_id); + LOG_INFO("x_id = %" PRIu64 "\n", x_id); PDC_Client_query_metadata_name_timestep("y", 0, &y_meta); if (y_meta == NULL || y_meta->obj_id == 0) { - printf("Error with y metadata!\n"); + LOG_ERROR("Error with y metadata!\n"); goto done; } y_id = y_meta->obj_id; if (rank == 0) - printf("y_id = %" PRIu64 "\n", y_id); + LOG_INFO("y_id = %" PRIu64 "\n", y_id); PDC_Client_query_metadata_name_timestep("z", 0, &z_meta); if (z_meta == NULL || z_meta->obj_id == 0) { - printf("Error with z metadata!\n"); + LOG_ERROR("Error with z metadata!\n"); goto done; } z_id = z_meta->obj_id; if (rank == 0) - printf("z_id = %" PRIu64 "\n", z_id); + LOG_INFO("z_id = %" PRIu64 "\n", z_id); PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; if (rank == 0) - printf("energy_id = %" PRIu64 "\n", energy_id); + LOG_INFO("energy_id = %" PRIu64 "\n", energy_id); q1_lo = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &energy_lo); q1_hi = PDCquery_create(energy_id, PDC_LT, PDC_FLOAT, &energy_hi); @@ -87,8 +87,8 @@ main(void) q = PDCquery_and(q3, q12); - printf("Query: %.1f< Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f\n", energy_lo, energy_hi, x_lo, - x_hi, y_lo, y_hi); + LOG_INFO("Query: %.1f< Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f\n", energy_lo, energy_hi, x_lo, + x_hi, y_lo, y_hi); // Get selection gettimeofday(&pdc_timer_start, 0); @@ -97,8 +97,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Query result in (%" PRIu64 " hits):\n", sel.nhits); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Query result in (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -114,7 +114,7 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); fflush(stdout); } @@ -131,7 +131,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds_preload.c b/src/tests/query_vpic_bin_sds_preload.c index c0606f66d..a0c68cbc7 100644 --- a/src/tests/query_vpic_bin_sds_preload.c +++ b/src/tests/query_vpic_bin_sds_preload.c @@ -34,27 +34,27 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("x", 0, &x_meta); if (x_meta == NULL || x_meta->obj_id == 0) { - printf("Error with x metadata!\n"); + LOG_ERROR("Error with x metadata!\n"); goto done; } x_id = x_meta->obj_id; PDC_Client_query_metadata_name_timestep("y", 0, &y_meta); if (y_meta == NULL || y_meta->obj_id == 0) { - printf("Error with y metadata!\n"); + LOG_ERROR("Error with y metadata!\n"); goto done; } y_id = y_meta->obj_id; PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; // Construct query constraints - printf("Preload the data\n"); + LOG_INFO("Preload the data\n"); qpreload_energy = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &preload_value); qpreload_x = PDCquery_create(x_id, PDC_GT, PDC_FLOAT, &preload_value); qpreload_y = PDCquery_create(y_id, PDC_GT, PDC_FLOAT, &preload_value); @@ -63,7 +63,7 @@ main(void) qpreload = PDCquery_or(qpreload_xy, qpreload_energy); PDCquery_get_nhits(qpreload, &nhits); - printf("Preload data, total %" PRIu64 " elements\n", nhits); + LOG_INFO("Preload data, total %" PRIu64 " elements\n", nhits); PDCquery_free_all(qpreload); q1_lo = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &energy_lo); @@ -83,8 +83,8 @@ main(void) q = PDCquery_and(q3, q12); - printf("Query: Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f && %.1f\n", energy_lo, energy_hi, x_lo, - x_hi, y_lo, y_hi); + LOG_INFO("Query: Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f && %.1f\n", energy_lo, energy_hi, + x_lo, x_hi, y_lo, y_hi); // Get selection gettimeofday(&pdc_timer_start, 0); @@ -93,8 +93,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Query result in (%" PRIu64 " hits):\n", sel.nhits); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Query result in (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -110,7 +110,7 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); fflush(stdout); } @@ -130,7 +130,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_create_data.c b/src/tests/query_vpic_create_data.c index 49c709185..35b5ae750 100644 --- a/src/tests/query_vpic_create_data.c +++ b/src/tests/query_vpic_create_data.c @@ -77,7 +77,7 @@ main(int argc, char **argv) MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); #else - printf("MPI NOT Enabled!\n"); + LOG_INFO("MPI NOT Enabled!\n"); fflush(stdout); #endif @@ -97,7 +97,7 @@ main(int argc, char **argv) uint64_t int_dims[NDIM] = {int_bytes * size}; if (rank == 0) - printf("creating %d variables each with %" PRIu64 " particles \n", write_var, nparticles); + LOG_INFO("creating %d variables each with %" PRIu64 " particles \n", write_var, nparticles); // Float vars are first in the array follow by int vars for (i = 0; i < NUM_FLOAT_VAR; i++) @@ -109,10 +109,10 @@ main(int argc, char **argv) pdc_id = PDCinit("pdc"); cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create object property for float and int obj_prop_float = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -137,7 +137,7 @@ main(int argc, char **argv) if (rank == 0) { obj_ids[i] = PDCobj_create(cont_id, obj_names[i], obj_prop_float); if (obj_ids[i] <= 0) { - printf("Error getting an object %s from server, exit...\n", obj_names[i]); + LOG_ERROR("Error getting an object %s from server, exit...\n", obj_names[i]); goto done; } } @@ -152,7 +152,7 @@ main(int argc, char **argv) if (rank == 0) { obj_ids[i] = PDCobj_create(cont_id, obj_names[i], obj_prop_int); if (obj_ids[i] <= 0) { - printf("Error getting an object %s from server, exit...\n", obj_names[i]); + LOG_ERROR("Error getting an object %s from server, exit...\n", obj_names[i]); goto done; } } @@ -174,7 +174,7 @@ main(int argc, char **argv) ret = PDC_Client_query_metadata_name_timestep(obj_names[i], 0, &obj_metas[i]); #endif if (ret != SUCCEED || obj_metas[i] == NULL || obj_metas[i]->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); exit(-1); } } @@ -191,7 +191,7 @@ main(int argc, char **argv) } if (rank == 0) - printf("Write out %d variables\n", write_var); + LOG_INFO("Write out %d variables\n", write_var); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -202,7 +202,7 @@ main(int argc, char **argv) for (i = 0; i < write_var; i++) { ret = PDC_Client_write(obj_metas[i], &obj_regions[i], mydata[i]); if (ret != SUCCEED) { - printf("Error with PDC_Client_iwrite!\n"); + LOG_ERROR("Error with PDC_Client_iwrite!\n"); goto done; } } @@ -215,25 +215,25 @@ main(int argc, char **argv) write_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); total_size = nparticles * 4.0 * write_var * size / 1048576.0; if (rank == 0) { - printf("Write %f MB data with %d ranks\nTotal write time: %.2f\n", total_size, size, write_time); + LOG_INFO("Write %f MB data with %d ranks\nTotal write time: %.2f\n", total_size, size, write_time); fflush(stdout); } done: if (PDCprop_close(obj_prop_float) < 0) - printf("Fail to close float obj property \n"); + LOG_ERROR("Fail to close float obj property \n"); if (PDCprop_close(obj_prop_int) < 0) - printf("Fail to close int obj property \n"); + LOG_ERROR("Fail to close int obj property \n"); if (PDCcont_close(cont_id) < 0) - printf("Fail to close container\n"); + LOG_ERROR("Fail to close container\n"); if (PDCprop_close(cont_prop) < 0) - printf("Fail to close container property\n"); + LOG_ERROR("Fail to close container property\n"); if (PDCclose(pdc_id) < 0) - printf("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/query_vpic_exyz_nopreload.c b/src/tests/query_vpic_exyz_nopreload.c index d3593b90a..42ecc2deb 100644 --- a/src/tests/query_vpic_exyz_nopreload.c +++ b/src/tests/query_vpic_exyz_nopreload.c @@ -42,43 +42,43 @@ main(int argc, char **argv) z_hi = atof(argv[8]); } else { - printf("Not sufficient query conditions!\n"); + LOG_ERROR("Not sufficient query conditions!\n"); } // Query the created object PDC_Client_query_metadata_name_timestep("x", 0, &x_meta); if (x_meta == NULL || x_meta->obj_id == 0) { - printf("Error with x metadata!\n"); + LOG_ERROR("Error with x metadata!\n"); goto done; } x_id = x_meta->obj_id; - printf("x_id = %" PRIu64 "\n", x_id); + LOG_INFO("x_id = %" PRIu64 "\n", x_id); PDC_Client_query_metadata_name_timestep("y", 0, &y_meta); if (y_meta == NULL || y_meta->obj_id == 0) { - printf("Error with y metadata!\n"); + LOG_ERROR("Error with y metadata!\n"); goto done; } y_id = y_meta->obj_id; - printf("y_id = %" PRIu64 "\n", y_id); + LOG_INFO("y_id = %" PRIu64 "\n", y_id); PDC_Client_query_metadata_name_timestep("z", 0, &z_meta); if (z_meta == NULL || z_meta->obj_id == 0) { - printf("Error with z metadata!\n"); + LOG_ERROR("Error with z metadata!\n"); goto done; } z_id = z_meta->obj_id; - printf("z_id = %" PRIu64 "\n", z_id); + LOG_INFO("z_id = %" PRIu64 "\n", z_id); PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; - printf("energy_id = %" PRIu64 "\n", energy_id); + LOG_INFO("energy_id = %" PRIu64 "\n", energy_id); - printf("Distribute the metadata\n"); + LOG_INFO("Distribute the metadata\n"); float preload_value = 1000000.0; qpreload_energy = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &preload_value); qpreload_x = PDCquery_create(x_id, PDC_GT, PDC_FLOAT, &preload_value); @@ -86,7 +86,7 @@ main(int argc, char **argv) qpreload = PDCquery_or(qpreload_x, qpreload_energy); PDCquery_get_nhits(qpreload, &nhits); - printf("Done... %" PRIu64 " hits\n", nhits); + LOG_INFO("Done... %" PRIu64 " hits\n", nhits); PDCquery_free_all(qpreload); // Construct query constraints @@ -100,8 +100,8 @@ main(int argc, char **argv) q = PDCquery_and(q2, q1); - printf("Query: %.1f < Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f, && %.1f < z < %.1f\n", - energy_lo, energy_hi, x_lo, x_hi, y_lo, y_hi, z_lo, z_hi); + LOG_INFO("Query: %.1f < Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f, && %.1f < z < %.1f\n", + energy_lo, energy_hi, x_lo, x_hi, y_lo, y_hi, z_lo, z_hi); // Get selection gettimeofday(&pdc_timer_start, 0); @@ -110,8 +110,8 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Query result in (%" PRIu64 " hits):\n", sel.nhits); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Query result in (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -127,15 +127,15 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); for (i = 0; i < sel.nhits; i++) { if (energy_data[i] < energy_lo) { - printf("Error with energy_data = %.1f\n", energy_data[i]); + LOG_ERROR("Error with energy_data = %.1f\n", energy_data[i]); break; } if (x_data[i] > x_hi || x_data[i] < x_lo) { - printf("Error with x_data = %.1f\n", x_data[i]); + LOG_ERROR("Error with x_data = %.1f\n", x_data[i]); break; } } @@ -156,7 +156,7 @@ main(int argc, char **argv) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_exyz_preload.c b/src/tests/query_vpic_exyz_preload.c index 80313d58d..6455a9173 100644 --- a/src/tests/query_vpic_exyz_preload.c +++ b/src/tests/query_vpic_exyz_preload.c @@ -43,7 +43,7 @@ main(int argc, char **argv) z_hi = atof(argv[8]); } else { - printf("Not sufficient query conditions!\n"); + LOG_ERROR("Not sufficient query conditions!\n"); } pdc = PDCinit("pdc"); @@ -51,27 +51,27 @@ main(int argc, char **argv) // Query the created object PDC_Client_query_metadata_name_timestep("x", 0, &x_meta); if (x_meta == NULL || x_meta->obj_id == 0) { - printf("Error with x metadata!\n"); + LOG_ERROR("Error with x metadata!\n"); goto done; } x_id = x_meta->obj_id; PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; // Construct query constraints - printf("Preload the data\n"); + LOG_INFO("Preload the data\n"); qpreload_energy = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &preload_value); qpreload_x = PDCquery_create(x_id, PDC_GT, PDC_FLOAT, &preload_value); qpreload = PDCquery_or(qpreload_x, qpreload_energy); PDCquery_get_nhits(qpreload, &nhits); - printf("Preload data, total %" PRIu64 " elements\n", nhits); + LOG_INFO("Preload data, total %" PRIu64 " elements\n", nhits); PDCquery_free_all(qpreload); q1_lo = PDCquery_create(energy_id, PDC_GT, PDC_FLOAT, &energy_lo); @@ -84,8 +84,8 @@ main(int argc, char **argv) q = PDCquery_and(q2, q1); - printf("Query: %.1f < Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f, && %.1f < z < %.1f\n", - energy_lo, energy_hi, x_lo, x_hi, y_lo, y_hi, z_lo, z_hi); + LOG_INFO("Query: %.1f < Energy < %.1f && %.1f < X < %.1f && %.1f < Y < %.1f, && %.1f < z < %.1f\n", + energy_lo, energy_hi, x_lo, x_hi, y_lo, y_hi, z_lo, z_hi); // Get selection gettimeofday(&pdc_timer_start, 0); @@ -94,8 +94,8 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Query result in (%" PRIu64 " hits):\n", sel.nhits); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Query result in (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -109,7 +109,7 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); fflush(stdout); } @@ -131,7 +131,7 @@ main(int argc, char **argv) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi.c b/src/tests/query_vpic_multi.c index 4704b3e1d..91c5544ac 100644 --- a/src/tests/query_vpic_multi.c +++ b/src/tests/query_vpic_multi.c @@ -32,7 +32,7 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; @@ -49,8 +49,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -62,15 +62,15 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); - printf("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); for (i = 0; i < sel.nhits; i++) { if (energy_data[i] > energy_hi0 || energy_data[i] < energy_lo0) { - printf("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); + LOG_ERROR("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); } } - printf("Verified: all correct!\n"); + LOG_INFO("Verified: all correct!\n"); PDCselection_free(&sel); fflush(stdout); sleep(5); @@ -86,7 +86,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi_nopreload.c b/src/tests/query_vpic_multi_nopreload.c index dc0da4494..f10149527 100644 --- a/src/tests/query_vpic_multi_nopreload.c +++ b/src/tests/query_vpic_multi_nopreload.c @@ -32,7 +32,7 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; @@ -49,8 +49,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -62,15 +62,15 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); - printf("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); for (i = 0; i < sel.nhits; i++) { if (energy_data[i] > energy_hi0 || energy_data[i] < energy_lo0) { - printf("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); + LOG_ERROR("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); } } - printf("Verified: all correct!\n"); + LOG_INFO("Verified: all correct!\n"); PDCselection_free(&sel); fflush(stdout); sleep(5); @@ -84,7 +84,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi_nopreload1.c b/src/tests/query_vpic_multi_nopreload1.c index f2c73f68b..631e2644e 100644 --- a/src/tests/query_vpic_multi_nopreload1.c +++ b/src/tests/query_vpic_multi_nopreload1.c @@ -32,7 +32,7 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; @@ -49,8 +49,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -62,15 +62,15 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); - printf("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); for (i = 0; i < sel.nhits; i++) { if (energy_data[i] > energy_hi0 || energy_data[i] < energy_lo0) { - printf("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); + LOG_ERROR("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); } } - printf("Verified: all correct!\n"); + LOG_INFO("Verified: all correct!\n"); PDCselection_free(&sel); fflush(stdout); sleep(5); @@ -84,7 +84,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi_preload.c b/src/tests/query_vpic_multi_preload.c index 4704b3e1d..91c5544ac 100644 --- a/src/tests/query_vpic_multi_preload.c +++ b/src/tests/query_vpic_multi_preload.c @@ -32,7 +32,7 @@ main(void) // Query the created object PDC_Client_query_metadata_name_timestep("Energy", 0, &energy_meta); if (energy_meta == NULL || energy_meta->obj_id == 0) { - printf("Error with energy metadata!\n"); + LOG_ERROR("Error with energy metadata!\n"); goto done; } energy_id = energy_meta->obj_id; @@ -49,8 +49,8 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_sel_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); - printf("Get selection time: %.5e\n", get_sel_time); + LOG_INFO("Querying Energy in [%.2f, %.2f]\n", energy_lo0, energy_hi0); + LOG_INFO("Get selection time: %.5e\n", get_sel_time); if (sel.nhits > 0) { energy_data = (float *)calloc(sel.nhits, sizeof(float)); @@ -62,15 +62,15 @@ main(void) gettimeofday(&pdc_timer_end, 0); get_data_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); - printf("Get data time: %.5e\n", get_data_time); + LOG_INFO("Get data time: %.5e\n", get_data_time); - printf("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); + LOG_INFO("Query result energy data (%" PRIu64 " hits):\n", sel.nhits); for (i = 0; i < sel.nhits; i++) { if (energy_data[i] > energy_hi0 || energy_data[i] < energy_lo0) { - printf("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); + LOG_ERROR("Error with result %" PRIu64 ": %.5e\n", i, energy_data[i]); } } - printf("Verified: all correct!\n"); + LOG_INFO("Verified: all correct!\n"); PDCselection_free(&sel); fflush(stdout); sleep(5); @@ -86,7 +86,7 @@ main(void) done: if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 0; } diff --git a/src/tests/read_obj.c b/src/tests/read_obj.c index e688219f3..2794e79c6 100644 --- a/src/tests/read_obj.c +++ b/src/tests/read_obj.c @@ -13,7 +13,7 @@ void print_usage() { - printf("Usage: srun -n ./write_obj obj_name size_MB type\n"); + LOG_INFO("Usage: srun -n ./write_obj obj_name size_MB type\n"); } int @@ -107,36 +107,36 @@ main(int argc, char **argv) type_size = sizeof(int8_t); } - printf("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); + LOG_INFO("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); // size_B = 1; size_B = size_MB * 1048576; // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } dims[0] = size_B; my_data_size = size_B / size; - printf("my_data_size at rank %d is %llu\n", rank, (long long unsigned)my_data_size); + LOG_INFO("my_data_size at rank %d is %llu\n", rank, (long long unsigned)my_data_size); mydata = (char *)malloc(my_data_size * type_size); @@ -155,7 +155,7 @@ main(int argc, char **argv) #endif if (global_obj <= 0) { - printf("Error creating an object [%s], exit...\n", obj_name); + LOG_ERROR("Error creating an object [%s], exit...\n", obj_name); ret_value = 1; } @@ -176,7 +176,7 @@ main(int argc, char **argv) } transfer_request = PDCregion_transfer_create(mydata, PDC_WRITE, global_obj, local_region, global_region); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create failed"); ret_value = 1; } @@ -186,19 +186,19 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_start, 0); ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_start for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_start for region"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_wait for region"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_closefailed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_closefailed"); ret_value = 1; } #ifdef ENABLE_MPI @@ -208,13 +208,13 @@ main(int argc, char **argv) write_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); if (rank == 0) { - printf("Time to process write data with %d ranks: %.5e\n", size, write_time); + LOG_INFO("Time to process write data with %d ranks: %.5e\n", size, write_time); fflush(stdout); } transfer_request = PDCregion_transfer_create(mydata, PDC_READ, global_obj, local_region, global_region); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_create failed"); ret_value = 1; } @@ -224,27 +224,26 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_start, 0); ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_start for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_start for region"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait for region @ line %d\n", __LINE__); + LOG_ERROR("Failed to region_transfer_wait for region"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } for (i = 0; i < (int)my_data_size; i++) { for (j = 0; j < (int)type_size; ++j) { if (mydata[i * type_size + j] != (char)i) { - printf("Wrong value detected %d != %d at @ line %d!\n", mydata[i * type_size + j], i, - __LINE__); + LOG_ERROR("Wrong value detected %d != %d!\n", mydata[i * type_size + j], i); ret_value = 1; i = my_data_size; break; @@ -259,7 +258,7 @@ main(int argc, char **argv) write_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); if (rank == 0) { - printf("Time to process read data with %d ranks: %.5e\n", size, write_time); + LOG_INFO("Time to process read data with %d ranks: %.5e\n", size, write_time); fflush(stdout); } @@ -269,29 +268,29 @@ main(int argc, char **argv) free(mydata); if (PDCobj_close(global_obj) < 0) { - printf("fail to close global obj @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global obj"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCcont_close(cont) < 0) { - printf("fail to close container @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container"); ret_value = 1; } if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/read_obj_shared.c b/src/tests/read_obj_shared.c index 6f56965d8..9cf6779b1 100644 --- a/src/tests/read_obj_shared.c +++ b/src/tests/read_obj_shared.c @@ -12,7 +12,7 @@ void print_usage() { - printf("Usage: srun -n ./write_obj obj_name size_MB type\n"); + LOG_INFO("Usage: srun -n ./write_obj obj_name size_MB type\n"); } int @@ -103,18 +103,18 @@ main(int argc, char **argv) type_size = sizeof(int8_t); } - printf("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); + LOG_INFO("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); // size_B = 1; size_B = size_MB * 1048576; // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container @@ -122,18 +122,18 @@ main(int argc, char **argv) sprintf(cont_name, "c"); cont = PDCcont_create_col(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } dims[0] = size_B; my_data_size = size_B / size; - printf("my_data_size at rank %d is %llu\n", rank, (long long unsigned)my_data_size); + LOG_INFO("my_data_size at rank %d is %llu\n", rank, (long long unsigned)my_data_size); mydata = (char *)malloc(my_data_size * type_size); @@ -152,7 +152,7 @@ main(int argc, char **argv) #endif if (global_obj <= 0) { - printf("Error creating an object [%s], exit...\n", obj_name); + LOG_ERROR("Error creating an object [%s], exit...\n", obj_name); ret_value = 1; } @@ -163,7 +163,8 @@ main(int argc, char **argv) offset[0] = rank * my_data_size; local_offset[0] = 0; mysize[0] = my_data_size; - printf("rank %d offset = %llu, length = %llu, unit size = %ld\n", rank, offset[0], mysize[0], type_size); + LOG_INFO("rank %d offset = %llu, length = %llu, unit size = %ld\n", rank, offset[0], mysize[0], + type_size); local_region = PDCregion_create(ndim, local_offset, mysize); global_region = PDCregion_create(ndim, offset, mysize); @@ -175,7 +176,7 @@ main(int argc, char **argv) } transfer_request = PDCregion_transfer_create(mydata, PDC_WRITE, global_obj, local_region, global_region); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed\n"); + LOG_ERROR("PDCregion_transfer_create failed\n"); ret_value = 1; } #ifdef ENABLE_MPI @@ -184,32 +185,32 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to PDCregion_transfer_start @ line %d!\n", __LINE__); + LOG_ERROR("Failed to PDCregion_transfer_start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCobj_close(global_obj) < 0) { - printf("fail to close global obj @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global obj"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } #ifdef ENABLE_MPI @@ -220,7 +221,8 @@ main(int argc, char **argv) offset[0] = rank * my_data_size; local_offset[0] = 0; mysize[0] = my_data_size; - printf("rank %d offset = %llu, length = %llu, unit size = %ld\n", rank, offset[0], mysize[0], type_size); + LOG_INFO("rank %d offset = %llu, length = %llu, unit size = %ld\n", rank, offset[0], mysize[0], + type_size); local_region = PDCregion_create(ndim, local_offset, mysize); global_region = PDCregion_create(ndim, offset, mysize); @@ -230,7 +232,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(mydata, PDC_READ, global_obj, local_region, global_region); if (ret != SUCCEED) { - printf("PDCregion_transfer_create failed\n"); + LOG_ERROR("PDCregion_transfer_create failed\n"); ret_value = 1; } #ifdef ENABLE_MPI @@ -238,18 +240,18 @@ main(int argc, char **argv) #endif ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to PDCregion_transfer_start @ line %d!\n", __LINE__); + LOG_ERROR("Failed to PDCregion_transfer_start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } @@ -257,8 +259,7 @@ main(int argc, char **argv) for (j = 0; j < (int)type_size; ++j) { if (mydata[i * type_size + j] != (char)i) { - printf("Wrong value detected %d != %d at @ line %d!\n", mydata[i * type_size + j], i, - __LINE__); + LOG_ERROR("Wrong value detected %d != %d!\n", mydata[i * type_size + j], i); ret_value = 1; i = my_data_size; break; @@ -267,29 +268,29 @@ main(int argc, char **argv) } if (PDCobj_close(global_obj) < 0) { - printf("fail to close global obj\n"); + LOG_ERROR("Fail to close global obj\n"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } if (PDCcont_close(cont) < 0) { - printf("fail to close container\n"); + LOG_ERROR("Fail to close container\n"); ret_value = 1; } if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } free(mydata); diff --git a/src/tests/read_write_col_perf.c b/src/tests/read_write_col_perf.c index 1686ed4e0..7df79a282 100644 --- a/src/tests/read_write_col_perf.c +++ b/src/tests/read_write_col_perf.c @@ -75,7 +75,7 @@ main(int argc, char **argv) ndim = 3; } else { - printf("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3 @ line %d\n", __LINE__); + LOG_JUST_PRINT("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); } local_offset[0] = 0; @@ -121,14 +121,14 @@ main(int argc, char **argv) gethostname(hostname, 256); if (rank == 0) { - printf("number of dimensions in this test is %d\n", ndim); - printf("data size = %llu\n", (long long unsigned)data_size); - printf("first dim has size %" PRIu64 "\n", dims[0]); + LOG_INFO("number of dimensions in this test is %d\n", ndim); + LOG_INFO("data size = %llu\n", (long long unsigned)data_size); + LOG_ERROR("First dim has size %" PRIu64 "\n", dims[0]); if (ndim >= 2) { - printf("second dim has size %" PRIu64 "\n", dims[1]); + LOG_INFO("second dim has size %" PRIu64 "\n", dims[1]); } if (ndim == 3) { - printf("third dim has size %" PRIu64 "\n", dims[2]); + LOG_INFO("third dim has size %" PRIu64 "\n", dims[2]); } } @@ -138,26 +138,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -180,7 +180,7 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont, obj_name1, obj_prop); #endif if (obj1 <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -190,7 +190,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_create failed"); ret_value = 1; } @@ -198,7 +198,7 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_start failed"); ret_value = 1; } @@ -206,28 +206,28 @@ main(int argc, char **argv) ret = PDCregion_transfer_wait(transfer_request); write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_close failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } @@ -238,7 +238,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - printf("Fail to open object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to open object"); ret_value = 1; } @@ -250,7 +250,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create failed"); ret_value = 1; } @@ -259,7 +259,7 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_start failed"); exit(-1); } @@ -268,34 +268,34 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } @@ -304,47 +304,47 @@ main(int argc, char **argv) #endif // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_start_time = start; if (!rank) { - printf("write transfer start time: %lf\n", write_reg_transfer_start_time); + LOG_INFO("write transfer start time: %lf\n", write_reg_transfer_start_time); } MPI_Reduce(&write_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_wait_time = start; if (!rank) { - printf("write transfer wait time: %lf\n", write_reg_transfer_wait_time); + LOG_INFO("write transfer wait time: %lf\n", write_reg_transfer_wait_time); } MPI_Reduce(&read_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_start_time = start; if (!rank) { - printf("read transfer start time: %lf\n", read_reg_transfer_start_time); + LOG_INFO("read transfer start time: %lf\n", read_reg_transfer_start_time); } MPI_Reduce(&read_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_wait_time = start; if (!rank) { - printf("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); + LOG_INFO("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); } free(data); #endif diff --git a/src/tests/read_write_perf.c b/src/tests/read_write_perf.c index 27e254d7d..1836fab34 100644 --- a/src/tests/read_write_perf.c +++ b/src/tests/read_write_perf.c @@ -69,7 +69,7 @@ main(int argc, char **argv) ndim = 3; } else { - printf("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3 @ line %d\n", __LINE__); + LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); } local_offset[0] = 0; @@ -114,14 +114,14 @@ main(int argc, char **argv) char hostname[256]; gethostname(hostname, 256); if (rank == 0) { - printf("number of dimensions in this test is %d\n", ndim); - printf("data size = %llu\n", (long long unsigned)data_size); - printf("first dim has size %d\n", data_size_array[0]); + LOG_INFO("number of dimensions in this test is %d\n", ndim); + LOG_INFO("data size = %llu\n", (long long unsigned)data_size); + LOG_ERROR("First dim has size %d\n", data_size_array[0]); if (ndim >= 2) { - printf("second dim has size %d\n", data_size_array[1]); + LOG_INFO("second dim has size %d\n", data_size_array[1]); } if (ndim == 3) { - printf("third dim has size %d\n", data_size_array[2]); + LOG_INFO("third dim has size %d\n", data_size_array[2]); } } @@ -131,26 +131,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -167,7 +167,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -179,7 +179,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_create failed"); ret_value = 1; } @@ -188,7 +188,7 @@ main(int argc, char **argv) write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_start failed"); ret_value = 1; } @@ -197,40 +197,40 @@ main(int argc, char **argv) write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } #ifdef PDC_TIMING PDC_timing_report("write"); #endif - printf("start to time read performance\n"); + LOG_INFO("start to time read performance\n"); for (i = 0; i < n_objects; ++i) { sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - printf("Fail to open object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to open object"); ret_value = 1; } @@ -242,7 +242,7 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_create failed"); ret_value = 1; } @@ -251,7 +251,7 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_start failed @ line %d\n", __LINE__); + LOG_INFO("PDCregion_transfer_start failed"); exit(-1); } @@ -260,34 +260,34 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - printf("PDCregion_transfer_wait failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_wait failed"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed @ line %d\n", __LINE__); + LOG_ERROR("PDCregion_transfer_close failed"); ret_value = 1; } if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } @@ -296,47 +296,47 @@ main(int argc, char **argv) #endif // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_start_time = start; if (!rank) { - printf("write transfer start time: %lf\n", write_reg_transfer_start_time); + LOG_INFO("write transfer start time: %lf\n", write_reg_transfer_start_time); } MPI_Reduce(&write_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); write_reg_transfer_wait_time = start; if (!rank) { - printf("write transfer wait time: %lf\n", write_reg_transfer_wait_time); + LOG_INFO("write transfer wait time: %lf\n", write_reg_transfer_wait_time); } MPI_Reduce(&read_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_start_time = start; if (!rank) { - printf("read transfer start time: %lf\n", read_reg_transfer_start_time); + LOG_INFO("read transfer start time: %lf\n", read_reg_transfer_start_time); } MPI_Reduce(&read_reg_transfer_wait_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); read_reg_transfer_wait_time = start; if (!rank) { - printf("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); + LOG_INFO("read region transfer wait time: %lf\n", read_reg_transfer_wait_time); } free(data); diff --git a/src/tests/region_obj_map.c b/src/tests/region_obj_map.c index 30cd3b28a..fdfec0afd 100644 --- a/src/tests/region_obj_map.c +++ b/src/tests/region_obj_map.c @@ -68,40 +68,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -115,20 +115,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -140,7 +140,7 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } @@ -150,133 +150,133 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } reg = PDCregion_create(1, local_offset, offset_length); reg_global = PDCregion_create(1, offset, offset_length); ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d\n", data_read[i], i); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_2D.c b/src/tests/region_obj_map_2D.c index b279470ff..83d23936e 100644 --- a/src/tests/region_obj_map_2D.c +++ b/src/tests/region_obj_map_2D.c @@ -67,40 +67,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -114,20 +114,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -141,7 +141,7 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } @@ -151,36 +151,36 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // reg = PDCregion_create(1, offset, offset_length); @@ -190,97 +190,97 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d\n", data_read[i], i); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_2D_partial.c b/src/tests/region_obj_map_2D_partial.c index 777f6fee9..bf6728acb 100644 --- a/src/tests/region_obj_map_2D_partial.c +++ b/src/tests/region_obj_map_2D_partial.c @@ -67,40 +67,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -114,20 +114,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -149,7 +149,7 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } @@ -159,36 +159,36 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // reg = PDCregion_create(1, offset, offset_length); @@ -206,97 +206,97 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i * 2 + 1) { - printf("wrong value %d!=%d\n", data_read[i], i * 2 + 1); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i * 2 + 1); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully global region\n"); + LOG_INFO("successfully global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_3D.c b/src/tests/region_obj_map_3D.c index 93c0a4579..5f9f074fa 100644 --- a/src/tests/region_obj_map_3D.c +++ b/src/tests/region_obj_map_3D.c @@ -69,40 +69,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -116,20 +116,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -143,7 +143,7 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } @@ -153,36 +153,36 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // reg = PDCregion_create(1, offset, offset_length); @@ -192,97 +192,97 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + priLOG_ERRORntf("PDCreg_obtain_lock failed\n"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d\n", data_read[i], i); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_3D_partial.c b/src/tests/region_obj_map_3D_partial.c index 64a7def99..43078bbf3 100644 --- a/src/tests/region_obj_map_3D_partial.c +++ b/src/tests/region_obj_map_3D_partial.c @@ -69,40 +69,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -116,20 +116,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -143,7 +143,7 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } @@ -153,36 +153,36 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // reg = PDCregion_create(1, offset, offset_length); @@ -204,97 +204,97 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } for (i = 0; i < BUF_LEN / 8; ++i) { if (data_read[i] != (BUF_LEN / 8 + i) * 4 + 3) { - printf("wrong value %d!=%d\n", data_read[i], (BUF_LEN / 8 + i) * 4 + 3); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], (BUF_LEN / 8 + i) * 4 + 3); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully global region\n"); + LOG_INFO("successfully global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_merge.c b/src/tests/region_obj_map_merge.c index 68a323b59..fe5b39b21 100644 --- a/src/tests/region_obj_map_merge.c +++ b/src/tests/region_obj_map_merge.c @@ -68,40 +68,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -115,20 +115,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -142,34 +142,34 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 2; @@ -178,40 +178,40 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data + offset[0], PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -225,97 +225,97 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d!\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d!\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_overlap.c b/src/tests/region_obj_map_overlap.c index dbab5fad1..b731963a0 100644 --- a/src/tests/region_obj_map_overlap.c +++ b/src/tests/region_obj_map_overlap.c @@ -68,40 +68,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -115,20 +115,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -142,34 +142,34 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 2; @@ -178,40 +178,40 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data + offset[0], PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -225,50 +225,50 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 4) { - printf("wrong value %d!=%d @ line %d!\n", data_read[i], i + BUF_LEN / 4, __LINE__); + LOG_ERROR("wrong value %d!=%d!\n", data_read[i], i + BUF_LEN / 4); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Write the same object again. This time we test writing a region contained in the previously written @@ -285,42 +285,42 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data + BUF_LEN / 8, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Read the whole object for checking purpose offset[0] = BUF_LEN / 8; @@ -334,96 +334,96 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 8 + BUF_LEN) { - printf("wrong value %d!=%d @ line %d!\n", data_read[i], i + BUF_LEN / 8 + BUF_LEN, __LINE__); + LOG_ERROR("wrong value %d!=%d!\n", data_read[i], i + BUF_LEN / 8 + BUF_LEN); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_overlap_2D.c b/src/tests/region_obj_map_overlap_2D.c index 9d3504ef8..c24fedf1e 100644 --- a/src/tests/region_obj_map_overlap_2D.c +++ b/src/tests/region_obj_map_overlap_2D.c @@ -69,40 +69,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -116,20 +116,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -145,34 +145,34 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 8; @@ -183,40 +183,40 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data + BUF_LEN / 2, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -234,53 +234,53 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 4) { - printf("i = %d, wrong value %d!=%d @ line %d!\n", i, data_read[i], i + BUF_LEN / 4, __LINE__); + LOG_ERROR("i = %d, wrong value %d!=%d!\n", i, data_read[i], i + BUF_LEN / 4); ret_value = 1; break; } } if (ret_value == 0) { - printf("Successfuly verified read 0\n"); + LOG_INFO("successfuly verified read 0\n"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Partial write for a region that has been written before offset[0] = 0; @@ -300,40 +300,40 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data + BUF_LEN / 8, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 32; @@ -351,100 +351,99 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_map failed"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_obtain_lock failed"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCreg_release_lock failed"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed @ line %d!\n", __LINE__); + LOG_ERROR("PDCbuf_obj_unmap failed"); ret_value = 1; } for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN + BUF_LEN / 8) { - printf("i = %d, wrong value %d!=%d @ line %d!\n", i, data_read[i], i + BUF_LEN + BUF_LEN / 8, - __LINE__); + LOG_ERROR("i = %d, wrong value %d!=%d!\n", i, data_read[i], i + BUF_LEN + BUF_LEN / 8); ret_value = 1; break; } } if (ret_value == 0) { - printf("Successfuly verified read 1\n"); + LOG_INFO("successfuly verified read 1\n"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_overlap_3D.c b/src/tests/region_obj_map_overlap_3D.c index f8c05d8be..374dfe6bc 100644 --- a/src/tests/region_obj_map_overlap_3D.c +++ b/src/tests/region_obj_map_overlap_3D.c @@ -71,40 +71,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -118,20 +118,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -156,11 +156,11 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 8; @@ -179,18 +179,18 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -219,25 +219,25 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 4) { - printf("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 4); + LOG_ERROR("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 4); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -267,19 +267,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } offset[0] = 0; @@ -308,73 +308,73 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 8 + BUF_LEN) { - printf("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 8 + BUF_LEN); + LOG_INFO("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 8 + BUF_LEN); ret_value = 1; break; } } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_partial.c b/src/tests/region_obj_map_partial.c index 41594a08f..60cb3d2f9 100644 --- a/src/tests/region_obj_map_partial.c +++ b/src/tests/region_obj_map_partial.c @@ -67,40 +67,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -114,20 +114,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -141,42 +141,42 @@ main(int argc, char **argv) } ret = PDCbuf_obj_map(data, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_WRITE, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); exit(-1); } ret = PDCreg_release_lock(obj1, reg_global, PDC_WRITE); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } offset[0] = 0; @@ -190,97 +190,97 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(data_read, PDC_INT, reg, obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_map failed\n"); + LOG_ERROR("PDCbuf_obj_map failed\n"); ret_value = 1; } ret = PDCreg_obtain_lock(obj1, reg_global, PDC_READ, PDC_BLOCK); if (ret != SUCCEED) { - printf("PDCreg_obtain_lock failed\n"); + LOG_ERROR("PDCreg_obtain_lock failed\n"); ret_value = 1; } ret = PDCreg_release_lock(obj1, reg_global, PDC_READ); if (ret != SUCCEED) { - printf("PDCreg_release_lock failed\n"); + LOG_ERROR("PDCreg_release_lock failed\n"); ret_value = 1; } ret = PDCbuf_obj_unmap(obj1, reg_global); if (ret != SUCCEED) { - printf("PDCbuf_obj_unmap failed\n"); + LOG_ERROR("PDCbuf_obj_unmap failed\n"); ret_value = 1; } for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 2) { - printf("wrong value %d!=%d\n", data_read[i], i + BUF_LEN / 2); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i + BUF_LEN / 2); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } diff --git a/src/tests/region_transfer.c b/src/tests/region_transfer.c index 3a3b04547..f72632b48 100644 --- a/src/tests/region_transfer.c +++ b/src/tests/region_transfer.c @@ -66,40 +66,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -112,20 +112,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -133,18 +133,18 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -155,33 +155,33 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } reg = PDCregion_create(1, local_offset, offset_length); @@ -192,88 +192,88 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_2D.c b/src/tests/region_transfer_2D.c index 0d68a8360..b5f1841d7 100644 --- a/src/tests/region_transfer_2D.c +++ b/src/tests/region_transfer_2D.c @@ -60,40 +60,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d_2d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -106,20 +106,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_2d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d_2d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -143,19 +143,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -177,71 +177,71 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_2D_partial.c b/src/tests/region_transfer_2D_partial.c index 532be2cd3..8d3ae7d81 100644 --- a/src/tests/region_transfer_2D_partial.c +++ b/src/tests/region_transfer_2D_partial.c @@ -65,40 +65,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property\n"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container\n"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property\n"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type\n"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -111,20 +111,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -153,19 +153,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region\n"); } // reg = PDCregion_create(1, offset, offset_length); @@ -190,72 +190,72 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i * 2 + 1) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i * 2 + 1, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i * 2 + 1); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully global region @ line %d\n", __LINE__); + LOG_INFO("successfully global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property\n"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property\n"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_2D_skewed.c b/src/tests/region_transfer_2D_skewed.c index e69e3f758..6e7be67d9 100644 --- a/src/tests/region_transfer_2D_skewed.c +++ b/src/tests/region_transfer_2D_skewed.c @@ -60,40 +60,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -106,20 +106,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // Testing first object @@ -145,19 +145,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -180,25 +180,25 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN / 4; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Testing second object memset(data_read, 0, sizeof(int) * BUF_LEN); @@ -224,19 +224,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -261,71 +261,71 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 4; ++i) { value = (BUF_LEN / 2 + offset_length[1]) + (i / offset_length[1]) * dims[1] + i % offset_length[1]; if (data_read[i] != (int)value) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], (int)value, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], (int)value); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_3D.c b/src/tests/region_transfer_3D.c index 592f76674..da10195f0 100644 --- a/src/tests/region_transfer_3D.c +++ b/src/tests/region_transfer_3D.c @@ -61,40 +61,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -107,20 +107,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -146,19 +146,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -182,71 +182,71 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_3D_partial.c b/src/tests/region_transfer_3D_partial.c index e31e02c21..a66f39122 100644 --- a/src/tests/region_transfer_3D_partial.c +++ b/src/tests/region_transfer_3D_partial.c @@ -67,40 +67,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -113,20 +113,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -147,19 +147,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // reg = PDCregion_create(1, offset, offset_length); @@ -188,72 +188,72 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 8; ++i) { if (data_read[i] != (BUF_LEN / 8 + i) * 4 + 3) { - printf("wrong value %d!=%d\n", data_read[i], (BUF_LEN / 8 + i) * 4 + 3); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], (BUF_LEN / 8 + i) * 4 + 3); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully global region\n"); + LOG_INFO("successfully global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_3D_skewed.c b/src/tests/region_transfer_3D_skewed.c index 8a23e7329..4cb26ecee 100644 --- a/src/tests/region_transfer_3D_skewed.c +++ b/src/tests/region_transfer_3D_skewed.c @@ -61,40 +61,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -107,20 +107,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // Testing the first object @@ -150,19 +150,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region @ %d\n", __LINE__); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region @ %d\n", __LINE__); + LOG_INFO("successfully closed global region\n"); } offset[0] = dims[0] / 2; @@ -194,25 +194,25 @@ main(int argc, char **argv) ((i % (offset_length[1] * offset_length[2])) / offset_length[2]) * dims[2] + i % offset_length[2]; if (data_read[value] != i) { - printf("wrong value %d!=%d, value = %d @ line %d\n", data_read[value], i, (int)value, __LINE__); + LOG_ERROR("wrong value %d!=%d, value = %d\n", data_read[value], i, (int)value); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region @ %d\n", __LINE__); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region @ %d\n", __LINE__); + LOG_INFO("successfully closed global region\n"); } // Testing the second object @@ -242,19 +242,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region @ %d\n", __LINE__); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region @ %d\n", __LINE__); + LOG_INFO("successfully closed global region\n"); } offset[0] = 0; @@ -282,71 +282,71 @@ main(int argc, char **argv) ((i % (offset_length[1] * offset_length[2])) / offset_length[2]) * dims[2] + i % offset_length[2]; if (data_read[i] != (int)value) { - printf("wrong value %d!=%d @ %d\n", data_read[i], (int)value, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], (int)value); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ %d\n", __LINE__); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region @ %d\n", __LINE__); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ %d\n", __LINE__); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region @ %d\n", __LINE__); + LOG_INFO("successfully closed global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ %d\n", __LINE__); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1 @ %d\n", __LINE__); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ %d\n", __LINE__); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2 @ %d\n", __LINE__); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ %d\n", __LINE__); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1 @ %d\n", __LINE__); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ %d\n", __LINE__); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ %d\n", __LINE__); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ %d\n", __LINE__); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all.c b/src/tests/region_transfer_all.c index 4f7390c13..3f8570cc8 100644 --- a/src/tests/region_transfer_all.c +++ b/src/tests/region_transfer_all.c @@ -64,7 +64,7 @@ main(int argc, char **argv) wait_method = atoi(argv[2]); } if (!rank) { - printf("start_method = %d, wait_method = %d\n", start_method, wait_method); + LOG_INFO("start_method = %d, wait_method = %d\n", start_method, wait_method); } data = (int **)malloc(sizeof(int *) * OBJ_NUM); data_read = (int **)malloc(sizeof(int *) * OBJ_NUM); @@ -80,40 +80,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -146,17 +146,17 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -165,10 +165,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -176,10 +176,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -196,7 +196,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -204,7 +204,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -212,7 +212,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -225,7 +225,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -235,7 +235,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -243,24 +243,24 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -277,7 +277,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -285,7 +285,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -293,7 +293,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -306,7 +306,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -316,7 +316,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -324,7 +324,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -332,11 +332,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -344,51 +344,51 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -398,7 +398,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_2D.c b/src/tests/region_transfer_all_2D.c index 3ae2dbf67..c91071d61 100644 --- a/src/tests/region_transfer_all_2D.c +++ b/src/tests/region_transfer_all_2D.c @@ -79,40 +79,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -147,10 +147,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -159,10 +159,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -172,10 +172,10 @@ main(int argc, char **argv) offset_length[1] = 4; reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -193,7 +193,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -201,7 +201,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -209,7 +209,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -222,7 +222,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -232,7 +232,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -240,24 +240,24 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -276,7 +276,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -284,7 +284,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -292,7 +292,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -305,7 +305,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -315,7 +315,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -323,7 +323,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -331,11 +331,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -343,51 +343,51 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -397,7 +397,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_3D.c b/src/tests/region_transfer_all_3D.c index d745dbed4..2f2991d2d 100644 --- a/src/tests/region_transfer_all_3D.c +++ b/src/tests/region_transfer_all_3D.c @@ -82,40 +82,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -150,10 +150,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -162,10 +162,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -177,10 +177,10 @@ main(int argc, char **argv) offset_length[2] = 4; reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -198,7 +198,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -206,7 +206,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -214,7 +214,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -222,14 +222,14 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } for (i = 1; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -237,24 +237,24 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -275,7 +275,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -283,7 +283,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -291,7 +291,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -299,14 +299,14 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } for (i = 1; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -314,7 +314,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -322,11 +322,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -334,51 +334,51 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -388,7 +388,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_append.c b/src/tests/region_transfer_all_append.c index 19292e288..d547a9157 100644 --- a/src/tests/region_transfer_all_append.c +++ b/src/tests/region_transfer_all_append.c @@ -78,8 +78,8 @@ main(int argc, char **argv) } if (rank == 0) - printf("testing region_transfer_all_append, start_method = %d, wait_method = %d\n", start_method, - wait_method); + LOG_INFO("testing region_transfer_all_append, start_method = %d, wait_method = %d\n", start_method, + wait_method); dims[0] = BUF_LEN; @@ -89,26 +89,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -143,7 +143,7 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -152,7 +152,7 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -170,17 +170,17 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data[i] + j * BUF_LEN / REQ_SIZE, PDC_WRITE, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } /* else { */ - /* printf("successfully closed global region @ line %d\n", __LINE__); */ + /* } */ } } @@ -188,7 +188,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -196,7 +196,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -204,7 +204,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -217,7 +217,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -227,7 +227,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -236,7 +236,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -244,30 +244,30 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } /* else { */ - /* printf("successfully close object o1 @ line %d\n", __LINE__); */ + /* } */ } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } /* else { */ - /* printf("successfully closed local region @ line %d\n", __LINE__); */ + /* } */ if (rank == 0) - printf("Test 0 done\n"); + LOG_INFO("Test 0 done\n"); for (i = 0; i < OBJ_NUM; ++i) { sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -283,24 +283,24 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data_read[i] + j * BUF_LEN / REQ_SIZE, PDC_READ, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } /* else { */ - /* printf("successfully closed global region @ line %d\n", __LINE__); */ + /* } */ } } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -308,7 +308,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -316,7 +316,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -329,7 +329,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -339,7 +339,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -348,7 +348,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -357,11 +357,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } /* else { */ - /* printf("successfully close object o1 @ line %d\n", __LINE__); */ + /* } */ } @@ -369,7 +369,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } @@ -377,13 +377,13 @@ main(int argc, char **argv) } if (rank == 0) - printf("Test 1 done\n"); + LOG_INFO("Test 1 done\n"); for (i = 0; i < OBJ_NUM; ++i) { sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - printf("Fail to open object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to open object"); ret_value = 1; } } @@ -392,7 +392,7 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -400,7 +400,7 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -409,17 +409,17 @@ main(int argc, char **argv) transfer_request[i] = PDCregion_transfer_create(data_read[i], PDC_READ, obj[i], reg, reg_global); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } /* else { */ - /* printf("successfully closed global region @ line %d\n", __LINE__); */ + /* } */ if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -427,7 +427,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -435,7 +435,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -448,7 +448,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -458,7 +458,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -466,7 +466,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -474,11 +474,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } /* else { */ - /* printf("successfully close object o1 @ line %d\n", __LINE__); */ + /* } */ } @@ -486,7 +486,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } @@ -494,15 +494,15 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } /* else { */ - /* printf("successfully local region @ line %d\n", __LINE__); */ + /* } */ if (rank == 0) - printf("Test 2 done\n"); + LOG_INFO("Test 2 done\n"); // Now we rewrite the whole object and check its values. // open object @@ -510,7 +510,7 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -525,13 +525,13 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -542,7 +542,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -550,7 +550,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -558,7 +558,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -571,7 +571,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -581,7 +581,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -589,47 +589,47 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } /* else { */ - /* printf("successfully local region @ line %d\n", __LINE__); */ + /* } */ if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } /* else { */ - /* printf("successfully global region @ line %d\n", __LINE__); */ + /* } */ // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } /* else { */ - /* printf("successfully close object o1 @ line %d\n", __LINE__); */ + /* } */ } if (rank == 0) - printf("Test 3 done\n"); + LOG_INFO("Test 3 done\n"); // open object for (i = 0; i < OBJ_NUM; ++i) { sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -638,13 +638,13 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -655,7 +655,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -663,7 +663,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -671,7 +671,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -684,7 +684,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -694,7 +694,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -702,42 +702,42 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } /* else { */ - /* printf("successfully local region @ line %d\n", __LINE__); */ + /* } */ if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } /* else { */ - /* printf("successfully global region @ line %d\n", __LINE__); */ + /* } */ // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } /* else { */ - /* printf("successfully close object o1 @ line %d\n", __LINE__); */ + /* } */ } for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i + 84441111 * j + 3) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], 84441111 * j + 3, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], 84441111 * j + 3); ret_value = 1; break; } @@ -745,31 +745,31 @@ main(int argc, char **argv) } if (rank == 0) - printf("Test 4 done\n"); + LOG_INFO("Test 4 done\n"); // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } /* else { */ - /* printf("successfully close container c1 @ line %d\n", __LINE__); */ + /* } */ // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } /* else { */ - /* printf("successfully close object property @ line %d\n", __LINE__); */ + /* } */ // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } /* else { */ - /* printf("successfully close container property @ line %d\n", __LINE__); */ + /* } */ free(data); free(data_read); @@ -777,15 +777,15 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } if (rank == 0) { if (ret_value == 0) - printf("Test succeed!\n"); + LOG_INFO("Test succeed!\n"); else - printf("ERROR: Test failed!\n"); + LOG_ERROR("ErROR: Test failed!\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_append_2D.c b/src/tests/region_transfer_all_append_2D.c index 23d0c9f62..bad6cd573 100644 --- a/src/tests/region_transfer_all_append_2D.c +++ b/src/tests/region_transfer_all_append_2D.c @@ -84,40 +84,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -152,10 +152,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -164,10 +164,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -187,20 +187,20 @@ main(int argc, char **argv) offset_length[1] = DIM1 / REQ_SIZE; reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data[i] + j * BUF_LEN / REQ_SIZE, PDC_WRITE, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } } } @@ -208,7 +208,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -216,7 +216,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -224,7 +224,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -237,7 +237,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -247,7 +247,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -256,27 +256,27 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } } for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } offset[0] = 0; @@ -287,10 +287,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -304,35 +304,35 @@ main(int argc, char **argv) offset_length[1] = DIM1 / REQ_SIZE; reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data_read[i] + j * BUF_LEN / REQ_SIZE, PDC_READ, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -340,7 +340,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -348,7 +348,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -361,7 +361,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -371,7 +371,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -380,7 +380,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -388,11 +388,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -400,7 +400,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } @@ -411,10 +411,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -423,10 +423,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -436,10 +436,10 @@ main(int argc, char **argv) offset_length[1] = DIM1; reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -449,25 +449,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -475,7 +475,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -483,7 +483,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -496,7 +496,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -506,7 +506,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -514,7 +514,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -522,11 +522,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -537,10 +537,8 @@ main(int argc, char **argv) y = i / DIM1; s = DIM1 / REQ_SIZE; b = s * DIM0; - // printf("%d and %d, i = %d\n", data_read[j][i], (x/s) * b + y * s + x % s, i); if (data_read[j][i] != (x / s) * b + y * s + x % s) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], (x / s) * b + y * s + x % s, - __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], (x / s) * b + y * s + x % s); ret_value = 1; } } @@ -552,10 +550,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -570,10 +568,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -583,10 +581,10 @@ main(int argc, char **argv) offset_length[1] = DIM1; reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -597,7 +595,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -605,7 +603,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -613,7 +611,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -626,7 +624,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -636,7 +634,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -644,35 +642,35 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully global region @ line %d\n", __LINE__); + LOG_INFO("successfully global region"); } // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -681,10 +679,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -693,10 +691,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -706,10 +704,10 @@ main(int argc, char **argv) offset_length[1] = DIM1; reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -720,7 +718,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -728,7 +726,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -736,7 +734,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -749,7 +747,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -759,7 +757,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -767,42 +765,42 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully global region @ line %d\n", __LINE__); + LOG_INFO("successfully global region"); } // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i + 84441111 * j + 3) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], 84441111 * j + 3, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], 84441111 * j + 3); ret_value = 1; break; } @@ -811,27 +809,27 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); @@ -839,7 +837,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_append_3D.c b/src/tests/region_transfer_all_append_3D.c index 298afd5c7..c26e0005e 100644 --- a/src/tests/region_transfer_all_append_3D.c +++ b/src/tests/region_transfer_all_append_3D.c @@ -86,40 +86,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -154,10 +154,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -166,10 +166,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -191,20 +191,20 @@ main(int argc, char **argv) offset_length[2] = DIM2 / REQ_SIZE; reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data[i] + j * BUF_LEN / REQ_SIZE, PDC_WRITE, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } } } @@ -212,7 +212,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -220,7 +220,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -228,7 +228,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -241,7 +241,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -251,7 +251,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -260,7 +260,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -269,30 +269,30 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } offset[0] = 0; offset_length[0] = BUF_LEN / REQ_SIZE; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -300,10 +300,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -319,27 +319,27 @@ main(int argc, char **argv) offset_length[2] = DIM2 / REQ_SIZE; reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data_read[i] + j * BUF_LEN / REQ_SIZE, PDC_READ, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } } } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -347,7 +347,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -355,7 +355,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -368,7 +368,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -378,7 +378,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -387,7 +387,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -396,11 +396,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -408,7 +408,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } @@ -419,30 +419,30 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } offset[0] = 0; offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } offset[0] = 0; @@ -453,10 +453,10 @@ main(int argc, char **argv) offset_length[2] = DIM2; reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -466,25 +466,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -492,7 +492,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -500,7 +500,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -513,7 +513,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -523,7 +523,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -531,7 +531,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -539,11 +539,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -555,10 +555,9 @@ main(int argc, char **argv) z = i / (DIM1 * DIM2); s = DIM2 / REQ_SIZE; b = s * DIM0 * DIM1; - // printf("%d and %d, i = %d\n", data_read[j][i], (x/s) * b + y * s + x % s, i); if (data_read[j][i] != (x / s) * b + z * s * DIM1 + y * s + x % s) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], - (x / s) * b + z * s * DIM1 + y * s + x % s, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], + (x / s) * b + z * s * DIM1 + y * s + x % s); ret_value = 1; break; } @@ -571,10 +570,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -589,10 +588,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -604,10 +603,10 @@ main(int argc, char **argv) offset_length[2] = DIM2; reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -618,7 +617,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -626,7 +625,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -634,7 +633,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -647,7 +646,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -657,7 +656,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -665,35 +664,35 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully global region @ line %d\n", __LINE__); + LOG_INFO("successfully global region"); } // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -702,10 +701,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -714,10 +713,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -729,10 +728,10 @@ main(int argc, char **argv) offset_length[2] = DIM2; reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -743,7 +742,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -751,7 +750,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -759,7 +758,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -772,7 +771,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -782,7 +781,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -790,42 +789,42 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully global region @ line %d\n", __LINE__); + LOG_INFO("successfully global region"); } // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i + 84441111 * j + 3) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], 84441111 * j + 3, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], 84441111 * j + 3); ret_value = 1; break; } @@ -834,27 +833,27 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); @@ -862,7 +861,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_fold.c b/src/tests/region_transfer_all_fold.c index fa71bd73b..e9f4dc67c 100644 --- a/src/tests/region_transfer_all_fold.c +++ b/src/tests/region_transfer_all_fold.c @@ -78,8 +78,8 @@ main(int argc, char **argv) data_read[i] = data_read[i - 1] + BUF_LEN; } if (!rank) { - printf("testing region_transfer_all_append, start_method = %d, wait_method = %d\n", start_method, - wait_method); + LOG_INFO("testing region_transfer_all_append, start_method = %d, wait_method = %d\n", start_method, + wait_method); } dims[0] = BUF_LEN; @@ -158,10 +158,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -191,7 +191,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } @@ -200,27 +200,27 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); @@ -228,7 +228,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_split_wait.c b/src/tests/region_transfer_all_split_wait.c index 61caaf3ce..71a361b25 100644 --- a/src/tests/region_transfer_all_split_wait.c +++ b/src/tests/region_transfer_all_split_wait.c @@ -70,40 +70,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -138,10 +138,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -150,10 +150,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -161,10 +161,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -180,50 +180,50 @@ main(int argc, char **argv) } ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM / 2); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_start_all(transfer_request + OBJ_NUM / 2, OBJ_NUM / 2); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM / 4, OBJ_NUM / 2); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM / 4); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM * 3 / 4, OBJ_NUM / 4); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -239,33 +239,33 @@ main(int argc, char **argv) } ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM / 2); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_start_all(transfer_request + OBJ_NUM / 2, OBJ_NUM / 2); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM / 4, OBJ_NUM / 2); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM / 4); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM * 3 / 4, OBJ_NUM / 4); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -273,11 +273,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -285,51 +285,51 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -339,7 +339,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_test.c b/src/tests/region_transfer_all_test.c index b01428a89..ab842c083 100644 --- a/src/tests/region_transfer_all_test.c +++ b/src/tests/region_transfer_all_test.c @@ -70,40 +70,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_ERROR("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_ERROR("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -118,10 +118,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_ERROR("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -130,10 +130,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -141,10 +141,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_ERROR("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -161,18 +161,18 @@ main(int argc, char **argv) ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -184,72 +184,72 @@ main(int argc, char **argv) ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + zv("fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -259,11 +259,11 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } else { - printf("successfully close PDC @ line %d\n", __LINE__); + LOG_INFO("successfully close PDC"); } #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/region_transfer_merge.c b/src/tests/region_transfer_merge.c index 2282f72f3..870705cfd 100644 --- a/src/tests/region_transfer_merge.c +++ b/src/tests/region_transfer_merge.c @@ -66,40 +66,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -112,20 +112,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -146,11 +146,11 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 2; @@ -165,18 +165,18 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -197,72 +197,72 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d!\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d!\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_overlap.c b/src/tests/region_transfer_overlap.c index 770a84796..b551c3a96 100644 --- a/src/tests/region_transfer_overlap.c +++ b/src/tests/region_transfer_overlap.c @@ -66,40 +66,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -112,20 +112,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -146,11 +146,11 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 2; @@ -165,18 +165,18 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -197,26 +197,26 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 4) { - printf("wrong value %d!=%d @ line %d!\n", data_read[i], i + BUF_LEN / 4, __LINE__); + LOG_ERROR("wrong value %d!=%d!\n", data_read[i], i + BUF_LEN / 4); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Write the same object again. This time we test writing a region contained in the previously written @@ -240,19 +240,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Read the region that has been just written. offset[0] = 0; @@ -273,71 +273,71 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 8 + BUF_LEN) { - printf("wrong value %d!=%d @ line %d!\n", data_read[i], i + BUF_LEN / 8 + BUF_LEN, __LINE__); + LOG_ERROR("wrong value %d!=%d!\n", data_read[i], i + BUF_LEN / 8 + BUF_LEN); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_overlap_2D.c b/src/tests/region_transfer_overlap_2D.c index d9eb0914c..f02a46134 100644 --- a/src/tests/region_transfer_overlap_2D.c +++ b/src/tests/region_transfer_overlap_2D.c @@ -67,40 +67,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -113,20 +113,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -149,11 +149,11 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 8; @@ -170,18 +170,18 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -206,29 +206,29 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 4) { - printf("i = %d, wrong value %d!=%d @ line %d!\n", i, data_read[i], i + BUF_LEN / 4, __LINE__); + LOG_ERROR("i = %d, wrong value %d!=%d!\n", i, data_read[i], i + BUF_LEN / 4); ret_value = 1; break; } } if (ret_value == 0) { - printf("Successfuly verified read 0\n"); + LOG_INFO("successfuly verified read 0\n"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Partial write for a region that has been written before offset[0] = 0; @@ -254,18 +254,18 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 32; @@ -290,75 +290,74 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN + BUF_LEN / 8) { - printf("i = %d, wrong value %d!=%d @ line %d!\n", i, data_read[i], i + BUF_LEN + BUF_LEN / 8, - __LINE__); + LOG_ERROR("i = %d, wrong value %d!=%d!\n", i, data_read[i], i + BUF_LEN + BUF_LEN / 8); ret_value = 1; break; } } if (ret_value == 0) { - printf("Successfuly verified read 1\n"); + LOG_INFO("successfuly verified read 1\n"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_overlap_3D.c b/src/tests/region_transfer_overlap_3D.c index d5ba63eac..05436d5e5 100644 --- a/src/tests/region_transfer_overlap_3D.c +++ b/src/tests/region_transfer_overlap_3D.c @@ -68,40 +68,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -114,20 +114,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -152,11 +152,11 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 8; @@ -175,18 +175,18 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -215,25 +215,25 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 4) { - printf("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 4); + LOG_ERROR("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 4); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -263,19 +263,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } offset[0] = 0; @@ -304,72 +304,72 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 8 + BUF_LEN) { - printf("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 8 + BUF_LEN); + LOG_ERROR("i = %d, wrong value %d!=%d\n", i, data_read[i], i + BUF_LEN / 8 + BUF_LEN); ret_value = 1; break; } } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_partial.c b/src/tests/region_transfer_partial.c index 34b6a69af..c4b273dda 100644 --- a/src/tests/region_transfer_partial.c +++ b/src/tests/region_transfer_partial.c @@ -65,40 +65,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -111,20 +111,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -145,19 +145,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully closed local region\n"); + LOG_INFO("successfully closed local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } offset[0] = 0; @@ -178,72 +178,72 @@ main(int argc, char **argv) for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i] != i + BUF_LEN / 2) { - printf("wrong value %d!=%d\n", data_read[i], i + BUF_LEN / 2); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i + BUF_LEN / 2); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("Fail to close local region\n"); ret_value = 1; } else { - printf("successfully local region\n"); + LOG_INFO("successfully local region\n"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("Fail to close global region\n"); ret_value = 1; } else { - printf("successfully closed global region\n"); + LOG_INFO("successfully closed global region\n"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { - printf("successfully close object o1\n"); + LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { - printf("successfully close object o2\n"); + LOG_INFO("successfully close object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { - printf("successfully close container c1\n"); + LOG_INFO("successfully close container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property\n"); + LOG_INFO("successfully close object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property\n"); + LOG_INFO("successfully close container property\n"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } diff --git a/src/tests/region_transfer_query.c b/src/tests/region_transfer_query.c index dede54aaa..8e5b9ff44 100644 --- a/src/tests/region_transfer_query.c +++ b/src/tests/region_transfer_query.c @@ -66,40 +66,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -112,10 +112,10 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj_id = PDCobj_create(cont, obj_name1, obj_prop); if (obj_id > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -123,18 +123,18 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -145,24 +145,24 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } // Query pdc_query_t *q, *q0, *q1; double lo = 1.0, hi = 8.0; - printf("constraint: %f < value < %f\n", lo, hi); + LOG_INFO("constraint: %f < value < %f\n", lo, hi); pdc_selection_t sel; q0 = PDCquery_create(obj_id, PDC_GT, PDC_DOUBLE, &lo); @@ -170,70 +170,69 @@ main(int argc, char **argv) q = PDCquery_and(q0, q1); PDCquery_get_selection(q, &sel); - printf("Query result:\n"); + LOG_INFO("Query result:\n"); PDCselection_print(&sel); /* PDCquery_get_data(obj_id, &sel, query_data); */ - /* printf("Data values:\n"); */ + /* for (i = 0; i < sel.nhits; i++) */ - /* printf("%f \n", query_data[i]); */ PDCquery_free_all(q); PDCselection_free(&sel); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj_id) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_read_only.c b/src/tests/region_transfer_read_only.c index b75379d7a..810fe71d8 100644 --- a/src/tests/region_transfer_read_only.c +++ b/src/tests/region_transfer_read_only.c @@ -56,16 +56,16 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_open(cont_name, pdc); if (cont > 0) { - printf("Open a container c1\n"); + LOG_INFO("Open a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } @@ -73,30 +73,30 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 > 0) { - printf("Open an object o1\n"); + LOG_INFO("Open an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_open(obj_name2, pdc); if (obj2 > 0) { - printf("Open an object o2\n"); + LOG_INFO("Open an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create third object sprintf(obj_name3, "o3_%d", rank); obj3 = PDCobj_open(obj_name3, pdc); if (obj3 > 0) { - printf("Open an object o3\n"); + LOG_INFO("Open an object o3\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -109,41 +109,41 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Read the second object @@ -153,18 +153,18 @@ main(int argc, char **argv) offset_length[1] = 4; reg = PDCregion_create(2, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -172,41 +172,41 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Read the third object @@ -218,18 +218,18 @@ main(int argc, char **argv) offset_length[2] = 2; reg = PDCregion_create(3, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -237,76 +237,76 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_INFO("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - printf("fail to close object o3 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o3"); ret_value = 1; } else { - printf("successfully close object o3 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o3"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_set_dims.c b/src/tests/region_transfer_set_dims.c index dc49dc1aa..bf894fb65 100644 --- a/src/tests/region_transfer_set_dims.c +++ b/src/tests/region_transfer_set_dims.c @@ -65,7 +65,7 @@ main(int argc, char **argv) wait_method = atoi(argv[2]); } if (!rank) { - printf("start_method = %d, wait_method = %d\n", start_method, wait_method); + LOG_INFO("start_method = %d, wait_method = %d\n", start_method, wait_method); } data = (int **)malloc(sizeof(int *) * OBJ_NUM); data_read = (int **)malloc(sizeof(int *) * OBJ_NUM); @@ -81,40 +81,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -147,17 +147,17 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -166,10 +166,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -177,10 +177,10 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -197,7 +197,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -205,7 +205,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -213,7 +213,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -226,7 +226,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -236,7 +236,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -244,24 +244,24 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -278,7 +278,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -286,7 +286,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -294,7 +294,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -307,7 +307,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -317,7 +317,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -325,7 +325,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -334,26 +334,26 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } dims[0] = BUF_LEN * 2; @@ -365,7 +365,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != BUF_LEN * 2) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -386,25 +386,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -412,7 +412,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -420,7 +420,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -433,7 +433,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -443,7 +443,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -451,7 +451,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -469,25 +469,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -495,7 +495,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -503,7 +503,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -516,7 +516,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -526,7 +526,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -534,7 +534,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -542,11 +542,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -554,8 +554,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN * 2; ++i) { if (data_read[j][i] != rank * 41 + j * 11 + i * 3) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], rank * 41 + j * 11 + i * 3, - __LINE__); + LOG_ERROR("wrong value %d!=%d @ line\n", data_read[j][i], rank * 41 + j * 11 + i * 3); ret_value = 1; break; } @@ -567,10 +566,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -578,7 +577,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != BUF_LEN * 2) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -592,7 +591,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != BUF_LEN / 2) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -611,25 +610,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -637,7 +636,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -645,7 +644,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -658,7 +657,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -668,7 +667,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -676,7 +675,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -684,11 +683,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -696,8 +695,8 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[j][i] != rank * 41 + j * 11 + i * 3) { - printf("wrong value %d!=%d, i = %d, j = %d @ line %d\n", data_read[j][i], - rank * 41 + j * 11 + i * 3, i, j, __LINE__); + LOG_ERROR("wrong value %d!=%d, i = %d, j = %d @ line\n", data_read[j][i], + rank * 41 + j * 11 + i * 3, i, j); ret_value = 1; break; } @@ -706,27 +705,27 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -736,7 +735,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_set_dims_2D.c b/src/tests/region_transfer_set_dims_2D.c index b8adbf48a..bd8219b21 100644 --- a/src/tests/region_transfer_set_dims_2D.c +++ b/src/tests/region_transfer_set_dims_2D.c @@ -67,7 +67,7 @@ main(int argc, char **argv) wait_method = atoi(argv[2]); } if (!rank) { - printf("start_method = %d, wait_method = %d\n", start_method, wait_method); + LOG_INFO("start_method = %d, wait_method = %d\n", start_method, wait_method); } data = (int **)malloc(sizeof(int *) * OBJ_NUM); data_read = (int **)malloc(sizeof(int *) * OBJ_NUM); @@ -84,40 +84,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -150,17 +150,17 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -171,10 +171,10 @@ main(int argc, char **argv) offset_length[1] = DIM1; reg = PDCregion_create(ndim, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -184,10 +184,10 @@ main(int argc, char **argv) offset_length[1] = DIM1; reg_global = PDCregion_create(ndim, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -204,7 +204,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -212,7 +212,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -220,7 +220,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -233,7 +233,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -243,7 +243,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -251,24 +251,24 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -285,7 +285,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -293,7 +293,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -301,7 +301,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -314,7 +314,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -324,7 +324,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -332,7 +332,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -341,26 +341,26 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } dims[0] = DIM0 * 2; @@ -373,7 +373,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != DIM0 * 2 || new_dims[1] != DIM1) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -394,25 +394,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -420,7 +420,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -428,7 +428,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -441,7 +441,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -451,7 +451,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -459,7 +459,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -477,25 +477,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -503,7 +503,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -511,7 +511,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -524,7 +524,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -534,7 +534,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -542,7 +542,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -550,11 +550,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -562,8 +562,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN * 2; ++i) { if (data_read[j][i] != rank * 41 + j * 11 + i * 3) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], rank * 41 + j * 11 + i * 3, - __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], rank * 41 + j * 11 + i * 3); ret_value = 1; break; } @@ -575,10 +574,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -586,7 +585,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != DIM0 * 2 || new_dims[1] != DIM1) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -601,7 +600,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != DIM0 / 2 || new_dims[1] != DIM1) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -620,25 +619,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -646,7 +645,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -654,7 +653,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -667,7 +666,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -677,7 +676,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -685,7 +684,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -693,11 +692,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -705,8 +704,8 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[j][i] != rank * 41 + j * 11 + i * 3) { - printf("wrong value %d!=%d, i = %d, j = %d @ line %d\n", data_read[j][i], - rank * 41 + j * 11 + i * 3, i, j, __LINE__); + LOG_ERROR("wrong value %d!=%d, i = %d, j = %d\n", data_read[j][i], rank * 41 + j * 11 + i * 3, + i, j); ret_value = 1; break; } @@ -716,27 +715,27 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -746,7 +745,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_set_dims_3D.c b/src/tests/region_transfer_set_dims_3D.c index 6b9827593..7db01ca76 100644 --- a/src/tests/region_transfer_set_dims_3D.c +++ b/src/tests/region_transfer_set_dims_3D.c @@ -68,7 +68,7 @@ main(int argc, char **argv) wait_method = atoi(argv[2]); } if (!rank) { - printf("start_method = %d, wait_method = %d\n", start_method, wait_method); + LOG_INFO("start_method = %d, wait_method = %d\n", start_method, wait_method); } data = (int **)malloc(sizeof(int *) * OBJ_NUM); data_read = (int **)malloc(sizeof(int *) * OBJ_NUM); @@ -86,40 +86,40 @@ main(int argc, char **argv) // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -152,17 +152,17 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -175,10 +175,10 @@ main(int argc, char **argv) offset_length[2] = DIM2; reg = PDCregion_create(ndim, offset, offset_length); if (reg > 0) { - printf("Create local region\n"); + LOG_INFO("Create local region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } @@ -190,10 +190,10 @@ main(int argc, char **argv) offset_length[2] = DIM2; reg_global = PDCregion_create(ndim, offset, offset_length); if (reg_global > 0) { - printf("Create global region\n"); + LOG_INFO("Create global region\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -210,7 +210,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -218,7 +218,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -226,7 +226,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -239,7 +239,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -249,7 +249,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -257,24 +257,24 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; @@ -293,7 +293,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -301,7 +301,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -309,7 +309,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -322,7 +322,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -332,7 +332,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -340,7 +340,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -349,26 +349,26 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN; ++i) { if (data_read[j][i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], i); ret_value = 1; break; } } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } dims[0] = DIM0 * 2; @@ -382,7 +382,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != DIM0 * 2 || new_dims[1] != DIM1 || new_dims[2] != DIM2) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -405,25 +405,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -431,7 +431,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -439,7 +439,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -452,7 +452,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -462,7 +462,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -470,7 +470,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -490,25 +490,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -516,7 +516,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -524,7 +524,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -537,7 +537,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -547,7 +547,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -555,7 +555,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -563,11 +563,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -575,8 +575,7 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN * 2; ++i) { if (data_read[j][i] != rank * 41 + j * 11 + i * 3) { - printf("wrong value %d!=%d @ line %d\n", data_read[j][i], rank * 41 + j * 11 + i * 3, - __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[j][i], rank * 41 + j * 11 + i * 3); ret_value = 1; break; } @@ -588,10 +587,10 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } } @@ -599,7 +598,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != DIM0 * 2 || new_dims[1] != DIM1 || new_dims[2] != DIM2) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -615,7 +614,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { PDCobj_get_dims(obj[i], &ndim, &new_dims); if (new_dims[0] != DIM0 / 2 || new_dims[1] != DIM1 || new_dims[2] != DIM2) { - fprintf(stderr, "wrong dimension reported after reset for rank %d @ line %d\n", rank, __LINE__); + LOG_ERROR("wrong dimension reported after reset for rank %d\n", rank); ret_value = 1; } free(new_dims); @@ -636,25 +635,25 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -662,7 +661,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } } @@ -670,7 +669,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } } @@ -683,7 +682,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } request_size = 0; @@ -693,7 +692,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -701,7 +700,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } } @@ -709,11 +708,11 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } } @@ -721,8 +720,8 @@ main(int argc, char **argv) for (j = 0; j < OBJ_NUM; ++j) { for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[j][i] != rank * 41 + j * 11 + i * 3) { - printf("wrong value %d!=%d, i = %d, j = %d @ line %d\n", data_read[j][i], - rank * 41 + j * 11 + i * 3, i, j, __LINE__); + LOG_ERROR("wrong value %d!=%d, i = %d, j = %d\n", data_read[j][i], rank * 41 + j * 11 + i * 3, + i, j); ret_value = 1; break; } @@ -732,27 +731,27 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data[0]); free(data_read[0]); @@ -762,7 +761,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_skewed.c b/src/tests/region_transfer_skewed.c index 1ddd90dc5..def32453a 100644 --- a/src/tests/region_transfer_skewed.c +++ b/src/tests/region_transfer_skewed.c @@ -59,40 +59,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property @ line %d!\n", __LINE__); + LOG_INFO("Create a container property"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1 @ line %d!\n", __LINE__); + LOG_INFO("Create a container c1"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property @ line %d!\n", __LINE__); + LOG_INFO("Create an object property"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -105,20 +105,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o1"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2 @ line %d!\n", __LINE__); + LOG_INFO("Create an object o2"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -140,19 +140,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = BUF_LEN / 2; @@ -172,71 +172,71 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN / 2; ++i) { if (data_read[i + BUF_LEN / 2] != i + 77 + 1) { - printf("wrong value %d!=%d\n", data_read[i + BUF_LEN / 2], i + 77 + 1); + LOG_ERROR("wrong value %d!=%d\n", data_read[i + BUF_LEN / 2], i + 77 + 1); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d!\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d!\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d!\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d!\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d!\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d!\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d!\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_status.c b/src/tests/region_transfer_status.c index a474a5d94..cad2328f7 100644 --- a/src/tests/region_transfer_status.c +++ b/src/tests/region_transfer_status.c @@ -68,40 +68,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -114,20 +114,20 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -135,18 +135,18 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -162,7 +162,7 @@ main(int argc, char **argv) break; } else if (completed == PDC_TRANSFER_STATUS_NOT_FOUND) { - printf("transfer request status not found @ line %d\n", __LINE__); + LOG_ERROR("transfer request status not found"); ret_value = 1; break; } @@ -170,7 +170,7 @@ main(int argc, char **argv) } PDCregion_transfer_status(transfer_request, &completed); if (completed != PDC_TRANSFER_STATUS_NOT_FOUND) { - printf("transfer request status wrong value @ line %d\n", __LINE__); + LOG_ERROR("transfer request status wrong value"); ret_value = 1; } @@ -178,19 +178,19 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } reg = PDCregion_create(1, local_offset, offset_length); @@ -206,7 +206,7 @@ main(int argc, char **argv) break; } else if (completed == PDC_TRANSFER_STATUS_NOT_FOUND) { - printf("transfer request status not found @ line %d\n", __LINE__); + LOG_ERROR("transfer request status not found"); ret_value = 1; break; } @@ -215,7 +215,7 @@ main(int argc, char **argv) PDCregion_transfer_status(transfer_request, &completed); if (completed != PDC_TRANSFER_STATUS_NOT_FOUND) { - printf("transfer request status wrong value @ line %d\n", __LINE__); + LOG_ERROR("transfer request status wrong value"); ret_value = 1; } @@ -225,72 +225,72 @@ main(int argc, char **argv) // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d @ line\n", data_read[i], i); ret_value = 1; break; } } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully local region @ line %d\n", __LINE__); + LOG_INFO("successfully local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); free(data_read); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_write_only.c b/src/tests/region_transfer_write_only.c index 97be5d689..5e8d67d6f 100644 --- a/src/tests/region_transfer_write_only.c +++ b/src/tests/region_transfer_write_only.c @@ -58,40 +58,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -105,10 +105,10 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object @@ -118,10 +118,10 @@ main(int argc, char **argv) sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create third object @@ -132,10 +132,10 @@ main(int argc, char **argv) sprintf(obj_name3, "o3_%d", rank); obj3 = PDCobj_create(cont, obj_name3, obj_prop); if (obj3 > 0) { - printf("Create an object o3\n"); + LOG_INFO("Create an object o3\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -143,18 +143,18 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -165,51 +165,51 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -220,33 +220,33 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Write the second object offset[0] = 0; @@ -256,18 +256,18 @@ main(int argc, char **argv) reg = PDCregion_create(2, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -278,33 +278,33 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Write the third object @@ -316,18 +316,18 @@ main(int argc, char **argv) offset_length[2] = 2; reg = PDCregion_create(3, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -338,85 +338,85 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - printf("fail to close object o3 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o3"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_write_read.c b/src/tests/region_transfer_write_read.c index 6eefa7eff..8e9dd7166 100644 --- a/src/tests/region_transfer_write_read.c +++ b/src/tests/region_transfer_write_read.c @@ -65,40 +65,40 @@ main(int argc, char **argv) #endif // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop > 0) { - printf("Create a container property\n"); + LOG_INFO("Create a container property\n"); } else { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { - printf("Create a container c1\n"); + LOG_INFO("Create a container c1\n"); } else { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop > 0) { - printf("Create an object property\n"); + LOG_INFO("Create an object property\n"); } else { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - printf("Fail to set obj type @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -112,10 +112,10 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object @@ -125,10 +125,10 @@ main(int argc, char **argv) sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_create(cont, obj_name2, obj_prop); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create third object @@ -139,10 +139,10 @@ main(int argc, char **argv) sprintf(obj_name3, "o3_%d", rank); obj3 = PDCobj_create(cont, obj_name3, obj_prop); if (obj3 > 0) { - printf("Create an object o3\n"); + LOG_INFO("Create an object o3\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -150,18 +150,18 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -172,51 +172,51 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } offset[0] = 0; offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -227,33 +227,33 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Write the second object offset[0] = 0; @@ -263,18 +263,18 @@ main(int argc, char **argv) reg = PDCregion_create(2, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -285,33 +285,33 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Write the third object @@ -323,18 +323,18 @@ main(int argc, char **argv) offset_length[2] = 2; reg = PDCregion_create(3, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -345,80 +345,80 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - printf("fail to close object o3 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o3"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close a container if (PDCcont_close(cont) < 0) { - printf("fail to close container c1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { - printf("successfully close container c1 @ line %d\n", __LINE__); + LOG_INFO("successfully close container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close object property @ line %d\n", __LINE__); + LOG_INFO("successfully close object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close container property @ line %d\n", __LINE__); + LOG_INFO("successfully close container property"); } free(data); @@ -426,30 +426,30 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", rank); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 > 0) { - printf("Create an object o1\n"); + LOG_INFO("Create an object o1\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object sprintf(obj_name2, "o2_%d", rank); obj2 = PDCobj_open(obj_name2, pdc); if (obj2 > 0) { - printf("Create an object o2\n"); + LOG_INFO("Create an object o2\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create third object sprintf(obj_name3, "o3_%d", rank); obj3 = PDCobj_open(obj_name3, pdc); if (obj3 > 0) { - printf("Create an object o3\n"); + LOG_INFO("Create an object o3\n"); } else { - printf("Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -463,25 +463,25 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } // Read the second object @@ -491,18 +491,18 @@ main(int argc, char **argv) offset_length[1] = 4; reg = PDCregion_create(2, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -510,41 +510,41 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // Read the third object @@ -556,18 +556,18 @@ main(int argc, char **argv) offset_length[2] = 2; reg = PDCregion_create(3, offset, offset_length); if (reg > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); if (reg_global > 0) { - printf("Create an region o1\n"); + LOG_INFO("Create an region o1\n"); } else { - printf("Fail to create region @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -575,68 +575,68 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer start @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer wait @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. for (i = 0; i < BUF_LEN; ++i) { if (data_read[i] != i) { - printf("wrong value %d!=%d @ line %d\n", data_read[i], i, __LINE__); + LOG_ERROR("wrong value %d!=%d\n", data_read[i], i); ret_value = 1; break; } } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("Fail to region transfer close @ line %d\n", __LINE__); + LOG_ERROR("Fail to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - printf("fail to close local region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { - printf("successfully closed local region @ line %d\n", __LINE__); + LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - printf("fail to close global region @ line %d\n", __LINE__); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { - printf("successfully closed global region @ line %d\n", __LINE__); + LOG_INFO("successfully closed global region"); } // close object if (PDCobj_close(obj1) < 0) { - printf("fail to close object o1 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { - printf("successfully close object o1 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - printf("fail to close object o2 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - printf("fail to close object o3 @ line %d\n", __LINE__); + LOG_ERROR("Fail to close object o3"); ret_value = 1; } else { - printf("successfully close object o2 @ line %d\n", __LINE__); + LOG_INFO("successfully close object o2"); } // close pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC @ line %d\n", __LINE__); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/search_obj.c b/src/tests/search_obj.c index 465a48b6c..c7593d7e6 100644 --- a/src/tests/search_obj.c +++ b/src/tests/search_obj.c @@ -50,7 +50,7 @@ rand_string(char *str, size_t size) void print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -92,11 +92,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -109,28 +109,27 @@ main(int argc, char **argv) } if (rank == 0) { - printf("%d clients in total\n", size); + LOG_INFO("%d clients in total\n", size); } count /= size; // create a pdc pdc = PDC_init("pdc"); - /* printf("create a new pdc, pdc id is: %lld\n", pdc); */ // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -140,7 +139,7 @@ main(int argc, char **argv) srand(rank + 1); if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } obj_names = (char **)malloc(count * sizeof(char *)); @@ -157,7 +156,6 @@ main(int argc, char **argv) strcpy(pdc_server_tmp_dir_g, tmp_dir); sprintf(filename, "%s/metadata_checkpoint.%d", pdc_server_tmp_dir_g, rank); - /* printf("file name: %s\n", filename); */ FILE *file = fopen(filename, "r"); if (file == NULL) { fputs("Checkpoint file not available\n", stderr); @@ -165,15 +163,12 @@ main(int argc, char **argv) } fread(&n_entry, sizeof(int), 1, file); - /* printf("%d entries\n", n_entry); */ while (n_entry > 0) { fread(&tmp_count, sizeof(int), 1, file); - /* printf("Count:%d\n", tmp_count); */ hash_key = (uint32_t *)malloc(sizeof(uint32_t)); fread(hash_key, sizeof(uint32_t), 1, file); - /* printf("Hash key is %u\n", *hash_key); */ // read each metadata for (j = 0; j < tmp_count; j++) { @@ -184,20 +179,16 @@ main(int argc, char **argv) fread(&entry, sizeof(pdc_metadata_t), 1, file); sprintf(obj_names[read_count], "%s", entry.obj_name); obj_ts[i] = entry.time_step; - /* printf("Read name %s\n", obj_names[read_count]); */ + read_count++; } n_entry--; } fclose(file); - /* printf("Finished read\n"); */ - /* fflush(stdout); */ - - /* count = read_count; */ if (rank == 0) - printf("Searching %d objects per MPI rank\n", count); + LOG_INFO("Searching %d objects per MPI rank\n", count); fflush(stdout); #ifdef ENABLE_MPI @@ -210,19 +201,11 @@ main(int argc, char **argv) pdc_metadata_t *res = NULL; - /* printf("Proc %d search %s\n", rank, obj_name); */ - /* PDC_Client_query_metadata_with_name(obj_names[i], &res); */ - /* PDC_Client_query_metadata_with_name(obj_names[0], &res); */ int name_id = 0; PDC_Client_query_metadata_name_only(obj_names[name_id], &res); if (res == NULL) { - printf("No result found for current query with name [%s]\n", obj_names[i]); + LOG_INFO("No result found for current query with name [%s]\n", obj_names[i]); } - /* else { */ - /* printf("Got response from server.\n"); */ - /* PDC_print_metadata(res); */ - /* fflush(stdout); */ - /* } */ // Print progress int progress_factor = count < 20 ? 1 : 20; @@ -233,7 +216,7 @@ main(int argc, char **argv) ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("searched %10d ... %.5e\n", i * size, ht_total_sec); + LOG_INFO("searched %10d ... %.5e\n", i * size, ht_total_sec); fflush(stdout); } @@ -251,21 +234,20 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - /* printf("Time to full query %d obj/rank with %d ranks: %.5e\n\n\n", count, size, ht_total_sec); */ - printf("Time to partial query %d obj/rank with %d ranks: %.5e\n\n\n", count, size, ht_total_sec); + LOG_INFO("Time to partial query %d obj/rank with %d ranks: %.5e\n\n\n", count, size, ht_total_sec); fflush(stdout); } // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container %lld\n", cont); + LOG_ERROR("Fail to close container %lld\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDC_close(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/search_obj_scale.c b/src/tests/search_obj_scale.c index 88506ffc7..94d89f8a5 100644 --- a/src/tests/search_obj_scale.c +++ b/src/tests/search_obj_scale.c @@ -48,10 +48,10 @@ rand_string(char *str, size_t size) return str; } -void +voidzs print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -89,11 +89,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -108,7 +108,7 @@ main(int argc, char **argv) count /= size; if (rank == 0) - printf("Creating %d objects per MPI rank\n", count); + LOG_INFO("Creating %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -117,17 +117,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -135,7 +135,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } srand(rank + 1); @@ -160,13 +160,13 @@ main(int argc, char **argv) ts = i / 4 + rank * count; } else { - printf("Unsupported name choice\n"); + LOG_ERROR("Unsupported name choice\n"); goto done; } PDC_Client_query_metadata_name_only(obj_name, &res); if (res == NULL) { - printf("%d: Cannot find object [%s] ts=%d\n", rank, obj_name, ts); + LOG_ERROR("%d: Cannot find object [%s] ts=%d\n", rank, obj_name, ts); } else { PDC_print_metadata(res); @@ -180,7 +180,7 @@ main(int argc, char **argv) ht_total_end.tv_usec - ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; - printf("%10d queried ... %.5es\n", i * size, ht_total_sec); + LOG_INFO("%10d queried ... %.5es\n", i * size, ht_total_sec); fflush(stdout); } } @@ -193,7 +193,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); + LOG_INFO("Time to create %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); fflush(stdout); } @@ -201,14 +201,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/set_prop.c b/src/tests/set_prop.c index 6a0ca73a5..4ca5d78d1 100644 --- a/src/tests/set_prop.c +++ b/src/tests/set_prop.c @@ -53,74 +53,74 @@ main(int argc, char **argv) // create an object property create_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop1 <= 0) { - printf("Fail to create @ line %d\n", __LINE__); + LOG_ERROR("Fail to create"); ret_value = 1; } // create another object property create_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop2 <= 0) { - printf("Fail to create @ line %d\n", __LINE__); + LOG_ERROR("Fail to create"); ret_value = 1; } ret = PDCprop_set_obj_user_id(create_prop2, 666); if (ret != SUCCEED) { - printf("Fail to set obj user id @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj user id"); ret_value = 1; } ret = PDCprop_set_obj_data_loc(create_prop2, "somewhere"); if (ret != SUCCEED) { - printf("Fail to set obj user id @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj user id"); ret_value = 1; } ret = PDCprop_set_obj_app_name(create_prop2, "someapp name"); if (ret != SUCCEED) { - printf("Fail to set obj user id @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj user id"); ret_value = 1; } ret = PDCprop_set_obj_time_step(create_prop2, 666); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_tags(create_prop2, "sometag"); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_dims(create_prop2, ndim, dims); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(create_prop2, PDC_DOUBLE); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_buf(create_prop2, NULL); if (ret != SUCCEED) { - printf("Fail to set obj time step @ line %d\n", __LINE__); + LOG_ERROR("Fail to set obj time step"); ret_value = 1; } if (PDCprop_close(create_prop1) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close first property\n"); + LOG_INFO("successfully close first property\n"); } if (PDCprop_close(create_prop2) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { - printf("successfully close second property\n"); + LOG_INFO("successfully close second property\n"); } // close a pdc if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/stat_obj.c b/src/tests/stat_obj.c index 6a068edc7..8e9b3ef4f 100644 --- a/src/tests/stat_obj.c +++ b/src/tests/stat_obj.c @@ -35,7 +35,7 @@ void print_usage() { - printf("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_INFO("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int @@ -79,11 +79,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -96,7 +96,7 @@ main(int argc, char **argv) } if (rank == 0) { - printf("%d clients in total\n", size); + LOG_INFO("%d clients in total\n", size); } count /= size; @@ -106,17 +106,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -126,7 +126,7 @@ main(int argc, char **argv) srand(rank + 1); if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } obj_names = (char **)malloc(count * sizeof(char *)); @@ -150,17 +150,17 @@ main(int argc, char **argv) } if (fread(&n_entry, sizeof(int), 1, file) == 0) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } while (n_entry > 0) { if (fread(&tmp_count, sizeof(int), 1, file)) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) == 0) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } // read each metadata @@ -170,7 +170,7 @@ main(int argc, char **argv) break; } if (fread(&entry, sizeof(pdc_metadata_t), 1, file) == 0) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } sprintf(obj_names[read_count], "%s", entry.obj_name); obj_ts[read_count] = entry.time_step; @@ -182,7 +182,7 @@ main(int argc, char **argv) fclose(file); if (rank == 0) - printf("Stating %d objects per MPI rank\n", count); + LOG_INFO("Stating %d objects per MPI rank\n", count); fflush(stdout); #ifdef ENABLE_MPI @@ -195,7 +195,7 @@ main(int argc, char **argv) res = NULL; PDC_Client_query_metadata_name_timestep(obj_names[i], obj_ts[i], &res); if (res == NULL) { - printf("No result found for current partial query with name [%s]\n", obj_names[i]); + LOG_INFO("No result found for current partial query with name [%s]\n", obj_names[i]); } // Print progress @@ -207,7 +207,7 @@ main(int argc, char **argv) ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("stated %10d ... %.5e\n", i * size, ht_total_sec); + LOG_INFO("stated %10d ... %.5e\n", i * size, ht_total_sec); fflush(stdout); } @@ -225,20 +225,20 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to stat %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); + LOG_INFO("Time to stat %d obj/rank with %d ranks: %.5e\n", count, size, ht_total_sec); fflush(stdout); } // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/update_obj.c b/src/tests/update_obj.c index b63082361..622f7c782 100644 --- a/src/tests/update_obj.c +++ b/src/tests/update_obj.c @@ -35,7 +35,7 @@ void print_usage() { - printf("Usage: srun -n ./update_obj -r num_of_obj_per_rank\n"); + LOG_INFO("Usage: srun -n ./update_obj -r num_of_obj_per_rank\n"); } int @@ -78,11 +78,11 @@ main(int argc, char **argv) break; case '?': if (optopt == 'r') - fprintf(stderr, "Option -%c requires an argument.\n", optopt); + LOG_ERROR("Option -%c requires an argument.\n", optopt); else if (isprint(optopt)) - fprintf(stderr, "Unknown option `-%c'.\n", optopt); + LOG_ERROR("Unknown option `-%c'.\n", optopt); else - fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + LOG_ERROR("Unknown option character `\\x%x'.\n", optopt); return 1; default: print_usage(); @@ -97,7 +97,7 @@ main(int argc, char **argv) count /= size; if (rank == 0) - printf("Update/Delete %d objects per MPI rank\n", count); + LOG_INFO("Update/Delete %d objects per MPI rank\n", count); fflush(stdout); // create a pdc @@ -106,17 +106,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -130,7 +130,7 @@ main(int argc, char **argv) srand(rank + 1); if (rank == 0) { - printf("Using %s\n", name_mode[use_name + 1]); + LOG_INFO("Using %s\n", name_mode[use_name + 1]); } obj_names = (char **)malloc(count * sizeof(char *)); @@ -155,17 +155,17 @@ main(int argc, char **argv) } if (fread(&n_entry, sizeof(int), 1, file) == 0) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } while (n_entry > 0) { if (fread(&tmp_count, sizeof(int), 1, file) == 0) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) == 0) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } // read each metadata @@ -175,7 +175,7 @@ main(int argc, char **argv) break; } if (fread(&entry, sizeof(pdc_metadata_t), 1, file) == 0) { - printf("read failed\n"); + LOG_ERROR("Read failed\n"); } sprintf(obj_names[read_count], "%s", entry.obj_name); obj_ts[read_count] = entry.time_step; @@ -196,7 +196,7 @@ main(int argc, char **argv) for (i = 0; i < count; i++) { PDC_Client_query_metadata_name_timestep(obj_names[i], obj_ts[i], &res); if (res == NULL) { - printf("No result found for current query with name [%s]\n", obj_names[i]); + LOG_INFO("No result found for current query with name [%s]\n", obj_names[i]); } else { PDC_Client_update_metadata(res, &new); @@ -211,7 +211,7 @@ main(int argc, char **argv) ht_total_end.tv_usec - ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; - printf("updated %10d ... %.5e\n", i * size, ht_total_sec); + LOG_INFO("updated %10d ... %.5e\n", i * size, ht_total_sec); fflush(stdout); } } @@ -225,20 +225,20 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to update %d obj/rank with %d ranks: %.5e\n\n\n", count, size, ht_total_sec); + LOG_INFO("Time to update %d obj/rank with %d ranks: %.5e\n\n\n", count, size, ht_total_sec); fflush(stdout); } // close a container if (PDCcont_close(cont) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/vpicio.c b/src/tests/vpicio.c index 1fa717189..7b6adc007 100644 --- a/src/tests/vpicio.c +++ b/src/tests/vpicio.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int @@ -91,7 +91,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } dims[0] = numparticles * size; @@ -113,13 +113,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("fail to create container"); return 1; } // create an object property @@ -197,44 +197,44 @@ main(int argc, char **argv) #endif obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); if (obj_yy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); if (obj_zz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); if (obj_pxx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); if (obj_pyy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); if (obj_pzz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + 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); if (obj_id11 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + 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); if (obj_id22 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } @@ -242,48 +242,48 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) { - printf("Obj create time: %.5e\n", t1 - t0); + LOG_INFO("Obj create time: %.5e\n", t1 - t0); } #endif transfer_request_x = PDCregion_transfer_create(&x[0], PDC_WRITE, obj_xx, region_x, region_xx); if (transfer_request_x == 0) { - printf("Array x transfer request creation failed\n"); + LOG_ERROR("Array x transfer request creation failed\n"); return 1; } transfer_request_y = PDCregion_transfer_create(&y[0], PDC_WRITE, obj_yy, region_y, region_yy); if (transfer_request_y == 0) { - printf("Array y transfer request creation failed\n"); + LOG_ERROR("Array y transfer request creation failed\n"); return 1; } transfer_request_z = PDCregion_transfer_create(&z[0], PDC_WRITE, obj_zz, region_z, region_zz); if (transfer_request_z == 0) { - printf("Array z transfer request creation failed\n"); + LOG_ERROR("Array z transfer request creation failed\n"); return 1; } transfer_request_px = PDCregion_transfer_create(&px[0], PDC_WRITE, obj_pxx, region_px, region_pxx); if (transfer_request_px == 0) { - printf("Array px transfer request creation failed\n"); + LOG_ERROR("Array px transfer request creation failed\n"); return 1; } transfer_request_py = PDCregion_transfer_create(&py[0], PDC_WRITE, obj_pyy, region_py, region_pyy); if (transfer_request_py == 0) { - printf("Array py transfer request creation failed\n"); + LOG_ERROR("Array py transfer request creation failed\n"); return 1; } transfer_request_pz = PDCregion_transfer_create(&pz[0], PDC_WRITE, obj_pzz, region_pz, region_pzz); if (transfer_request_pz == 0) { - printf("Array pz transfer request creation failed\n"); + LOG_ERROR("Array pz transfer request creation failed\n"); return 1; } transfer_request_id1 = PDCregion_transfer_create(&id1[0], PDC_WRITE, obj_id11, region_id1, region_id11); if (transfer_request_id1 == 0) { - printf("Array id1 transfer request creation failed\n"); + LOG_ERROR("Array id1 transfer request creation failed\n"); return 1; } transfer_request_id2 = PDCregion_transfer_create(&id2[0], PDC_WRITE, obj_id22, region_id2, region_id22); if (transfer_request_id2 == 0) { - printf("Array id2 transfer request creation failed\n"); + LOG_ERROR("Array id2 transfer request creation failed\n"); return 1; } @@ -291,48 +291,48 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t0 = MPI_Wtime(); if (rank == 0) { - printf("Transfer create time: %.5e\n", t0 - t1); + LOG_INFO("Transfer create time: %.5e\n", t0 - t1); } #endif ret = PDCregion_transfer_start(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to start transfer for region_xx\n"); + LOG_ERROR("failed to start transfer for region_xx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to start transfer for region_yy\n"); + LOG_ERROR("failed to start transfer for region_yy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to start transfer for region_zz\n"); + LOG_ERROR("failed to start transfer for region_zz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pxx\n"); + LOG_ERROR("failed to start transfer for region_pxx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pyy\n"); + LOG_ERROR("failed to start transfer for region_pyy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to start transfer for region_pzz\n"); + LOG_ERROR("failed to start transfer for region_pzz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id11\n"); + LOG_ERROR("failed to start transfer for region_id11\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to start transfer for region_id22\n"); + LOG_ERROR("failed to start transfer for region_id22\n"); return 1; } @@ -340,48 +340,48 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) { - printf("Transfer start time: %.5e\n", t1 - t0); + LOG_INFO("Transfer start time: %.5e\n", t1 - t0); } #endif ret = PDCregion_transfer_wait(transfer_request_x); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_xx\n"); + LOG_ERROR("failed to transfer wait for region_xx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_y); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_yy\n"); + LOG_ERROR("failed to transfer wait for region_yy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_z); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_zz\n"); + LOG_ERROR("failed to transfer wait for region_zz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_px); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pxx\n"); + LOG_ERROR("failed to transfer wait for region_pxx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_py); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pyy\n"); + LOG_ERROR("failed to transfer wait for region_pyy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_pz); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_pzz\n"); + LOG_ERROR("failed to transfer wait for region_pzz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id1); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id11\n"); + LOG_ERROR("failed to transfer wait for region_id11\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id2); if (ret != SUCCEED) { - printf("Failed to transfer wait for region_id22\n"); + LOG_ERROR("failed to transfer wait for region_id22\n"); return 1; } @@ -389,48 +389,48 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t0 = MPI_Wtime(); if (rank == 0) { - printf("Transfer wait time: %.5e\n", t0 - t1); + LOG_ERROR("Transfer wait time: %.5e\n", t0 - t1); } #endif ret = PDCregion_transfer_close(transfer_request_x); if (ret != SUCCEED) { - printf("region xx transfer close failed\n"); + LOG_ERROR("region xx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_y); if (ret != SUCCEED) { - printf("region yy transfer close failed\n"); + LOG_ERROR("region yy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_z); if (ret != SUCCEED) { - printf("region zz transfer close failed\n"); + LOG_ERROR("region zz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_px); if (ret != SUCCEED) { - printf("region pxx transfer close failed\n"); + LOG_ERROR("region pxx transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_py); if (ret != SUCCEED) { - printf("region pyy transfer close failed\n"); + LOG_ERROR("region pyy transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_pz); if (ret != SUCCEED) { - printf("region pzz transfer close failed\n"); + LOG_ERROR("region pzz transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id1); if (ret != SUCCEED) { - printf("region id11 transfer close failed\n"); + LOG_ERROR("region id11 transfer close failed\n"); return 1; } ret = PDCregion_transfer_close(transfer_request_id2); if (ret != SUCCEED) { - printf("region id22 transfer close failed\n"); + LOG_ERROR("region id22 transfer close failed\n"); return 1; } @@ -439,151 +439,151 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) { - printf("Transfer close time: %.5e\n", t1 - t0); + LOG_ERROR("Transfer close time: %.5e\n", t1 - t0); } #endif if (PDCobj_close(obj_xx) < 0) { - printf("fail to close obj_xx\n"); + LOG_ERROR("fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - printf("fail to close object obj_yy\n"); + LOG_ERROR("fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - printf("fail to close object obj_zz\n"); + LOG_ERROR("fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - printf("fail to close object obj_pxx\n"); + LOG_ERROR("fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - printf("fail to close object obj_pyy\n"); + LOG_ERROR("fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - printf("fail to close object obj_pzz\n"); + LOG_ERROR("fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - printf("fail to close object obj_id11\n"); + LOG_ERROR("fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - printf("fail to close object obj_id22\n"); + LOG_ERROR("fail to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - printf("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - printf("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - printf("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - printf("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - printf("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - printf("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - printf("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - printf("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - printf("fail to close region region_x\n"); + LOG_ERROR("fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - printf("fail to close region region_y\n"); + LOG_ERROR("fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - printf("fail to close region region_z\n"); + LOG_ERROR("fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - printf("fail to close region region_px\n"); + LOG_ERROR("fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - printf("fail to close region region_py\n"); + LOG_ERROR("fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - printf("fail to close region region_pz\n"); + LOG_ERROR("fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - printf("fail to close region region_id1\n"); + LOG_ERROR("fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - printf("fail to close region region_id2\n"); + LOG_ERROR("fail to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - printf("fail to close region region_xx\n"); + LOG_ERROR("fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - printf("fail to close region region_yy\n"); + LOG_ERROR("fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - printf("fail to close region region_zz\n"); + LOG_ERROR("fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - printf("fail to close region region_pxx\n"); + LOG_ERROR("fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - printf("fail to close region region_pyy\n"); + LOG_ERROR("fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - printf("fail to close region region_pzz\n"); + LOG_ERROR("fail to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - printf("fail to close region region_id11\n"); + LOG_ERROR("fail to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - printf("fail to close region region_id22\n"); + LOG_ERROR("fail to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); return 1; } free(offset); diff --git a/src/tests/vpicio_mts.c b/src/tests/vpicio_mts.c index acbed21fa..4dfb7250b 100644 --- a/src/tests/vpicio_mts.c +++ b/src/tests/vpicio_mts.c @@ -45,7 +45,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles #steps sleep_time(s)\n"); + LOG_INFO("Usage: srun -n ./vpicio #particles #steps sleep_time(s)\n"); } int @@ -87,8 +87,8 @@ main(int argc, char **argv) sleeptime = atoi(argv[3]); } if (rank == 0) - printf("Writing %" PRIu64 " number of particles for %d steps with %d clients.\n", numparticles, steps, - size); + LOG_INFO("Writing %" PRIu64 " number of particles for %d steps with %d clients.\n", numparticles, + steps, size); dims[0] = numparticles * size; @@ -108,13 +108,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); return FAIL; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); return FAIL; } // create an object property @@ -155,7 +155,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); PDC_get_time_str(cur_time); if (rank == 0) - printf("\n[%s] #Step %d\n", cur_time, iter); + LOG_INFO("\n[%s] #Step %d\n", cur_time, iter); t0 = MPI_Wtime(); #endif PDCprop_set_obj_time_step(obj_prop_float, iter); @@ -163,44 +163,44 @@ main(int argc, char **argv) obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_float, 0, comm); if (obj_xx == 0) { - printf("Error getting an object id of %s from server\n", "x"); + 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); if (obj_yy == 0) { - printf("Error getting an object id of %s from server\n", "y"); + 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); if (obj_zz == 0) { - printf("Error getting an object id of %s from server\n", "z"); + 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); if (obj_pxx == 0) { - printf("Error getting an object id of %s from server\n", "px"); + 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); if (obj_pyy == 0) { - printf("Error getting an object id of %s from server\n", "py"); + 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); if (obj_pzz == 0) { - printf("Error getting an object id of %s from server\n", "pz"); + 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); if (obj_id11 == 0) { - printf("Error getting an object id of %s from server\n", "id1"); + 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); if (obj_id22 == 0) { - printf("Error getting an object id of %s from server\n", "id2"); + LOG_ERROR("Error getting an object id of %s from server\n", "id2"); return FAIL; } @@ -209,55 +209,55 @@ main(int argc, char **argv) t1 = MPI_Wtime(); PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Obj create time: %.5e\n", cur_time, t1 - t0); + LOG_INFO("[%s] Obj create time: %.5e\n", cur_time, t1 - t0); #endif transfer_requests[0] = PDCregion_transfer_create(&x[0], PDC_WRITE, obj_xx, region_local, region_remote); if (transfer_requests[0] == 0) { - printf("x transfer request creation failed\n"); + LOG_ERROR("x transfer request creation failed\n"); return FAIL; } transfer_requests[1] = PDCregion_transfer_create(&y[0], PDC_WRITE, obj_yy, region_local, region_remote); if (transfer_requests[1] == 0) { - printf("y transfer request creation failed\n"); + LOG_ERROR("y transfer request creation failed\n"); return FAIL; } transfer_requests[2] = PDCregion_transfer_create(&z[0], PDC_WRITE, obj_zz, region_local, region_remote); if (transfer_requests[2] == 0) { - printf("z transfer request creation failed\n"); + LOG_ERROR("z transfer request creation failed\n"); return FAIL; } transfer_requests[3] = PDCregion_transfer_create(&px[0], PDC_WRITE, obj_pxx, region_local, region_remote); if (transfer_requests[3] == 0) { - printf("px transfer request creation failed\n"); + LOG_ERROR("px transfer request creation failed\n"); return FAIL; } transfer_requests[4] = PDCregion_transfer_create(&py[0], PDC_WRITE, obj_pyy, region_local, region_remote); if (transfer_requests[4] == 0) { - printf("py transfer request creation failed\n"); + LOG_ERROR("py transfer request creation failed\n"); return FAIL; } transfer_requests[5] = PDCregion_transfer_create(&pz[0], PDC_WRITE, obj_pzz, region_local, region_remote); if (transfer_requests[5] == 0) { - printf("pz transfer request creation failed\n"); + LOG_ERROR("pz transfer request creation failed\n"); return FAIL; } transfer_requests[6] = PDCregion_transfer_create(&id1[0], PDC_WRITE, obj_id11, region_local, region_remote); if (transfer_requests[6] == 0) { - printf("id1 transfer request creation failed\n"); + LOG_ERROR("id1 transfer request creation failed\n"); return FAIL; } transfer_requests[7] = PDCregion_transfer_create(&id2[0], PDC_WRITE, obj_id22, region_local, region_remote); if (transfer_requests[7] == 0) { - printf("id2 transfer request creation failed\n"); + LOG_ERROR("id2 transfer request creation failed\n"); return FAIL; } @@ -266,7 +266,7 @@ main(int argc, char **argv) t0 = MPI_Wtime(); PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Transfer create time: %.5e\n", cur_time, t0 - t1); + LOG_ERROR("[%s] Transfer create time: %.5e\n", cur_time, t0 - t1); #endif #ifdef ENABLE_MPI @@ -274,7 +274,7 @@ main(int argc, char **argv) #else if (PDCregion_transfer_start_all(transfer_requests, 8) != SUCCEED) { #endif - printf("Failed to start transfer requests\n"); + LOG_ERROR("Failed to start transfer requests\n"); return FAIL; } @@ -283,17 +283,17 @@ main(int argc, char **argv) t1 = MPI_Wtime(); PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Transfer start time: %.5e\n", cur_time, t1 - t0); + LOG_INFO("[%s] Transfer start time: %.5e\n", cur_time, t1 - t0); #endif // Emulate compute with sleep if (iter != steps - 1) { PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Sleep start: %llu.00\n", cur_time, sleeptime); + LOG_INFO("[%s] Sleep start: %llu.00\n", cur_time, sleeptime); sleep(sleeptime); PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Sleep end: %llu.00\n", cur_time, sleeptime); + LOG_INFO("[%s] Sleep end: %llu.00\n", cur_time, sleeptime); } #ifdef ENABLE_MPI @@ -302,7 +302,7 @@ main(int argc, char **argv) #endif if (PDCregion_transfer_wait_all(transfer_requests, 8) != SUCCEED) { - printf("Failed to transfer wait all\n"); + LOG_ERROR("Failed to transfer wait all\n"); return FAIL; } @@ -311,12 +311,12 @@ main(int argc, char **argv) t1 = MPI_Wtime(); PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Transfer wait time: %.5e\n", cur_time, t1 - t0); + LOG_INFO("[%s] Transfer wait time: %.5e\n", cur_time, t1 - t0); #endif for (int j = 0; j < 8; j++) { if (PDCregion_transfer_close(transfer_requests[j]) != SUCCEED) { - printf("region transfer close failed\n"); + LOG_ERROR("region transfer close failed\n"); return FAIL; } } @@ -326,39 +326,39 @@ main(int argc, char **argv) t0 = MPI_Wtime(); PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Transfer close time: %.5e\n", cur_time, t0 - t1); + LOG_INFO("[%s] Transfer close time: %.5e\n", cur_time, t0 - t1); #endif if (PDCobj_close(obj_xx) != SUCCEED) { - printf("fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); return FAIL; } if (PDCobj_close(obj_yy) != SUCCEED) { - printf("fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); return FAIL; } if (PDCobj_close(obj_zz) != SUCCEED) { - printf("fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); return FAIL; } if (PDCobj_close(obj_pxx) != SUCCEED) { - printf("fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); return FAIL; } if (PDCobj_close(obj_pyy) != SUCCEED) { - printf("fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); return FAIL; } if (PDCobj_close(obj_pzz) != SUCCEED) { - printf("fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); return FAIL; } if (PDCobj_close(obj_id11) != SUCCEED) { - printf("fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); return FAIL; } if (PDCobj_close(obj_id22) != SUCCEED) { - printf("fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); return FAIL; } @@ -367,38 +367,38 @@ main(int argc, char **argv) t1 = MPI_Wtime(); PDC_get_time_str(cur_time); if (rank == 0) - printf("[%s] Obj close time: %.5e\n", cur_time, t1 - t0); + LOG_INFO("[%s] Obj close time: %.5e\n", cur_time, t1 - t0); #endif } // End for steps PDC_timing_report("write"); if (PDCprop_close(obj_prop_float) != SUCCEED) { - printf("Fail to close obj_prop_float\n"); + LOG_ERROR("Fail to close obj_prop_float\n"); return FAIL; } if (PDCprop_close(obj_prop_int) != SUCCEED) { - printf("Fail to close obj_prop_int\n"); + LOG_ERROR("Fail to close obj_prop_int\n"); return FAIL; } if (PDCregion_close(region_local) != SUCCEED) { - printf("fail to close local region \n"); + LOG_ERROR("Fail to close local region \n"); return FAIL; } if (PDCobj_close(region_remote) != SUCCEED) { - printf("fail to close remote region\n"); + LOG_ERROR("Fail to close remote region\n"); return FAIL; } if (PDCcont_close(cont_id) != SUCCEED) { - printf("fail to close container\n"); + LOG_ERROR("Fail to close container\n"); return FAIL; } if (PDCprop_close(cont_prop) != SUCCEED) { - printf("Fail to close property\n"); + LOG_ERROR("Fail to close property\n"); return FAIL; } if (PDCclose(pdc_id) != SUCCEED) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return FAIL; } free(x); diff --git a/src/tests/vpicio_old.c b/src/tests/vpicio_old.c index f3a2088fa..361e903a4 100644 --- a/src/tests/vpicio_old.c +++ b/src/tests/vpicio_old.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int @@ -87,7 +87,7 @@ main(int argc, char **argv) if (argc == 2) { numparticles = atoll(argv[1]); if (rank == 0) - printf("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); + LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } dims[0] = numparticles; @@ -109,13 +109,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); return 1; } // create an object property @@ -151,44 +151,44 @@ main(int argc, char **argv) obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); if (obj_yy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); if (obj_zz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); if (obj_pxx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); if (obj_pyy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); if (obj_pzz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + 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); if (obj_id11 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + 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); if (obj_id22 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } @@ -223,82 +223,82 @@ main(int argc, char **argv) #endif ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx, region_xx); if (ret < 0) { - printf("Array x PDCbuf_obj_map failed\n"); + LOG_ERROR("Array x PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy, region_yy); if (ret < 0) { - printf("Array y PDCbuf_obj_map failed\n"); + LOG_ERROR("Array y PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz, region_zz); if (ret < 0) { - printf("Array z PDCbuf_obj_map failed\n"); + LOG_ERROR("Array z PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx, region_pxx); if (ret < 0) { - printf("Array px PDCbuf_obj_map failed\n"); + LOG_ERROR("Array px PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy, region_pyy); if (ret < 0) { - printf("Array py PDCbuf_obj_map failed\n"); + LOG_ERROR("Array py PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz, region_pzz); if (ret < 0) { - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_ERROR("Array pz PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11, region_id11); if (ret < 0) { - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id1 PDCbuf_obj_map failed\n"); return 1; } ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22, region_id22); if (ret < 0) { - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id2 PDCbuf_obj_map failed\n"); return 1; } ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); return 1; } ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); return 1; } ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_zz\n"); + LOG_ERROR("Failed to obtain lock for region_zz\n"); return 1; } ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("Failed to obtain lock for region_pxx\n"); return 1; } ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("Failed to obtain lock for region_pyy\n"); return 1; } ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("Failed to obtain lock for region_pzz\n"); return 1; } ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_id11\n"); + LOG_ERROR("Failed to obtain lock for region_id11\n"); return 1; } ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - printf("Failed to obtain lock for region_id22\n"); + LOG_ERROR("Failed to obtain lock for region_id22\n"); return 1; } @@ -314,226 +314,226 @@ main(int argc, char **argv) } ret = PDCreg_release_lock(obj_xx, region_xx, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_xx\n"); + LOG_ERROR("Failed to release lock for region_xx\n"); return 1; } ret = PDCreg_release_lock(obj_yy, region_yy, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_yy\n"); + LOG_ERROR("Failed to release lock for region_yy\n"); return 1; } ret = PDCreg_release_lock(obj_zz, region_zz, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_zz\n"); + LOG_ERROR("Failed to release lock for region_zz\n"); return 1; } ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_pxx\n"); + LOG_ERROR("Failed to release lock for region_pxx\n"); return 1; } ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_pyy\n"); + LOG_ERROR("Failed to release lock for region_pyy\n"); return 1; } ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_pzz\n"); + LOG_ERROR("Failed to release lock for region_pzz\n"); return 1; } ret = PDCreg_release_lock(obj_id11, region_id11, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_id11\n"); + LOG_ERROR("Failed to release lock for region_id11\n"); return 1; } ret = PDCreg_release_lock(obj_id22, region_id22, PDC_WRITE); if (ret != SUCCEED) { - printf("Failed to release lock for region_id22\n"); + LOG_ERROR("Failed to release lock for region_id22\n"); return 1; } ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) { - printf("region xx unmap failed\n"); + LOG_ERROR("region xx unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_yy, region_yy); if (ret != SUCCEED) { - printf("region yy unmap failed\n"); + LOG_ERROR("region yy unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_zz, region_zz); if (ret != SUCCEED) { - printf("region zz unmap failed\n"); + LOG_ERROR("region zz unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_pxx, region_pxx); if (ret != SUCCEED) { - printf("region pxx unmap failed\n"); + LOG_ERROR("region pxx unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_pyy, region_pyy); if (ret != SUCCEED) { - printf("region pyy unmap failed\n"); + LOG_ERROR("region pyy unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_pzz, region_pzz); if (ret != SUCCEED) { - printf("region pzz unmap failed\n"); + LOG_ERROR("region pzz unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_id11, region_id11); if (ret != SUCCEED) { - printf("region id11 unmap failed\n"); + LOG_ERROR("region id11 unmap failed\n"); return 1; } ret = PDCbuf_obj_unmap(obj_id22, region_id22); if (ret != SUCCEED) { - printf("region id22 unmap failed\n"); + LOG_ERROR("region id22 unmap failed\n"); return 1; } PDC_timing_report("write"); if (PDCobj_close(obj_xx) < 0) { - printf("fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - printf("fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - printf("fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - printf("fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - printf("fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - printf("fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - printf("fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - printf("fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - printf("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - printf("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - printf("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - printf("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - printf("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - printf("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - printf("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - printf("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - printf("fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - printf("fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - printf("fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - printf("fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - printf("fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - printf("fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - printf("fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - printf("fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - printf("fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - printf("fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - printf("fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - printf("fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - printf("fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - printf("fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - printf("fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - printf("fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 1; } free(offset); diff --git a/src/tests/vpicio_v2.c b/src/tests/vpicio_v2.c index 89839352b..de2f94180 100644 --- a/src/tests/vpicio_v2.c +++ b/src/tests/vpicio_v2.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - printf("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int @@ -105,12 +105,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("fail to create container property"); // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("fail to create container"); // create an object property obj_prop_xx = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -146,44 +146,44 @@ main(int argc, char **argv) #ifdef ENABLE_MPI obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); if (obj_yy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); if (obj_zz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); if (obj_pxx == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); if (obj_pyy == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); if (obj_pzz == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + 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); if (obj_id11 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id11"); + 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); if (obj_id22 == 0) { - printf("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } #endif @@ -221,75 +221,75 @@ main(int argc, char **argv) ret = PDCbuf_obj_map(&x[0], PDC_FLOAT, region_x, obj_xx, region_xx); if (ret < 0) - printf("Array x PDCbuf_obj_map failed\n"); + LOG_ERROR("Array x PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &x[0], region_x, obj_xx, region_xx, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(1) failed\n"); + LOG_ERROR("PDCobj_transform_register(1) failed\n"); ret = PDCbuf_obj_map(&y[0], PDC_FLOAT, region_y, obj_yy, region_yy); if (ret < 0) - printf("Array y PDCbuf_obj_map failed\n"); + LOG_ERROR("Array y PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &y[0], region_y, obj_yy, region_yy, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(2) failed\n"); + LOG_ERROR("PDCobj_transform_register(2) failed\n"); ret = PDCbuf_obj_map(&z[0], PDC_FLOAT, region_z, obj_zz, region_zz); if (ret < 0) - printf("Array z PDCbuf_obj_map failed\n"); + LOG_ERROR("Array z PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &z[0], region_z, obj_zz, region_zz, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(3) failed\n"); + LOG_ERROR("PDCobj_transform_register(3) failed\n"); ret = PDCbuf_obj_map(&px[0], PDC_FLOAT, region_px, obj_pxx, region_pxx); if (ret < 0) - printf("Array px PDCbuf_obj_map failed\n"); + LOG_ERROR("Array px PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &px[0], region_px, obj_pxx, region_pxx, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(4) failed\n"); + LOG_ERROR("PDCobj_transform_register(4) failed\n"); ret = PDCbuf_obj_map(&py[0], PDC_FLOAT, region_py, obj_pyy, region_pyy); if (ret < 0) - printf("Array py PDCbuf_obj_map failed\n"); + LOG_ERROR("Array py PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &py[0], region_py, obj_pyy, region_pyy, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(5) failed\n"); + LOG_ERROR("PDCobj_transform_register(5) failed\n"); ret = PDCbuf_obj_map(&pz[0], PDC_FLOAT, region_pz, obj_pzz, region_pzz); if (ret < 0) - printf("Array pz PDCbuf_obj_map failed\n"); + LOG_ERROR("Array pz PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &pz[0], region_pz, obj_pzz, region_pzz, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(6) failed\n"); + LOG_ERROR("PDCobj_transform_register(6) failed\n"); ret = PDCbuf_obj_map(&id1[0], PDC_INT, region_id1, obj_id11, region_id11); if (ret < 0) - printf("Array id1 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id1 PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &id1[0], region_id1, obj_id11, region_id11, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(7) failed\n"); + LOG_ERROR("PDCobj_transform_register(7) failed\n"); ret = PDCbuf_obj_map(&id2[0], PDC_INT, region_id2, obj_id22, region_id22); if (ret < 0) - printf("Array id2 PDCbuf_obj_map failed\n"); + LOG_ERROR("Array id2 PDCbuf_obj_map failed\n"); ret = PDCbuf_map_transform_register("pdc_transform_compress", &id2[0], region_id2, obj_id22, region_id22, 0, INCR_STATE, DATA_OUT); if (ret < 0) - printf("PDCobj_transform_register(8) failed\n"); + LOG_ERROR("PDCobj_transform_register(8) failed\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -299,7 +299,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to map with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to map with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -310,35 +310,35 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_xx\n"); + LOG_ERROR("failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_yy\n"); + LOG_ERROR("failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_zz\n"); + LOG_ERROR("failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id11\n"); + LOG_ERROR("failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - printf("Failed to obtain lock for region_id22\n"); + LOG_ERROR("failed to obtain lock for region_id22\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -348,7 +348,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to lock with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to lock with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -370,35 +370,35 @@ main(int argc, char **argv) ret = PDCreg_release_lock(obj_xx, region_xx, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_xx\n"); + LOG_ERROR("failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy, region_yy, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_yy\n"); + LOG_ERROR("failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz, region_zz, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_zz\n"); + LOG_ERROR("failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pxx\n"); + LOG_ERROR("failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pyy\n"); + LOG_ERROR("failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_pzz\n"); + LOG_ERROR("failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11, region_id11, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_id11\n"); + LOG_ERROR("failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22, region_id22, PDC_WRITE); if (ret != SUCCEED) - printf("Failed to release lock for region_id22\n"); + LOG_ERROR("failed to release lock for region_id22\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -408,7 +408,7 @@ main(int argc, char **argv) ht_total_start.tv_usec; ht_total_sec = ht_total_elapsed / 1000000.0; if (rank == 0) { - printf("Time to update data with %d ranks: %.5e\n", size, ht_total_sec); + LOG_INFO("Time to update data with %d ranks: %.5e\n", size, ht_total_sec); fflush(stdout); } @@ -418,146 +418,146 @@ main(int argc, char **argv) ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) - printf("region xx unmap failed\n"); + LOG_ERROR("region xx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_yy, region_yy); if (ret != SUCCEED) - printf("region yy unmap failed\n"); + LOG_ERROR("region yy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_zz, region_zz); if (ret != SUCCEED) - printf("region zz unmap failed\n"); + LOG_ERROR("region zz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pxx, region_pxx); if (ret != SUCCEED) - printf("region pxx unmap failed\n"); + LOG_ERROR("region pxx unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pyy, region_pyy); if (ret != SUCCEED) - printf("region pyy unmap failed\n"); + LOG_ERROR("region pyy unmap failed\n"); ret = PDCbuf_obj_unmap(obj_pzz, region_pzz); if (ret != SUCCEED) - printf("region pzz unmap failed\n"); + LOG_ERROR("region pzz unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id11, region_id11); if (ret != SUCCEED) - printf("region id11 unmap failed\n"); + LOG_ERROR("region id11 unmap failed\n"); ret = PDCbuf_obj_unmap(obj_id22, region_id22); if (ret != SUCCEED) - printf("region id22 unmap failed\n"); + LOG_ERROR("region id22 unmap failed\n"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif if (PDCobj_close(obj_xx) < 0) - printf("fail to close obj_xx\n"); + LOG_ERROR("fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - printf("fail to close object obj_yy\n"); + LOG_ERROR("fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - printf("fail to close object obj_zz\n"); + LOG_ERROR("fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - printf("fail to close object obj_pxx\n"); + LOG_ERROR("fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - printf("fail to close object obj_pyy\n"); + LOG_ERROR("fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - printf("fail to close object obj_pzz\n"); + LOG_ERROR("fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - printf("fail to close object obj_id11\n"); + LOG_ERROR("fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - printf("fail to close object obj_id22\n"); + LOG_ERROR("fail to close object obj_id22\n"); if (PDCprop_close(obj_prop_xx) < 0) - printf("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("fail to close obj property obj_prop_xx\n"); if (PDCprop_close(obj_prop_yy) < 0) - printf("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("fail to close obj property obj_prop_yy\n"); if (PDCprop_close(obj_prop_zz) < 0) - printf("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("fail to close obj property obj_prop_zz\n"); if (PDCprop_close(obj_prop_pxx) < 0) - printf("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("fail to close obj property obj_prop_pxx\n"); if (PDCprop_close(obj_prop_pyy) < 0) - printf("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("fail to close obj property obj_prop_pyy\n"); if (PDCprop_close(obj_prop_pzz) < 0) - printf("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("fail to close obj property obj_prop_pzz\n"); if (PDCprop_close(obj_prop_id11) < 0) - printf("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("fail to close obj property obj_prop_id11\n"); if (PDCprop_close(obj_prop_id22) < 0) - printf("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("fail to close obj property obj_prop_id22\n"); if (PDCregion_close(region_x) < 0) - printf("fail to close region region_x\n"); + LOG_ERROR("fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - printf("fail to close region region_y\n"); + LOG_ERROR("fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - printf("fail to close region region_z\n"); + LOG_ERROR("fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - printf("fail to close region region_px\n"); + LOG_ERROR("fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - printf("fail to close region region_py\n"); + LOG_ERROR("fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - printf("fail to close region region_pz\n"); + LOG_ERROR("fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - printf("fail to close region region_id1\n"); + LOG_ERROR("fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - printf("fail to close region region_id2\n"); + LOG_ERROR("fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - printf("fail to close region region_xx\n"); + LOG_ERROR("fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - printf("fail to close region region_yy\n"); + LOG_ERROR("fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - printf("fail to close region region_zz\n"); + LOG_ERROR("fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - printf("fail to close region region_pxx\n"); + LOG_ERROR("fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - printf("fail to close region region_pyy\n"); + LOG_ERROR("fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - printf("fail to close region region_pzz\n"); + LOG_ERROR("fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - printf("fail to close region region_id11\n"); + LOG_ERROR("fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - printf("fail to close region region_id22\n"); + LOG_ERROR("fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - printf("fail to close container c1\n"); + LOG_ERROR("fail to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("fail to close property"); if (PDCclose(pdc_id) < 0) - printf("fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); free(offset); free(offset_remote); diff --git a/src/tests/write_obj_shared.c b/src/tests/write_obj_shared.c index d8796bb61..1c8ff890b 100644 --- a/src/tests/write_obj_shared.c +++ b/src/tests/write_obj_shared.c @@ -13,7 +13,7 @@ void print_usage() { - printf("Usage: srun -n ./write_obj obj_name size_MB type\n"); + LOG_JUST_PRINT("Usage: srun -n ./write_obj obj_name size_MB type\n"); } int @@ -107,36 +107,36 @@ main(int argc, char **argv) type_size = sizeof(int8_t); } - printf("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); + LOG_INFO("Writing a %" PRIu64 " MB object [%s] with %d clients.\n", size_MB, obj_name, size); // size_B = 1; size_B = size_MB * 1048576; // create a pdc pdc = PDCinit("pdc"); - printf("create a new pdc\n"); + LOG_INFO("create a new pdc\n"); // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); ret_value = 1; } dims[0] = size_B; my_data_size = size_B / size; - printf("my_data_size at rank %d is %llu\n", rank, (long long unsigned)my_data_size); + LOG_INFO("my_data_size at rank %d is %llu\n", rank, (long long unsigned)my_data_size); mydata = (char *)malloc(my_data_size * type_size); @@ -152,7 +152,7 @@ main(int argc, char **argv) // global_obj = PDCobj_create(cont, obj_name, obj_prop); if (global_obj <= 0) { - printf("Error creating an object [%s], exit...\n", obj_name); + LOG_ERROR("Error creating an object [%s], exit...\n", obj_name); ret_value = 1; } @@ -163,7 +163,7 @@ main(int argc, char **argv) offset[0] = rank * my_data_size; local_offset[0] = 0; mysize[0] = my_data_size; - printf("rank %d offset = %lu, length = %lu, unit size = %ld\n", rank, offset[0], mysize[0], type_size); + LOG_INFO("rank %d offset = %lu, length = %lu, unit size = %ld\n", rank, offset[0], mysize[0], type_size); local_region = PDCregion_create(ndim, local_offset, mysize); global_region = PDCregion_create(ndim, offset, mysize); @@ -175,7 +175,7 @@ main(int argc, char **argv) } transfer_request = PDCregion_transfer_create(mydata, PDC_WRITE, global_obj, local_region, global_region); if (transfer_request == 0) { - printf("PDCregion_transfer_create failed\n"); + LOG_ERROR("PDCregion_transfer_create failed\n"); ret_value = 1; } #ifdef ENABLE_MPI @@ -184,21 +184,21 @@ main(int argc, char **argv) gettimeofday(&pdc_timer_start, 0); ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_start for region\n"); + LOG_ERROR("Failed to region_transfer_start for region\n"); ret_value = 1; goto done; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - printf("Failed to region_transfer_wait for region\n"); + LOG_ERROR("Failed to region_transfer_wait for region\n"); ret_value = 1; goto done; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - printf("PDCregion_transfer_close failed\n"); + LOG_ERROR("PDCregion_transfer_close failed\n"); ret_value = 1; } @@ -209,34 +209,34 @@ main(int argc, char **argv) write_time = PDC_get_elapsed_time_double(&pdc_timer_start, &pdc_timer_end); if (rank == 0) { - printf("Time to lock and release data with %d ranks: %.5e\n", size, write_time); + LOG_ERROR("Time to lock and release data with %d ranks: %.5e\n", size, write_time); fflush(stdout); } done: if (PDCobj_close(global_obj) < 0) { - printf("fail to close global obj\n"); + LOG_ERROR("fail to close global obj\n"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - printf("fail to close local region\n"); + LOG_ERROR("fail to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - printf("fail to close global region\n"); + LOG_ERROR("fail to close global region\n"); ret_value = 1; } if (PDCcont_close(cont) < 0) { - printf("fail to close container\n"); + LOG_ERROR("fail to close container\n"); ret_value = 1; } if (PDCprop_close(cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); ret_value = 1; } free(mydata); diff --git a/src/tools/hdf5_access_eqsim.c b/src/tools/hdf5_access_eqsim.c index ca916b738..efc39d8e9 100644 --- a/src/tools/hdf5_access_eqsim.c +++ b/src/tools/hdf5_access_eqsim.c @@ -43,8 +43,7 @@ main(int argc, char **argv) readt = ceil(1.0 * dims[0] / chunk_size[0]) * chunk_size[0] / devide_factor; if (rank == 0) - fprintf(stderr, "Round %d, use chunk cache %d, devide factor %d\n", round, use_chunk_cache, - devide_factor); + LOG_ERROR("Round %d, use chunk cache %d, devide factor %d\n", round, use_chunk_cache, devide_factor); fapl = H5Pcreate(H5P_FILE_ACCESS); H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL); @@ -58,7 +57,7 @@ main(int argc, char **argv) file = H5Fopen(fname, H5F_ACC_RDONLY, fapl); if (file < 0) - fprintf(stderr, "Failed to open file [%s]\n", fname); + LOG_ERROR("Failed to open file [%s]\n", fname); // Assign chunks to each rank count = 0; @@ -96,7 +95,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: read metadata took %.4lf\n", r, t1 - t0); + LOG_ERROR("Round %d: read metadata took %.4lf\n", r, t1 - t0); } H5Dclose(meta_dset); @@ -123,8 +122,8 @@ main(int argc, char **argv) data = (double *)malloc(sizeof(double) * size[0] * size[1] * size[2]); if (nproc <= 16) - fprintf(stderr, "Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], - offset[1], offset[2], size[0], size[1], size[2]); + LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1], + offset[2], size[0], size[1], size[2]); for (r = 0; r < round; r++) { if (r == round - 1 && use_chunk_cache > 0) @@ -143,7 +142,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d, Read from HDF5 took %.4lf\n", r, t1 - t0); + LOG_ERROR("Round %d, Read from HDF5 took %.4lf\n", r, t1 - t0); if (r != round - 1) { // leave dset open for following patterns @@ -185,11 +184,11 @@ main(int argc, char **argv) t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: Scanning data took %.4lf\n", r, t1 - t0); + LOG_ERROR("Round %d: Scanning data took %.4lf\n", r, t1 - t0); } - fprintf(stderr, "Rank %d: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n", rank, cnt[0], cnt[1], cnt[2], cnt[3], - cnt[4], cnt[5], cnt[6], cnt[7], cnt[8], cnt[9]); + LOG_ERROR("Rank %d: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n", rank, cnt[0], cnt[1], cnt[2], cnt[3], + cnt[4], cnt[5], cnt[6], cnt[7], cnt[8], cnt[9]); MPI_Barrier(MPI_COMM_WORLD); //=============PATTERN 2=============== @@ -211,8 +210,8 @@ main(int argc, char **argv) mspace = H5Screate_simple(4, size, NULL); if (nproc <= 16) - fprintf(stderr, "Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], - offset[1], offset[2], size[0], size[1], size[2]); + LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1], + offset[2], size[0], size[1], size[2]); if (rank == 0) opensees_data = (double *)malloc(sizeof(double) * dims[0] * opensees_size * opensees_size); @@ -234,7 +233,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: rank 0 read OpenSees 200x200m data took %.6lf\n", r, t1 - t0); + LOG_ERROR("Round %d: rank 0 read OpenSees 200x200m data took %.6lf\n", r, t1 - t0); } // End for round @@ -277,7 +276,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: all ranks read ssi_downsample data took %.6lf\n", r, t1 - t0); + LOG_ERROR("Round %d: all ranks read ssi_downsample data took %.6lf\n", r, t1 - t0); } // End for round @@ -320,7 +319,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: all ranks read rec_downsample data took %.6lf\n", r, t1 - t0); + LOG_ERROR("Round %d: all ranks read rec_downsample data took %.6lf\n", r, t1 - t0); } // End for round @@ -361,7 +360,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: rank 0 read 1 time-history took %.6lf\n", r, t1 - t0); + LOG_ERROR("Round %d: rank 0 read 1 time-history took %.6lf\n", r, t1 - t0); } // End for round diff --git a/src/tools/meta_json/metadata_json_importer.c b/src/tools/meta_json/metadata_json_importer.c index aeb1df400..177e885c8 100644 --- a/src/tools/meta_json/metadata_json_importer.c +++ b/src/tools/meta_json/metadata_json_importer.c @@ -48,12 +48,12 @@ import_json_header(cJSON *dataset_name, cJSON *dataset_description, cJSON *sourc // create a container property pdc_args->cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_args->pdc); if (pdc_args->cont_prop <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); // create a container pdc_args->cont = PDCcont_create(cJSON_GetStringValue(dataset_name), pdc_args->cont_prop); if (pdc_args->cont <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container"); // extract the strings from the JSON attributes char *ds_desc = cJSON_GetStringValue(dataset_description); @@ -67,7 +67,7 @@ import_json_header(cJSON *dataset_name, cJSON *dataset_description, cJSON *sourc // create an object property pdc_args->obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc_args->pdc); if (pdc_args->obj_prop <= 0) { - printf("Fail to create object property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object property"); return -1; } @@ -88,7 +88,7 @@ import_object_base(cJSON *name, cJSON *type, cJSON *full_path, MD_JSON_ARGS *md_ pdc_importer_args_t *pdc_args = (pdc_importer_args_t *)md_json_args->processor_args; if (cJSON_GetStringValue(name) == NULL) { - printf("Object name is NULL!\n"); + LOG_ERROR("Object name is NULL!\n"); return -1; } char datetime_buff[15]; @@ -101,18 +101,18 @@ import_object_base(cJSON *name, cJSON *type, cJSON *full_path, MD_JSON_ARGS *md_ sprintf(object_name, "%s_%d%s", cJSON_GetStringValue(name), md_json_args->mpi_rank, datetime_buff); pdc_args->obj_id = PDCobj_create(pdc_args->cont, object_name, pdc_args->obj_prop); if (pdc_args->obj_id <= 0) { - printf("Fail to create object!\n"); + LOG_ERROR("Fail to create object!\n"); return -1; } if (PDCobj_put_tag(pdc_args->obj_id, "obj_full_path", (void *)cJSON_GetStringValue(full_path), PDC_STRING, strlen(cJSON_GetStringValue(full_path)) + 1) != SUCCEED) { - printf("Fail to put tag!\n"); + LOG_ERROR("Fail to put tag!\n"); return -1; } if (PDCobj_put_tag(pdc_args->obj_id, "obj_type", (void *)cJSON_GetStringValue(type), PDC_STRING, strlen(cJSON_GetStringValue(type)) + 1) != SUCCEED) { - printf("Fail to put tag!\n"); + LOG_ERROR("Fail to put tag!\n"); return -1; } @@ -164,13 +164,13 @@ import_object_property(cJSON *name, cJSON *type, cJSON *cls, cJSON *value, MD_JS } } else { - printf("attr %s is of unknown type %s \n", cJSON_GetStringValue(name), cJSON_GetStringValue(type)); + LOG_ERROR("attr %s is of unknown type %s \n", cJSON_GetStringValue(name), cJSON_GetStringValue(type)); goto end; } if (PDCobj_put_tag(pdc_args->obj_id, name->valuestring, (void *)&property_value, pdc_type, property_value_size) != SUCCEED) { - printf("Fail to add tag!\n"); + LOG_ERROR("Fail to add tag!\n"); } end: @@ -189,18 +189,18 @@ finish_import_one_json(MD_JSON_ARGS *md_json_args) // finalize PDC related things // close a container if (PDCcont_close(pdc_args->cont) < 0) { - printf("fail to close container c1\n"); + LOG_ERROR("fail to close container c1\n"); return -1; } // close a container property if (PDCprop_close(pdc_args->obj_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); return -1; } if (PDCprop_close(pdc_args->cont_prop) < 0) { - printf("Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); return -1; } @@ -219,7 +219,7 @@ finalize_importer(MD_JSON_ARGS *md_json_args) // finalize PDC related things // close pdc if (PDCclose(pdc_args->pdc) < 0) { - printf("fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); return -1; } diff --git a/src/tools/meta_json/metadata_json_printer.c b/src/tools/meta_json/metadata_json_printer.c index bb666d2ee..1ccacd318 100644 --- a/src/tools/meta_json/metadata_json_printer.c +++ b/src/tools/meta_json/metadata_json_printer.c @@ -10,34 +10,34 @@ int print_json_header(cJSON *dataset_name, cJSON *dataset_description, cJSON *source_URL, cJSON *collector, MD_JSON_ARGS *md_json_args) { - printf("Dataset Name: %s\n", dataset_name->valuestring); - printf("Dataset Description: %s\n", dataset_description->valuestring); - printf("Source URL: %s\n", source_URL->valuestring); - printf("Collector: %s\n\n", collector->valuestring); + LOG_JUST_PRINT("Dataset Name: %s\n", dataset_name->valuestring); + LOG_JUST_PRINT("Dataset Description: %s\n", dataset_description->valuestring); + LOG_JUST_PRINT("Source URL: %s\n", source_URL->valuestring); + LOG_JUST_PRINT("Collector: %s\n\n", collector->valuestring); return 0; } int print_object_base(cJSON *name, cJSON *type, cJSON *full_path, MD_JSON_ARGS *md_json_args) { - printf(" Object Name: %s\n", name->valuestring); - printf(" Object Type: %s\n", type->valuestring); - printf(" Object Full Path: %s\n\n", full_path->valuestring); + LOG_JUST_PRINT(" Object Name: %s\n", name->valuestring); + LOG_JUST_PRINT(" Object Type: %s\n", type->valuestring); + LOG_JUST_PRINT(" Object Full Path: %s\n\n", full_path->valuestring); return 0; } int print_object_property(cJSON *name, cJSON *type, cJSON *cls, cJSON *value, MD_JSON_ARGS *md_json_args) { - printf(" Property Name: %s\n", name->valuestring); + LOG_JUST_PRINT(" Property Name: %s\n", name->valuestring); if (cJSON_IsString(value)) { - printf(" Property Value: %s\n", value->valuestring); + LOG_JUST_PRINT(" Property Value: %s\n", value->valuestring); } else if (cJSON_IsNumber(value)) { - printf(" Property Value: %f\n", value->valuedouble); + LOG_JUST_PRINT(" Property Value: %f\n", value->valuedouble); } - printf(" Property Class: %s\n", cls->valuestring); - printf(" Property Type: %s\n\n", type->valuestring); + LOG_JUST_PRINT(" Property Class: %s\n", cls->valuestring); + LOG_JUST_PRINT(" Property Type: %s\n\n", type->valuestring); return 0; } diff --git a/src/tools/metadata_json_loader.c b/src/tools/metadata_json_loader.c index 01f3feeee..77ba9859f 100644 --- a/src/tools/metadata_json_loader.c +++ b/src/tools/metadata_json_loader.c @@ -58,7 +58,7 @@ read_json_file(const char *filename, void *args) fp = fopen(filename, "r"); if (fp == NULL) { - fprintf(stderr, "Error: cannot open file %s\n", filename); + LOG_ERROR("Error: cannot open file %s\n", filename); exit(1); } @@ -66,21 +66,16 @@ read_json_file(const char *filename, void *args) json_file_size = ftell(fp); rewind(fp); - // if (json_file_size > MAX_JSON_FILE_SIZE) { - // fprintf(stderr, "Error: file %s is too large\n", filename); - // exit(1); - // } - json_str = (char *)malloc(json_file_size + 1); if (json_str == NULL) { - fprintf(stderr, "Error: cannot allocate memory for json_str\n"); + LOG_ERROR("Error: cannot allocate memory for json_str\n"); exit(1); } size_t bytesRead = fread(json_str, 1, json_file_size, fp); if (bytesRead < json_file_size) { if (!feof(fp)) { - fprintf(stderr, "Error: cannot read file %s\n", filename); + LOG_ERROR("Error: cannot read file %s\n", filename); fclose(fp); exit(1); } @@ -122,7 +117,7 @@ parseJSON(const char *jsonString, void *args) if (json == NULL) { const char *error_ptr = cJSON_GetErrorPtr(); if (error_ptr != NULL) { - fprintf(stderr, "Error before: %s\n", error_ptr); + LOG_ERROR("Error before: %s\n", error_ptr); } goto end; } @@ -273,7 +268,7 @@ main(int argc, char **argv) } if (argc != 3) { - fprintf(stderr, "Usage: %s \n", argv[0]); + LOG_ERROR("Usage: %s \n", argv[0]); return EXIT_FAILURE; } diff --git a/src/tools/pdc_access_eqsim.c b/src/tools/pdc_access_eqsim.c index aa97eda75..af01dd47b 100644 --- a/src/tools/pdc_access_eqsim.c +++ b/src/tools/pdc_access_eqsim.c @@ -49,36 +49,10 @@ main(int argc, char **argv) obj = PDCobj_open_col("run1", pdc); if (obj <= 0) - fprintf(stderr, "Fail to open object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to open object"); /* //=============PATTERN 1=============== */ /* // Read everything */ - /* transfer_req = PDCregion_transfer_create(data, PDC_READ, obj, local_reg, remote_reg); */ - /* PDCregion_transfer_start(transfer_req); */ - /* PDCregion_transfer_wait(transfer_req); */ - /* PDCregion_transfer_close(transfer_req); */ - - /* #ifdef ENABLE_MPI */ - /* MPI_Barrier(MPI_COMM_WORLD); */ - /* t1 = MPI_Wtime(); */ - /* if (rank == 0) */ - /* fprintf(stderr, "Read whole chunk data from server took %.6lf\n", t1 - t0); */ - /* #endif */ - - /* data_max = -1; */ - /* data_min = 1; */ - /* for (i = 0; i < pdc_local_size[0]*pdc_local_size[1]*pdc_local_size[2]; i++) { */ - /* if (data[i] > data_max) */ - /* data_max = data[i]; */ - /* else if (data[i] < data_min) */ - /* data_min = data[i]; */ - /* } */ - /* fprintf(stderr, "Rank %d, chunk min/max: %lf, %lf\n", rank, data_min, data_max); */ - - /* PDCregion_close(remote_reg); */ - /* PDCregion_close(local_reg); */ - - /* free(data); */ //=============PATTERN 2=============== // OpenSees access pattern: 1 rank read subregion 200x200m (32 grids) @@ -100,8 +74,8 @@ main(int argc, char **argv) remote_reg = PDCregion_create(3, pdc_offset, pdc_size); if (nproc <= 16) - fprintf(stderr, "Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, pdc_offset[0], - pdc_offset[1], pdc_offset[2], pdc_size[0], pdc_size[1], pdc_size[2]); + LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, pdc_offset[0], + pdc_offset[1], pdc_offset[2], pdc_size[0], pdc_size[1], pdc_size[2]); // Tag retrieval sprintf(tag_name, "%llu-%llu\n", pdc_offset[1], pdc_offset[2]); @@ -117,11 +91,11 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: tag retrival query took %.6lf\n", r, t1 - t0); + LOG_ERROR("Round %d: tag retrival query took %.6lf\n", r, t1 - t0); #endif if (value_size != 4 * sizeof(double)) - fprintf(stderr, "Error: Round %d: tag retrival result size %llu / %llu \n", r, value_size, - 4 * sizeof(double)); + LOG_ERROR("Error: Round %d: tag retrival result size %llu / %llu \n", r, value_size, + 4 * sizeof(double)); if (tag_value) free(tag_value); } @@ -145,8 +119,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: rank 0 read OpenSees 200x200m data from server took %.6lf\n", r, - t1 - t0); + LOG_ERROR("Round %d: rank 0 read OpenSees 200x200m data from server took %.6lf\n", r, t1 - t0); #endif if (rank == 0) @@ -205,8 +178,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: all ranks read ssi_downsample data from server took %.6lf\n", r, - t1 - t0); + LOG_ERROR("Round %d: all ranks read ssi_downsample data from server took %.6lf\n", r, t1 - t0); #endif for (i = 0; i < batchsize; i++) @@ -263,8 +235,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: all ranks read rec_downsample data from server took %.6lf\n", r, - t1 - t0); + LOG_ERROR("Round %d: all ranks read rec_downsample data from server took %.6lf\n", r, t1 - t0); #endif for (i = 0; i < batchsize; i++) @@ -307,22 +278,8 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Round %d: rank 0 read single time series from server took %.6lf\n", r, t1 - t0); + LOG_ERROR("Round %d: rank 0 read single time series from server took %.6lf\n", r, t1 - t0); #endif - - /* if (rank == 0) { */ - /* data_max = -1; */ - /* data_min = 1; */ - /* for (i = 0; i < pdc_local_size[0]; i++) { */ - /* if (rec_data[i] > data_max) */ - /* data_max = rec_data[i]; */ - /* else if (rec_data[i] < data_min) */ - /* data_min = rec_data[i]; */ - /* } */ - /* fprintf(stderr, "Round %d: rank %d single series min/max: %lf, %lf\n", r, rank, data_min, - * data_max); */ - /* } */ - } // End for round PDCregion_close(remote_reg); @@ -331,10 +288,10 @@ main(int argc, char **argv) free(rec_data); if (PDCobj_close(obj) < 0) - fprintf(stderr, "fail to close object\n"); + LOG_ERROR("fail to close object\n"); if (PDCclose(pdc) < 0) - fprintf(stderr, "fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tools/pdc_export.c b/src/tools/pdc_export.c index 3614fa9fb..fa70b8b7f 100644 --- a/src/tools/pdc_export.c +++ b/src/tools/pdc_export.c @@ -157,7 +157,7 @@ main(int argc, char *argv[]) pdc_id_g = PDCinit("pdc"); if (argc == 1) { - printf("Expected directory/checkpoint file.\n"); + LOG_ERROR("Expected directory/checkpoint file.\n"); return 1; } else { @@ -216,7 +216,7 @@ main(int argc, char *argv[]) } } if (head == NULL) { - printf("Unable to open/locate checkpoint file(s).\n"); + LOG_ERRO("Unable to open/locate checkpoint file(s).\n"); return 1; } else { @@ -347,13 +347,13 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) int arg_index = 2; while (arg_index < argc) { if (is_arg(argv[arg_index]) == 0) { - printf("Improperly formatted argument(s).\n"); + LOG_ERROR("Improperly formatted argument(s).\n"); return; } if (strcmp(argv[arg_index], "-f") == 0) { arg_index++; if (strcmp(argv[arg_index], "hdf5") != 0) { - printf("The specified file format is not supported.\n"); + LOG_ERROR("The specified file format is not supported.\n"); return; } } @@ -376,7 +376,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) while (cur_file_node != NULL) { filename = cur_file_node->file_name; stat(filename, &attr); - printf("[INFO] File [%s] last modified at: %s\n", filename, ctime(&attr.st_mtime)); + LOG_INFO("[INFO] File [%s] last modified at: %s\n", filename, ctime(&attr.st_mtime)); // Start server restart code perr_t ret_value = SUCCEED; int n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs, total_region = 0, @@ -391,42 +391,41 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) FILE *file = fopen(filename, "r"); if (file == NULL) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file open FAILED [%s]!", pdc_server_rank_g, __func__, - filename); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file open FAILED [%s]!", pdc_server_rank_g, filename); ret_value = FAIL; continue; } if (fread(&n_cont, sizeof(int), 1, file) != 1) { - printf("Read failed for n_count\n"); + LOG_ERROR("Read failed for n_count\n"); } all_cont = n_cont; while (n_cont > 0) { hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for hash_key\n"); + LOG_ERROR("Read failed for hash_key\n"); } // Reconstruct hash table cont_entry = (pdc_cont_hash_table_entry_t *)malloc(sizeof(pdc_cont_hash_table_entry_t)); if (fread(cont_entry, sizeof(pdc_cont_hash_table_entry_t), 1, file) != 1) { - printf("Read failed for cont_entry\n"); + LOG_ERROR("Read failed for cont_entry\n"); } n_cont--; } // End while if (fread(&n_entry, sizeof(int), 1, file) != 1) { - printf("Read failed for n_entry\n"); + LOG_ERROR("Read failed for n_entry\n"); } while (n_entry > 0) { if (fread(&count, sizeof(int), 1, file) != 1) { - printf("Read failed for count\n"); + LOG_ERROR("Read failed for count\n"); } hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for hash_key\n"); + LOG_ERROR("Read failed for hash_key\n"); } // Reconstruct hash table @@ -435,11 +434,10 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) entry->bloom = NULL; entry->metadata = NULL; - /* fprintf(stderr, "size of metadata: %lu\n", sizeof(pdc_metadata_t)); */ metadata = (pdc_metadata_t *)calloc(sizeof(pdc_metadata_t), count); for (i = 0; i < count; i++) { if (fread(metadata + i, sizeof(pdc_metadata_t), 1, file) != 1) { - printf("Read failed for metadata\n"); + LOG_ERROR("Read failed for metadata\n"); } MetadataNode *new_node = (MetadataNode *)malloc(sizeof(MetadataNode)); new_node->metadata_ptr = (metadata + i); @@ -477,33 +475,32 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) // Read kv tags if (fread(&n_kvtag, sizeof(int), 1, file) != 1) { - printf("Read failed for n_kvtag\n"); + LOG_ERROR("Read failed for n_kvtag\n"); } for (j = 0; j < n_kvtag; j++) { pdc_kvtag_list_t *kvtag_list = (pdc_kvtag_list_t *)calloc(1, sizeof(pdc_kvtag_list_t)); kvtag_list->kvtag = (pdc_kvtag_t *)malloc(sizeof(pdc_kvtag_t)); if (fread(&key_len, sizeof(int), 1, file) != 1) { - printf("Read failed for key_len\n"); + LOG_ERROR("Read failed for key_len\n"); } kvtag_list->kvtag->name = malloc(key_len); if (fread((void *)(kvtag_list->kvtag->name), key_len, 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->name\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->name\n"); } if (fread(&kvtag_list->kvtag->size, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->size\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->size\n"); } kvtag_list->kvtag->value = malloc(kvtag_list->kvtag->size); if (fread(kvtag_list->kvtag->value, kvtag_list->kvtag->size, 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->value\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->value\n"); } } if (fread(&n_region, sizeof(int), 1, file) != 1) { - printf("Read failed for n_region\n"); + LOG_ERROR("Read failed for n_region\n"); } if (n_region < 0) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file region number ERROR!", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file region number ERROR!", pdc_server_rank_g); ret_value = FAIL; continue; } @@ -513,24 +510,24 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) for (j = 0; j < n_region; j++) { region_list = (region_list_t *)malloc(sizeof(region_list_t)); if (fread(region_list, sizeof(region_list_t), 1, file) != 1) { - printf("Read failed for region_list\n"); + LOG_ERROR("Read failed for region_list\n"); } int has_hist = 0; if (fread(&has_hist, sizeof(int), 1, file) != 1) { - printf("Read failed for has_list\n"); + LOG_ERROR("Read failed for has_list\n"); } if (has_hist == 1) { region_list->region_hist = (pdc_histogram_t *)malloc(sizeof(pdc_histogram_t)); if (fread(®ion_list->region_hist->dtype, sizeof(int), 1, file) != 1) { - printf("Read failed for region_list->region_hist->dtype\n"); + LOG_ERROR("Read failed for region_list->region_hist->dtype\n"); } if (fread(®ion_list->region_hist->nbin, sizeof(int), 1, file) != 1) { - printf("Read failed for region_list->region_hist->nbin\n"); + LOG_ERROR("Read failed for region_list->region_hist->nbin\n"); } if (region_list->region_hist->nbin == 0) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file histogram size is 0!", - pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file histogram size is 0!", + pdc_server_rank_g); } region_list->region_hist->range = @@ -540,14 +537,14 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) if (fread(region_list->region_hist->range, sizeof(double), region_list->region_hist->nbin * 2, file) != 1) { - printf("Read failed for region_list->region_hist->range\n"); + LOG_ERROR("Read failed for region_list->region_hist->range\n"); } if (fread(region_list->region_hist->bin, sizeof(uint64_t), region_list->region_hist->nbin, file) != 1) { - printf("Read failed for region_list->region_hist->bin\n"); + LOG_ERROR("Read failed for region_list->region_hist->bin\n"); } if (fread(®ion_list->region_hist->incr, sizeof(double), 1, file) != 1) { - printf("Read failed for region_list->region_hist->incr\n"); + LOG_ERROR("Read failed for region_list->region_hist->incr\n"); } } @@ -562,7 +559,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) } if (fread(&n_objs, sizeof(int), 1, file) != 1) { - printf("Read failed for n_objs\n"); + LOG_ERROR("Read failed for n_objs\n"); } for (i = 0; i < n_objs; ++i) { @@ -571,10 +568,10 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) new_obj_reg->fd = -1; new_obj_reg->storage_location = (char *)malloc(sizeof(char) * ADDR_MAX); if (fread(&new_obj_reg->obj_id, sizeof(uint64_t), 1, file) != 1) { - printf("Read failed for obj_id\n"); + LOG_ERROR("Read failed for obj_id\n"); } if (fread(&n_region, sizeof(int), 1, file) != 1) { - printf("Read failed for n_region\n"); + LOG_ERROR("Read failed for n_region\n"); } MetadataNode *wanted_node = metadata_head; while (wanted_node != NULL) { @@ -587,7 +584,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) for (j = 0; j < n_region; j++) { region_list_t *new_region_list = (region_list_t *)malloc(sizeof(region_list_t)); if (fread(new_region_list, sizeof(region_list_t), 1, file) != 1) { - printf("Read failed for new_region_list\n"); + LOG_ERROR("Read failed for new_region_list\n"); } RegionNode *new_node = (RegionNode *)malloc(sizeof(RegionNode)); new_node->region_list = new_region_list; @@ -607,13 +604,13 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) char * checkpoint_buf; if (fread(&checkpoint_size, sizeof(uint64_t), 1, file) != 1) { - printf("Read failed for checkpoint size\n"); + LOG_ERROR("Read failed for checkpoint size\n"); } checkpoint_buf = (char *)malloc(checkpoint_size); if (fread(checkpoint_buf, checkpoint_size, 1, file) != 1) { - printf("Read failed for checkpoint buf\n"); + LOG_ERROR("Read failed for checkpoint buf\n"); } pdc_obj_metadata_pkg *metadata_server_objs = @@ -701,7 +698,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) token = strtok(temp, delim); hid_t cur_group_id = group_id; while (token != NULL) { - printf("%s\n", token); + LOG_INFO("%s\n", token); strcat(cur_path, "/"); strcat(cur_path, token); cur_group_id = H5Gopen(file_id, cur_path, H5P_DEFAULT); @@ -716,7 +713,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) strcat(full_path, cur_metadata->obj_name); dset_id = H5Dcreate(file_id, full_path, data_type, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (dset_id < 0) { - printf("create dset failed\n"); + LOG_ERROR("create dset failed\n"); } } int buf_size = 1; diff --git a/src/tools/pdc_import.c b/src/tools/pdc_import.c index 63827d950..d8c798ee2 100644 --- a/src/tools/pdc_import.c +++ b/src/tools/pdc_import.c @@ -71,7 +71,7 @@ void do_plist(hid_t); void print_usage() { - printf("Usage: srun -n 2443 ./h5boss_v2_import h5boss_filenames\n"); + LOG_INFO("Usage: srun -n 2443 ./h5boss_v2_import h5boss_filenames\n"); } int rank = 0, size = 1; @@ -118,7 +118,7 @@ main(int argc, char **argv) cont_prop_g = PDCprop_create(PDC_CONT_CREATE, pdc_id_g); if (cont_prop_g <= 0) - printf("Fail to create container property @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create container property"); obj_prop_g = PDCprop_create(PDC_OBJ_CREATE, pdc_id_g); @@ -141,13 +141,12 @@ main(int argc, char **argv) FILE *filenames_fp = fopen(argv[1], "r"); if (filenames_fp == NULL) { - printf("Input file open error [%s]\n", argv[1]); + LOG_ERROR("Input file open error [%s]\n", argv[1]); total_count = 0; } else { i = 0; while (fgets(all_filenames[i], MAX_FILENAME_LEN, filenames_fp)) { - /* printf("%s\n", all_filenames[i]); */ // Remove the trailing '\n' int len = strlen(all_filenames[i]); all_filenames[i][len - 1] = 0; @@ -156,7 +155,7 @@ main(int argc, char **argv) total_count = i; fclose(filenames_fp); - printf("Running with %d clients, %d files\n", size, total_count); + LOG_INFO("Running with %d clients, %d files\n", size, total_count); fflush(stdout); } } @@ -165,7 +164,7 @@ main(int argc, char **argv) while (cur_arg_idx < argc) { if (strcmp(argv[cur_arg_idx], "-a") == 0) { if (argc == cur_arg_idx + 1) { - printf("No app name given, defaulting to PDC_IMPORT"); + LOG_WARNING("No app name given, defaulting to PDC_IMPORT"); cur_arg_idx += 1; } else { @@ -185,7 +184,7 @@ main(int argc, char **argv) #endif if (total_count < size) { - printf("More MPI ranks than total number of files, exiting...\n"); + LOG_WARNING("More MPI ranks than total number of files, exiting...\n"); goto done; } @@ -210,9 +209,9 @@ main(int argc, char **argv) #endif - printf("Importer%2d: I will import %d files\n", rank, my_count); + LOG_INFO("Importer%2d: Importing %d files\n", rank, my_count); for (i = 0; i < my_count; i++) - printf("Importer%2d: [%s] \n", rank, my_filenames[i]); + LOG_INFO("Importer%2d: [%s] \n", rank, my_filenames[i]); fflush(stdout); #ifdef ENABLE_MPI @@ -224,12 +223,11 @@ main(int argc, char **argv) for (i = 0; i < my_count; i++) { filename = my_filenames[i]; - printf("Importer%2d: processing [%s]\n", rank, my_filenames[i]); + LOG_INFO("Importer%2d: processing [%s]\n", rank, my_filenames[i]); fflush(stdout); file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT); if (file < 0) { - /* status = H5Fclose(file); */ - printf("Failed to open file [%s]\n", filename); + LOG_ERROR("Failed to open file [%s]\n", filename); fflush(stdout); continue; } @@ -245,13 +243,7 @@ main(int argc, char **argv) // Checkpoint all metadata after import each hdf5 file if (rank == 0) { // FIXME: this should be replaced by a function in public headers. - // PDC_Client_all_server_checkpoint(); } - /* printf("%s, %d\n", filename, max_tag_size_g); */ - /* printf("\n\n======================\nNumber of datasets: %d\n", ndset_g); */ - /* #ifdef ENABLE_MPI */ - /* MPI_Barrier(MPI_COMM_WORLD); */ - /* #endif */ } #ifdef ENABLE_MPI @@ -269,8 +261,8 @@ main(int argc, char **argv) total_dset = ndset_g; #endif if (rank == 0) { - printf("Import %d datasets with %d ranks took %.2f seconds.\n", total_dset, size, - write_time / 1e9); + LOG_INFO("Import %d datasets with %d ranks took %.2f seconds.\n", total_dset, size, + write_time / 1e9); } } @@ -311,8 +303,6 @@ scan_group(hid_t gid, int level, char *app_name) */ len = H5Iget_name(gid, group_name, MAX_NAME); - /* printf("Group Name: %s\n",group_name); */ - /* * process the attributes of the group, if any. */ @@ -327,10 +317,7 @@ scan_group(hid_t gid, int level, char *app_name) * For each object in the group, get the name and * what type of object it is. */ - /* printf(" Member: #%d ",i);fflush(stdout); */ - len = H5Gget_objname_by_idx(gid, (hsize_t)i, memb_name, (size_t)MAX_NAME); - /* printf(" len=%d ",len);fflush(stdout); */ - /* printf(" Member: \"%s\" ",memb_name);fflush(stdout); */ + len = H5Gget_objname_by_idx(gid, (hsize_t)i, memb_name, (size_t)MAX_NAME); otype = H5Gget_objtype_by_idx(gid, (size_t)i); /* @@ -338,17 +325,14 @@ scan_group(hid_t gid, int level, char *app_name) */ switch (otype) { case H5G_LINK: - /* printf(" SYM_LINK:\n"); */ // do_link(gid,memb_name); break; case H5G_GROUP: - /* printf(" GROUP:\n"); */ grpid = H5Gopen(gid, memb_name, H5P_DEFAULT); scan_group(grpid, level + 1, app_name); H5Gclose(grpid); break; case H5G_DATASET: - /* printf(" DATASET:\n"); */ // create container - check if container exists first // create a container create_cont = 1; @@ -361,8 +345,8 @@ scan_group(hid_t gid, int level, char *app_name) if (create_cont) { cont_id_g = PDCcont_create(group_name, cont_prop_g); if (cont_id_g <= 0) - printf("Fail to create container @ line %d!\n", __LINE__); - printf("Importer%2d: Created container [%s]\n", rank, group_name); + LOG_ERROR("Fail to create container"); + LOG_INFO("Importer%2d: Created container [%s]\n", rank, group_name); add(container_names, group_name); } dsid = H5Dopen(gid, memb_name, H5P_DEFAULT); @@ -370,13 +354,12 @@ scan_group(hid_t gid, int level, char *app_name) H5Dclose(dsid); break; case H5G_TYPE: - /* printf(" DATA TYPE:\n"); */ typeid = H5Topen(gid, memb_name, H5P_DEFAULT); do_dtype(typeid, gid, 0); H5Tclose(typeid); break; default: - printf(" Unknown Object Type!\n"); + LOG_ERROR(" Unknown Object Type!\n"); break; } } @@ -425,9 +408,6 @@ do_dset(hid_t did, char *name, char *app_name) break; } } - /* printf("[%s] {\n", obj_name); */ - - /* fprintf(summary_fp_g, "%s, ", ds_name); */ /* * Get dataset information: dataspace, data type @@ -462,28 +442,12 @@ do_dset(hid_t did, char *name, char *app_name) obj_id = PDCobj_create(cont_id_g, ds_name, obj_prop_g); } if (obj_id <= 0) { - printf("Error getting an object %s from server, exit...\n", dset_name_g); + LOG_ERROR("Error getting an object %s from server, exit...\n", dset_name_g); } do_dtype(tid, did, 0); ndset_g++; - /* if (ndset_g > 10) { */ - /* return; */ - /* } */ - /* - * process the attributes of the dataset, if any. - */ - // scan_attrs(did); - - /* - * Retrieve and analyse the dataset properties - */ - /* pid = H5Dget_create_plist(did); /1* get creation property list *1/ */ - /* do_plist(pid); */ - /* size = H5Dget_storage_size(did); */ - /* printf("Total space currently written in file: %d\n",(int)size); */ - /* * The datatype and dataspace can be used to read all or * part of the data. (Not shown in this example.) @@ -524,12 +488,6 @@ do_dset(hid_t did, char *name, char *app_name) if (ndset_g == 1) clock_gettime(CLOCK_MONOTONIC, &write_timer_start_g); - /* PDC_Client_query_metadata_name_timestep(dset_name_g, 0, &meta); */ - /* if (meta == NULL) */ - /* printf("Error with obtainig metadata, skipping PDC write\n"); */ - /* else */ - /* PDC_Client_write(meta, &obj_region, buf); */ - pdcid_t local_region = PDCregion_create(ndim, region_offset, region_size); pdcid_t remote_region = PDCregion_create(ndim, region_offset, region_size); pdcid_t transfer_request = PDCregion_transfer_create(buf, PDC_WRITE, obj_id, local_region, remote_region); @@ -542,17 +500,13 @@ do_dset(hid_t did, char *name, char *app_name) double elapsed_time = (write_timer_end_g.tv_sec - write_timer_start_g.tv_sec) * 1e9 + (write_timer_end_g.tv_nsec - write_timer_start_g.tv_nsec); // calculate duration in nanoseconds; - printf("Importer%2d: Finished written 100 objects, took %.2f, my total %d\n", rank, - elapsed_time / 1e9, ndset_g); + LOG_INFO("Importer%2d: Finished written 100 objects, took %.2f, my total %d\n", rank, + elapsed_time / 1e9, ndset_g); fflush(stdout); clock_gettime(CLOCK_MONOTONIC, &write_timer_start_g); } free(buf); - /* printf("} [%s] tag_size %d \n========================\n%s\n========================\n\n\n", */ - /* obj_name, tag_size_g, tags_g); */ - /* printf("size %d\n%s\n\n", tag_size_g, tags_g); */ - /* fprintf(summary_fp_g, "%d\n", tag_size_g); */ if (tag_size_g > max_tag_size_g) { max_tag_size_g = tag_size_g; } @@ -581,7 +535,6 @@ do_dtype(hid_t tid, hid_t oid, int is_compound) } else { attr_size = H5Tget_size(tid); - /* printf(" Datasize %3d, type", attr_size); */ /* * Each class has specific properties that can be * retrieved, e.g., attr_size, byte order, exponent, etc. @@ -602,7 +555,7 @@ do_dtype(hid_t tid, hid_t oid, int is_compound) } else if (t_class == H5T_COMPOUND) { // For compound type, the size would be calculated by its sub-types - printf("PDC does not support compound data type yet.\n"); + LOG_ERROR("PDC does not support compound data type yet.\n"); return PDC_UNKNOWN; } else if (t_class == H5T_ARRAY) { @@ -611,19 +564,15 @@ do_dtype(hid_t tid, hid_t oid, int is_compound) } ndim = H5Tget_array_ndims(tid); H5Tget_array_dims2(tid, dims); - /* printf(" 'H5T_ARRAY', ndim=%d: ", ndim); */ - - /* printf("\n "); */ pdc_var_type_t type = do_dtype(H5Tget_super(tid), oid, 1); return type; /* display dimensions, base type */ } else if (t_class == H5T_ENUM) { - /* puts(" 'H5T_ENUM'."); */ return PDC_INT; } else { - printf("PDC does not support this data type yet.\n"); + LOG_ERROR("PDC does not support this data type yet.\n"); return PDC_UNKNOWN; } } @@ -643,7 +592,6 @@ do_link(hid_t gid, char *name) char target[MAX_NAME]; status = H5Gget_linkval(gid, name, MAX_NAME, target); - /* printf("Symlink: %s points to: %s\n", name, target); */ } /* @@ -688,7 +636,6 @@ do_attr(hid_t aid, pdcid_t obj_id) * Get the name of the attribute. */ len = H5Aget_name(aid, MAX_NAME, buf); - /* printf(" Attribute Name : %s\n",buf); */ // Skip the COMMENT attribute if (strcmp("COMMENT", buf) == 0 || strcmp("comments", buf) == 0) @@ -758,12 +705,6 @@ do_plist(hid_t pid) * * For other layouts, would get the relevant information. */ - /* if(H5D_CHUNKED == H5Pget_layout(pid)){ */ - /* rank_chunk = H5Pget_chunk(pid, 2, chunk_dims_out); */ - /* printf("chunk rank %d, dimensions %lu x %lu\n", rank_chunk, */ - /* (unsigned long)(chunk_dims_out[0]), */ - /* (unsigned long)(chunk_dims_out[1])); */ - /* } /1* else if contiguous, etc. *1/ */ /* * Get optional filters, if any. @@ -785,26 +726,18 @@ do_plist(hid_t pid) */ switch (filtn) { case H5Z_FILTER_DEFLATE: /* AKA GZIP compression */ - /* printf("DEFLATE level = %d\n", cd_values[0]); */ break; case H5Z_FILTER_SHUFFLE: - /* printf("SHUFFLE\n"); /1* no parms *1/ */ break; case H5Z_FILTER_FLETCHER32: - /* printf("FLETCHER32\n"); /1* Error Detection Code *1/ */ break; case H5Z_FILTER_SZIP: - szip_options_mask = cd_values[0]; - ; + szip_options_mask = cd_values[0]; szip_pixels_per_block = cd_values[1]; - /* printf("SZIP COMPRESSION: "); */ - /* printf("PIXELS_PER_BLOCK %d\n", */ - /* szip_pixels_per_block); */ /* print SZIP options mask, etc. */ break; default: - /* printf("UNKNOWN_FILTER\n" ); */ break; } } @@ -816,52 +749,31 @@ do_plist(hid_t pid) * - value to fill, if any */ - /* printf("ALLOC_TIME "); */ H5Pget_alloc_time(pid, &at); switch (at) { case H5D_ALLOC_TIME_EARLY: - /* printf("EARLY\n"); */ break; case H5D_ALLOC_TIME_INCR: - /* printf("INCR\n"); */ break; case H5D_ALLOC_TIME_LATE: - /* printf("LATE\n"); */ break; default: - /* printf("unknown allocation policy"); */ break; } - /* printf("FILL_TIME: "); */ H5Pget_fill_time(pid, &ft); switch (ft) { case H5D_FILL_TIME_ALLOC: - /* printf("ALLOC\n"); */ break; case H5D_FILL_TIME_NEVER: - /* printf("NEVER\n"); */ break; case H5D_FILL_TIME_IFSET: - /* printf("IFSET\n"); */ break; default: - printf("?\n"); + LOG_INFO("?\n"); break; } H5Pfill_value_defined(pid, &fvstatus); - - if (fvstatus == H5D_FILL_VALUE_UNDEFINED) { - /* printf("No fill value defined, will use default\n"); */ - } - else { - /* Read the fill value with H5Pget_fill_value. - * Fill value is the same data type as the dataset. - * (details not shown) - **/ - } - - /* ... and so on for other dataset properties ... */ } diff --git a/src/tools/pdc_import_eqsim.c b/src/tools/pdc_import_eqsim.c index 2854e4302..2bf7b72a9 100644 --- a/src/tools/pdc_import_eqsim.c +++ b/src/tools/pdc_import_eqsim.c @@ -46,7 +46,7 @@ main(int argc, char **argv) file = H5Fopen(fname, H5F_ACC_RDONLY, fapl); if (file < 0) - fprintf(stderr, "Failed to open file [%s]\n", fname); + LOG_ERROR("Failed to open file [%s]\n", fname); dset = H5Dopen(file, dname, H5P_DEFAULT); dspace = H5Dget_space(dset); @@ -91,8 +91,8 @@ main(int argc, char **argv) data = (double *)malloc(sizeof(double) * local_size[0] * local_size[1] * local_size[2]); if (nproc <= 16) - fprintf(stderr, "Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], - offset[1], offset[2], size[0], size[1], size[2]); + LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1], + offset[2], size[0], size[1], size[2]); #ifdef ENABLE_MPI t0 = MPI_Wtime(); @@ -104,7 +104,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Read from HDF5 took %.4lf\n", t1 - t0); + LOG_ERROR("Read from HDF5 took %.4lf\n", t1 - t0); #endif H5Sclose(mspace); @@ -126,7 +126,7 @@ main(int argc, char **argv) pdc_dims[0] = dims[0]; pdc_dims[1] = max_start_x + chunk_size[1]; pdc_dims[2] = max_start_y + chunk_size[2]; - fprintf(stderr, "Rank %d: create obj dims %llu %llu %llu\n", rank, pdc_dims[0], pdc_dims[1], pdc_dims[2]); + LOG_ERROR("Rank %d: create obj dims %llu %llu %llu\n", rank, pdc_dims[0], pdc_dims[1], pdc_dims[2]); for (i = 0; i < 3; i++) { pdc_offset[i] = (uint64_t)offset[i]; @@ -151,7 +151,7 @@ main(int argc, char **argv) obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); /* obj = PDCobj_create(cont, "run1", obj_prop); */ if (obj <= 0) - fprintf(stderr, "Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object"); remote_reg = PDCregion_create(3, pdc_offset, pdc_size); @@ -167,7 +167,7 @@ main(int argc, char **argv) value_size = 4 * sizeof(double); if (PDCobj_put_tag(obj, tag_name, tag_value, PDC_DOUBLE, value_size) < 0) - fprintf(stderr, "Rank %d fail to put tag @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to put tag!\n", rank); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -183,7 +183,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Write data to server took %.4lf\n", t1 - t0); + LOG_ERROR("Write data to server took %.4lf\n", t1 - t0); #endif free(data); @@ -192,19 +192,19 @@ main(int argc, char **argv) PDCregion_close(local_reg); if (PDCobj_close(obj) < 0) - fprintf(stderr, "fail to close object\n"); + LOG_ERROR("fail to close object\n"); if (PDCcont_close(cont) < 0) - fprintf(stderr, "fail to close container c1\n"); + LOG_ERROR("fail to close container c1\n"); if (PDCprop_close(obj_prop) < 0) - fprintf(stderr, "Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCprop_close(cont_prop) < 0) - fprintf(stderr, "Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - fprintf(stderr, "fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tools/pdc_ls.c b/src/tools/pdc_ls.c index c4800298c..de3564794 100644 --- a/src/tools/pdc_ls.c +++ b/src/tools/pdc_ls.c @@ -128,8 +128,9 @@ int main(int argc, char *argv[]) { if (argc == 1) { - printf("Usage: ./pdc_ls pdc_checkpoint_directory/file [-n obj_name] [-i obj_id] [-json json_fname] " - "[-ln (list all names)] [-ls (list all ids)] [-s (summary)]\n"); + LOG_JUST_PRINT( + "Usage: ./pdc_ls pdc_checkpoint_directory/file [-n obj_name] [-i obj_id] [-json json_fname] " + "[-ln (list all names)] [-ls (list all ids)] [-s (summary)]\n"); return 0; } else { @@ -153,11 +154,9 @@ main(int argc, char *argv[]) char tmp[1024]; sprintf(tmp, "%s/%s", argv[1], dir->d_name); DIR *d1 = opendir(tmp); - /* printf("%s\n", tmp); */ while ((direc = readdir(d1)) != NULL) { // go into it and go for checkpoint files again if (strstr(direc->d_name, "metadata_checkpoint.")) { - // printf("getting checkpoints\n"); char last = argv[1][strlen(argv[1]) - 1]; if (last == '/') { full_path = (char *)malloc(sizeof(char) * @@ -195,7 +194,7 @@ main(int argc, char *argv[]) closedir(d1); } if (strstr(dir->d_name, "metadata_checkpoint.")) { - printf("%s\n", dir->d_name); + LOG_INFO("%s\n", dir->d_name); char last = argv[1][strlen(argv[1]) - 1]; if (last == '/') { full_path = @@ -244,7 +243,7 @@ main(int argc, char *argv[]) } if (head == NULL) { - printf("Unable to open/locate checkpoint file(s).\n"); + LOG_ERROR("Unable to open/locate checkpoint file(s).\n"); return -1; } else { @@ -380,7 +379,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) int arg_index = 2; while (arg_index < argc) { if (is_arg(argv[arg_index]) == 0) { - printf("Improperly formatted argument(s).\n"); + LOG_ERROR("Improperly formatted argument(s).\n"); return; } if (strcmp(argv[arg_index], "-n") == 0) { @@ -433,7 +432,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) while (cur_file_node != NULL) { filename = cur_file_node->file_name; stat(filename, &attr); - printf("[INFO] File [%s] last modified at: %s", filename, ctime(&attr.st_mtime)); + LOG_INFO("[INFO] File [%s] last modified at: %s", filename, ctime(&attr.st_mtime)); // Start server restart code perr_t ret_value = SUCCEED; int n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs, total_region = 0, @@ -448,45 +447,44 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) FILE *file = fopen(filename, "r"); if (file == NULL) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file open FAILED [%s]!", pdc_server_rank_g, __func__, - filename); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file open FAILED [%s]!", pdc_server_rank_g, filename); ret_value = FAIL; continue; } if (fread(&n_cont, sizeof(int), 1, file) != 1) { - printf("Read failed for cont count\n"); + LOG_ERROR("Read failed for cont count\n"); } all_cont = n_cont; while (n_cont > 0) { hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for cont hash_key\n"); + LOG_ERROR("Read failed for cont hash_key\n"); return; } // Reconstruct hash table cont_entry = (pdc_cont_hash_table_entry_t *)malloc(sizeof(pdc_cont_hash_table_entry_t)); if (fread(cont_entry, sizeof(pdc_cont_hash_table_entry_t), 1, file) != 1) { - printf("Read failed for cont_entry\n"); + LOG_ERROR("Read failed for cont_entry\n"); return; } n_cont--; } // End while if (fread(&n_entry, sizeof(int), 1, file) != 1) { - printf("Read failed for n_entry\n"); + LOG_ERROR("Read failed for n_entry\n"); } while (n_entry > 0) { if (fread(&count, sizeof(int), 1, file) != 1) { - printf("Read failed for obj count\n"); + LOG_ERROR("Read failed for obj count\n"); return; } hash_key = (uint32_t *)malloc(sizeof(uint32_t)); if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for obj hash_key\n"); + LOG_ERROR("Read failed for obj hash_key\n"); return; } @@ -496,11 +494,11 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) entry->bloom = NULL; entry->metadata = NULL; - /* fprintf(stderr, "size of metadata: %lu\n", sizeof(pdc_metadata_t)); */ + /* LOG_ERROR("size of metadata: %lu\n", sizeof(pdc_metadata_t)); */ metadata = (pdc_metadata_t *)calloc(sizeof(pdc_metadata_t), count); for (i = 0; i < count; i++) { if (fread(metadata + i, sizeof(pdc_metadata_t), 1, file) != 1) { - printf("Read failed for metadata\n"); + LOG_ERROR("Read failed for metadata\n"); } MetadataNode *new_node = (MetadataNode *)malloc(sizeof(MetadataNode)); new_node->metadata_ptr = (metadata + i); @@ -538,36 +536,35 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) // Read kv tags if (fread(&n_kvtag, sizeof(int), 1, file) != 1) { - printf("Read failed for n_kvtag\n"); + LOG_ERROR("Read failed for n_kvtag\n"); } for (j = 0; j < n_kvtag; j++) { pdc_kvtag_list_t *kvtag_list = (pdc_kvtag_list_t *)calloc(1, sizeof(pdc_kvtag_list_t)); kvtag_list->kvtag = (pdc_kvtag_t *)malloc(sizeof(pdc_kvtag_t)); if (fread(&key_len, sizeof(int), 1, file) != 1) { - printf("Read failed for key_len\n"); + LOG_ERROR("Read failed for key_len\n"); } kvtag_list->kvtag->name = malloc(key_len); if (fread((void *)(kvtag_list->kvtag->name), key_len, 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->name\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->name\n"); } if (fread(&kvtag_list->kvtag->size, sizeof(uint32_t), 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->size\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->size\n"); } if (fread(&kvtag_list->kvtag->type, sizeof(int8_t), 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->size\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->size\n"); } kvtag_list->kvtag->value = malloc(kvtag_list->kvtag->size); if (fread(kvtag_list->kvtag->value, kvtag_list->kvtag->size, 1, file) != 1) { - printf("Read failed for kvtag_list->kvtag->value\n"); + LOG_ERROR("Read failed for kvtag_list->kvtag->value\n"); } } if (fread(&n_region, sizeof(int), 1, file) != 1) { - printf("Read failed for n_region\n"); + LOG_ERROR("Read failed for n_region\n"); } if (n_region < 0) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file region number ERROR!", pdc_server_rank_g, - __func__); + LOG_ERROR("==PDC_SERVER[%d] Checkpoint file region number ERROR!", pdc_server_rank_g); ret_value = FAIL; continue; } @@ -577,24 +574,24 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) for (j = 0; j < n_region; j++) { region_list = (region_list_t *)malloc(sizeof(region_list_t)); if (fread(region_list, sizeof(region_list_t), 1, file) != 1) { - printf("Read failed for region_list\n"); + LOG_ERROR("Read failed for region_list\n"); } int has_hist = 0; if (fread(&has_hist, sizeof(int), 1, file) != 1) { - printf("Read failed for has_list\n"); + LOG_ERROR("Read failed for has_list\n"); } if (has_hist == 1) { region_list->region_hist = (pdc_histogram_t *)malloc(sizeof(pdc_histogram_t)); if (fread(®ion_list->region_hist->dtype, sizeof(int), 1, file) != 1) { - printf("Read failed for region_list->region_hist->dtype\n"); + LOG_ERROR("Read failed for region_list->region_hist->dtype\n"); } if (fread(®ion_list->region_hist->nbin, sizeof(int), 1, file) != 1) { - printf("Read failed for region_list->region_hist->nbin\n"); + LOG_ERROR("Read failed for region_list->region_hist->nbin\n"); } if (region_list->region_hist->nbin == 0) { - printf("==PDC_SERVER[%d]: %s - Checkpoint file histogram size is 0!", - pdc_server_rank_g, __func__); + LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file histogram size is 0!", + pdc_server_rank_g); } region_list->region_hist->range = @@ -604,14 +601,14 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) if (fread(region_list->region_hist->range, sizeof(double), region_list->region_hist->nbin * 2, file) != 1) { - printf("Read failed for region_list->region_hist->range\n"); + LOG_ERROR("Read failed for region_list->region_hist->range\n"); } if (fread(region_list->region_hist->bin, sizeof(uint64_t), region_list->region_hist->nbin, file) != 1) { - printf("Read failed for region_list->region_hist->bin\n"); + LOG_ERROR("Read failed for region_list->region_hist->bin\n"); } if (fread(®ion_list->region_hist->incr, sizeof(double), 1, file) != 1) { - printf("Read failed for region_list->region_hist->incr\n"); + LOG_ERROR("Read failed for region_list->region_hist->incr\n"); } } @@ -626,7 +623,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) } if (fread(&n_objs, sizeof(int), 1, file) != 1) { - printf("Read failed for n_objs\n"); + LOG_ERROR("Read failed for n_objs\n"); } for (i = 0; i < n_objs; ++i) { @@ -635,10 +632,10 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) new_obj_reg->fd = -1; new_obj_reg->storage_location = (char *)malloc(sizeof(char) * ADDR_MAX); if (fread(&new_obj_reg->obj_id, sizeof(uint64_t), 1, file) != 1) { - printf("Read failed for obj_id\n"); + LOG_ERROR("Read failed for obj_id\n"); } if (fread(&n_region, sizeof(int), 1, file) != 1) { - printf("Read failed for n_region\n"); + LOG_ERROR("Read failed for n_region\n"); } MetadataNode *wanted_node = metadata_head; while (wanted_node != NULL) { @@ -651,7 +648,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) for (j = 0; j < n_region; j++) { region_list_t *new_region_list = (region_list_t *)malloc(sizeof(region_list_t)); if (fread(new_region_list, sizeof(region_list_t), 1, file) != 1) { - printf("Read failed for new_region_list\n"); + LOG_ERROR("Read failed for new_region_list\n"); } RegionNode *new_node = (RegionNode *)malloc(sizeof(RegionNode)); new_node->region_list = new_region_list; @@ -671,13 +668,13 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) char * checkpoint_buf; if (fread(&checkpoint_size, sizeof(uint64_t), 1, file) != 1) { - printf("Read failed for checkpoint size\n"); + LOG_ERROR("Read failed for checkpoint size\n"); } checkpoint_buf = (char *)malloc(checkpoint_size); if (fread(checkpoint_buf, checkpoint_size, 1, file) != 1) { - printf("Read failed for checkpoint buf\n"); + LOG_ERROR("Read failed for checkpoint buf\n"); } pdc_obj_metadata_pkg *metadata_server_objs = @@ -866,7 +863,7 @@ pdc_ls(FileNameNode *file_name_node, int argc, char *argv[]) FILE *fp; if (output_file_name) { fp = fopen(output_file_name, "w"); - printf("Output to [%s]\n", output_file_name); + LOG_INFO("Output to [%s]\n", output_file_name); } else { fp = stdout; diff --git a/src/tools/pdc_query_eqsim.c b/src/tools/pdc_query_eqsim.c index 299185441..a5e1ac490 100644 --- a/src/tools/pdc_query_eqsim.c +++ b/src/tools/pdc_query_eqsim.c @@ -47,7 +47,7 @@ main(int argc, char **argv) file = H5Fopen(fname, H5F_ACC_RDONLY, fapl); if (file < 0) - fprintf(stderr, "Failed to open file [%s]\n", fname); + LOG_ERROR("Failed to open file [%s]\n", fname); dset = H5Dopen(file, dname, H5P_DEFAULT); dspace = H5Dget_space(dset); @@ -92,8 +92,8 @@ main(int argc, char **argv) data = (double *)malloc(sizeof(double) * local_size[0] * local_size[1] * local_size[2]); if (nproc <= 16) - fprintf(stderr, "Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], - offset[1], offset[2], size[0], size[1], size[2]); + LOG_ERROR("Rank %d: offset %llu, %llu, %llu size %llu, %llu, %llu\n", rank, offset[0], offset[1], + offset[2], size[0], size[1], size[2]); #ifdef ENABLE_MPI t0 = MPI_Wtime(); @@ -105,7 +105,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Read from HDF5 took %.4lf\n", t1 - t0); + LOG_ERROR("Read from HDF5 took %.4lf\n", t1 - t0); #endif H5Sclose(mspace); @@ -142,7 +142,7 @@ main(int argc, char **argv) obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); /* obj = PDCobj_create(cont, "run1", obj_prop); */ if (obj <= 0) - fprintf(stderr, "Fail to create object @ line %d!\n", __LINE__); + LOG_ERROR("Fail to create object\n"); remote_reg = PDCregion_create(3, pdc_offset, pdc_size); @@ -158,14 +158,14 @@ main(int argc, char **argv) value_size = 4 * sizeof(double); if (PDCobj_put_tag(obj, tag_name, tag_value, PDC_DOUBLE, value_size) < 0) - fprintf(stderr, "Rank %d fail to put tag @ line %d!\n", rank, __LINE__); + LOG_ERROR("Rank %d fail to put tag\n", rank); // Query the created object pdc_metadata_t *metadata; uint32_t metadata_server_id; PDC_Client_query_metadata_name_timestep("run1", 0, &metadata, &metadata_server_id); if (metadata == NULL || metadata->obj_id == 0) { - printf("Error with metadata!\n"); + LOG_ERROR("Error with metadata!\n"); } int ndim = 3; @@ -185,7 +185,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Write data to server took %.4lf\n", t1 - t0); + LOG_ERROR("Write data to server took %.4lf\n", t1 - t0); #endif // Construct query constraints @@ -206,7 +206,7 @@ main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); if (rank == 0) - fprintf(stderr, "Query data took %.4lf\n", t1 - t0); + LOG_ERROR("Query data took %.4lf\n", t1 - t0); #endif /* PDCselection_print(&sel); */ @@ -220,19 +220,19 @@ main(int argc, char **argv) PDCregion_close(local_reg); if (PDCobj_close(obj) < 0) - fprintf(stderr, "fail to close object\n"); + LOG_ERROR("fail to close object\n"); if (PDCcont_close(cont) < 0) - fprintf(stderr, "fail to close container c1\n"); + LOG_ERROR("fail to close container c1\n"); if (PDCprop_close(obj_prop) < 0) - fprintf(stderr, "Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCprop_close(cont_prop) < 0) - fprintf(stderr, "Fail to close property @ line %d\n", __LINE__); + LOG_ERROR("Fail to close property"); if (PDCclose(pdc) < 0) - fprintf(stderr, "fail to close PDC\n"); + LOG_ERROR("fail to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/utils/pdc_region_utils.c b/src/utils/pdc_region_utils.c index a81dd9b9f..32d1ddc9a 100644 --- a/src/utils/pdc_region_utils.c +++ b/src/utils/pdc_region_utils.c @@ -1,4 +1,5 @@ #include "pdc_region.h" +#include "pdc_logger.h" #include int @@ -24,7 +25,7 @@ PDC_region_overlap_detect(int ndim, uint64_t *offset1, uint64_t *size1, uint64_t if (!check_overlap(ndim, offset1, size1, offset2, size2)) { *output_offset = NULL; *output_size = NULL; - // printf("PDC_region_overlap_detect @ line %d, overlap detect failed\n", __LINE__); + LOG_DEBUG("PDC_region_overlap_detect, overlap detect failed\n"); goto done; } // Overlapping exist. From 01efd7f394587f66bfa02337cc34b01c721e681d Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 19 Mar 2025 17:56:04 -0700 Subject: [PATCH 2/7] Change typo of LOG_INFO to LOG_ERROR --- examples/bdcats.c | 86 ++++++++--------- examples/bdcats_old.c | 86 ++++++++--------- examples/haccio.c | 6 +- examples/llsm/llsm_aux/parallelReadTiff.c | 2 +- examples/obj_get_data.c | 22 ++--- examples/read_write_col_perf.c | 32 +++---- examples/read_write_perf.c | 32 +++---- examples/region_transfer_2D.c | 32 +++---- examples/region_transfer_3D.c | 32 +++---- examples/tileio.c | 6 +- examples/vpicio.c | 106 ++++++++++----------- examples/vpicio_batch.c | 110 +++++++++++----------- examples/vpicio_old.c | 106 ++++++++++----------- 13 files changed, 329 insertions(+), 329 deletions(-) diff --git a/examples/bdcats.c b/examples/bdcats.c index 3c5e4df41..2d954bcbe 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -99,7 +99,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); // open objects #ifdef ENABLE_MPI @@ -249,83 +249,83 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request_x); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_xx\n"); + LOG_ERROR("Failed to start transfer for region_xx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_y); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_yy\n"); + LOG_ERROR("Failed to start transfer for region_yy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_z); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_zz\n"); + LOG_ERROR("Failed to start transfer for region_zz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_px); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_pxx\n"); + LOG_ERROR("Failed to start transfer for region_pxx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_py); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_pyy\n"); + LOG_ERROR("Failed to start transfer for region_pyy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_pz); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_pzz\n"); + LOG_ERROR("Failed to start transfer for region_pzz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id1); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_id11\n"); + LOG_ERROR("Failed to start transfer for region_id11\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id2); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_id22\n"); + LOG_ERROR("Failed to start transfer for region_id22\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_x); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_xx\n"); + LOG_ERROR("Failed to transfer wait for region_xx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_y); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_yy\n"); + LOG_ERROR("Failed to transfer wait for region_yy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_z); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_zz\n"); + LOG_ERROR("Failed to transfer wait for region_zz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_px); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_pxx\n"); + LOG_ERROR("Failed to transfer wait for region_pxx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_py); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_pyy\n"); + LOG_ERROR("Failed to transfer wait for region_pyy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_pz); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_pzz\n"); + LOG_ERROR("Failed to transfer wait for region_pzz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id1); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_id11\n"); + LOG_ERROR("Failed to transfer wait for region_id11\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id2); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_id22\n"); + LOG_ERROR("Failed to transfer wait for region_id22\n"); return 1; } @@ -373,83 +373,83 @@ main(int argc, char **argv) PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - LOG_INFO("Fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_INFO("Fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_INFO("Fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_INFO("Fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_INFO("Fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_INFO("Fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_INFO("Fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_INFO("Fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_INFO("Fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_INFO("Fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_INFO("Fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_INFO("Fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_INFO("Fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_INFO("Fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_INFO("Fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_INFO("Fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_INFO("Fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_INFO("Fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_INFO("Fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_INFO("Fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_INFO("Fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_INFO("Fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_INFO("Fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_INFO("Fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_INFO("Fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); if (PDCclose(pdc_id) < 0) - LOG_INFO("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); free(x); free(y); diff --git a/examples/bdcats_old.c b/examples/bdcats_old.c index d8371758f..9d3cf805b 100644 --- a/examples/bdcats_old.c +++ b/examples/bdcats_old.c @@ -95,7 +95,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); @@ -203,67 +203,67 @@ main(int argc, char **argv) ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_zz\n"); + LOG_ERROR("Failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("Failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("Failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("Failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_id11\n"); + LOG_ERROR("Failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_id22\n"); + LOG_ERROR("Failed to obtain lock for region_id22\n"); ret = PDCreg_release_lock(obj_xx, region_xx, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_xx\n"); + LOG_ERROR("Failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy, region_yy, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_yy\n"); + LOG_ERROR("Failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz, region_zz, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_zz\n"); + LOG_ERROR("Failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_pxx\n"); + LOG_ERROR("Failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_pyy\n"); + LOG_ERROR("Failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_pzz\n"); + LOG_ERROR("Failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11, region_id11, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_id11\n"); + LOG_ERROR("Failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22, region_id22, PDC_READ); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_id22\n"); + LOG_ERROR("Failed to release lock for region_id22\n"); ret = PDCbuf_obj_unmap(obj_xx, region_xx); if (ret != SUCCEED) @@ -300,83 +300,83 @@ main(int argc, char **argv) PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - LOG_INFO("Fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_INFO("Fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_INFO("Fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_INFO("Fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_INFO("Fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_INFO("Fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_INFO("Fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_INFO("Fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_INFO("Fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_INFO("Fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_INFO("Fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_INFO("Fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_INFO("Fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_INFO("Fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_INFO("Fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_INFO("Fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_INFO("Fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_INFO("Fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_INFO("Fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_INFO("Fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_INFO("Fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_INFO("Fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_INFO("Fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_INFO("Fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_INFO("Fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); if (PDCclose(pdc_id) < 0) - LOG_INFO("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); free(x); free(y); diff --git a/examples/haccio.c b/examples/haccio.c index 47043a1b4..0d2025aad 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -142,7 +142,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCreg_obtain_lock(obj_ids[i], region_remote_ids[i], PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Fail to obtain lock"); + LOG_ERROR("Fail to obtain lock"); } } MPI_Barrier(MPI_COMM_WORLD); @@ -174,7 +174,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCreg_release_lock(obj_ids[i], region_remote_ids[i], PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Fail to release lock"); + LOG_ERROR("Fail to release lock"); } } MPI_Barrier(MPI_COMM_WORLD); @@ -184,7 +184,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCbuf_obj_unmap(obj_ids[i], region_remote_ids[i]); if (ret != SUCCEED) { - LOG_INFO("Fail to unmap"); + LOG_ERROR("Fail to unmap"); } } MPI_Barrier(MPI_COMM_WORLD); diff --git a/examples/llsm/llsm_aux/parallelReadTiff.c b/examples/llsm/llsm_aux/parallelReadTiff.c index da2702e86..9bce41c33 100644 --- a/examples/llsm/llsm_aux/parallelReadTiff.c +++ b/examples/llsm/llsm_aux/parallelReadTiff.c @@ -250,7 +250,7 @@ readTiffParallel(uint64_t x, uint64_t y, uint64_t z, const char *fileName, void LOG_ERROR("disk:threadError | File \"%s\" cannot be opened from Disk\n", fileName); if (!tif) - LGO_ERROR("tiff:threadError | File \"%s\" cannot be opened\n", fileName); + LOG_ERROR("tiff:threadError | File \"%s\" cannot be opened\n", fileName); uint64_t offset = 0; uint64_t *offsets = NULL; TIFFGetField(tif, TIFFTAG_STRIPOFFSETS, &offsets); diff --git a/examples/obj_get_data.c b/examples/obj_get_data.c index 38e56066d..6afdff93a 100644 --- a/examples/obj_get_data.c +++ b/examples/obj_get_data.c @@ -56,7 +56,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container @@ -66,7 +66,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); ret_value = 1; } @@ -77,7 +77,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name1); } else { - LOG_INFO("Fail to put data into object"); + LOG_ERROR("Fail to put data into object"); ret_value = 1; } @@ -88,14 +88,14 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name2); } else { - LOG_INFO("Fail to put data into object"); + LOG_ERROR("Fail to put data into object"); ret_value = 1; } memset(data, 0, 128 * sizeof(double)); error_code = PDCobj_get_data(obj1, (void *)(data), 16 * sizeof(double)); if (error_code != SUCCEED) { - LOG_INFO("Fail to get obj 1 data\n"); + LOG_ERROR("Fail to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < 16 * sizeof(double); ++i) { @@ -108,7 +108,7 @@ main(int argc, char **argv) memset(data, 0, 128 * sizeof(double)); error_code = PDCobj_get_data(obj2, (void *)(data), 128 * sizeof(double)); if (error_code != SUCCEED) { - LOG_INFO("Fail to get obj 1 data\n"); + LOG_ERROR("Fail to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < 128 * sizeof(double); ++i) { @@ -121,14 +121,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_INFO("Fail to close object o1\n"); + LOG_ERROR("Fail to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_INFO("Fail to close object o2\n"); + LOG_ERROR("Fail to close object o2\n"); ret_value = 1; } else { @@ -137,7 +137,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_INFO("Fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); ret_value = 1; } else { @@ -145,7 +145,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { @@ -153,7 +153,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_INFO("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index 68fda88cc..a09e12bfc 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -135,26 +135,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_INFO("Fail to create object property"); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_INFO("Fail to set obj type"); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -177,7 +177,7 @@ main(int argc, char **argv) #endif if (obj1 <= 0) { - LOG_INFO("Fail to create object"); + LOG_ERROR("Fail to create object"); ret_value = 1; } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -215,16 +215,16 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_INFO("Fail to close object o1"); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } @@ -235,7 +235,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_INFO("Fail to open object"); + LOG_ERROR("Fail to open object"); ret_value = 1; } @@ -282,17 +282,17 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_INFO("Fail to close object o1"); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } @@ -301,22 +301,22 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_INFO("Fail to close container c1"); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - LOG_INFO("Fail to close PDC"); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/read_write_perf.c b/examples/read_write_perf.c index 21bd718d2..2db091c76 100644 --- a/examples/read_write_perf.c +++ b/examples/read_write_perf.c @@ -129,26 +129,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_INFO("Fail to create object property"); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_INFO("Fail to set obj type"); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -165,7 +165,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 <= 0) { - LOG_INFO("Fail to create object"); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -207,16 +207,16 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_INFO("Fail to close object o1"); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } @@ -227,7 +227,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_INFO("Fail to open object"); + LOG_ERROR("Fail to open object"); ret_value = 1; } @@ -274,17 +274,17 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_INFO("Fail to close object o1"); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } } @@ -293,22 +293,22 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_INFO("Fail to close container c1"); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - LOG_INFO("Fail to close PDC"); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/region_transfer_2D.c b/examples/region_transfer_2D.c index be477d3c1..5b82228eb 100644 --- a/examples/region_transfer_2D.c +++ b/examples/region_transfer_2D.c @@ -68,7 +68,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property @@ -87,13 +87,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_INFO("Fail to create object property"); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_INFO("Fail to set obj type"); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -109,7 +109,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_INFO("Fail to create object"); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_INFO("Fail to create object"); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -143,7 +143,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { @@ -151,7 +151,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { @@ -183,7 +183,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { @@ -191,7 +191,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { @@ -200,14 +200,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_INFO("Fail to close object o1"); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_INFO("Fail to close object o2"); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { @@ -215,7 +215,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_INFO("Fail to close container c1"); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { @@ -223,7 +223,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { @@ -231,7 +231,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { @@ -241,7 +241,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_INFO("Fail to close PDC"); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/region_transfer_3D.c b/examples/region_transfer_3D.c index 7e549eab9..35156f732 100644 --- a/examples/region_transfer_3D.c +++ b/examples/region_transfer_3D.c @@ -69,7 +69,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); ret_value = 1; } // create a container @@ -79,7 +79,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); ret_value = 1; } // create an object property @@ -88,13 +88,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_INFO("Fail to create object property"); + LOG_ERROR("Fail to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_INFO("Fail to set obj type"); + LOG_ERROR("Fail to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -110,7 +110,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_INFO("Fail to create object"); + LOG_ERROR("Fail to create object"); ret_value = 1; } // create second object @@ -120,7 +120,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_INFO("Fail to create object"); + LOG_ERROR("Fail to create object"); ret_value = 1; } @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { @@ -154,7 +154,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { @@ -188,7 +188,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_INFO("Fail to close local region"); + LOG_ERROR("Fail to close local region"); ret_value = 1; } else { @@ -196,7 +196,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_INFO("Fail to close global region"); + LOG_ERROR("Fail to close global region"); ret_value = 1; } else { @@ -205,14 +205,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_INFO("Fail to close object o1"); + LOG_ERROR("Fail to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_INFO("Fail to close object o2"); + LOG_ERROR("Fail to close object o2"); ret_value = 1; } else { @@ -220,7 +220,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_INFO("Fail to close container c1"); + LOG_ERROR("Fail to close container c1"); ret_value = 1; } else { @@ -228,7 +228,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { @@ -236,7 +236,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); ret_value = 1; } else { @@ -246,7 +246,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_INFO("Fail to close PDC"); + LOG_ERROR("Fail to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/tileio.c b/examples/tileio.c index 1db6c4406..46d6a7cee 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -133,7 +133,7 @@ main(int argc, char **argv) time_acquire_lock = MPI_Wtime(); ret = PDCreg_obtain_lock(obj_id, global_region_id, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Fail to obtain lock"); + LOG_ERROR("Fail to obtain lock"); } MPI_Barrier(MPI_COMM_WORLD); time_acquire_lock = MPI_Wtime() - time_acquire_lock; @@ -153,7 +153,7 @@ main(int argc, char **argv) time_release_lock = MPI_Wtime(); ret = PDCreg_release_lock(obj_id, global_region_id, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Fail to release lock"); + LOG_ERROR("Fail to release lock"); } MPI_Barrier(MPI_COMM_WORLD); time_release_lock = MPI_Wtime() - time_release_lock; @@ -161,7 +161,7 @@ main(int argc, char **argv) // Unmap object ret = PDCbuf_obj_unmap(obj_id, global_region_id); if (ret != SUCCEED) { - LOG_INFO("Fail to unmap"); + LOG_ERROR("Fail to unmap"); } // TODO delete before close ? PDCobj_close(obj_id); diff --git a/examples/vpicio.c b/examples/vpicio.c index 561c4dcd2..8aa27683d 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -112,13 +112,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); return 1; } // create an object property @@ -279,83 +279,83 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request_x); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_xx\n"); + LOG_ERROR("Failed to start transfer for region_xx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_y); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_yy\n"); + LOG_ERROR("Failed to start transfer for region_yy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_z); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_zz\n"); + LOG_ERROR("Failed to start transfer for region_zz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_px); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_pxx\n"); + LOG_ERROR("Failed to start transfer for region_pxx\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_py); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_pyy\n"); + LOG_ERROR("Failed to start transfer for region_pyy\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_pz); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_pzz\n"); + LOG_ERROR("Failed to start transfer for region_pzz\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id1); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_id11\n"); + LOG_ERROR("Failed to start transfer for region_id11\n"); return 1; } ret = PDCregion_transfer_start(transfer_request_id2); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for region_id22\n"); + LOG_ERROR("Failed to start transfer for region_id22\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_x); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_xx\n"); + LOG_ERROR("Failed to transfer wait for region_xx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_y); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_yy\n"); + LOG_ERROR("Failed to transfer wait for region_yy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_z); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_zz\n"); + LOG_ERROR("Failed to transfer wait for region_zz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_px); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_pxx\n"); + LOG_ERROR("Failed to transfer wait for region_pxx\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_py); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_pyy\n"); + LOG_ERROR("Failed to transfer wait for region_pyy\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_pz); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_pzz\n"); + LOG_ERROR("Failed to transfer wait for region_pzz\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id1); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_id11\n"); + LOG_ERROR("Failed to transfer wait for region_id11\n"); return 1; } ret = PDCregion_transfer_wait(transfer_request_id2); if (ret != SUCCEED) { - LOG_INFO("Failed to transfer wait for region_id22\n"); + LOG_ERROR("Failed to transfer wait for region_id22\n"); return 1; } @@ -407,146 +407,146 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj_xx) < 0) { - LOG_INFO("Fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - LOG_INFO("Fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - LOG_INFO("Fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - LOG_INFO("Fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - LOG_INFO("Fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - LOG_INFO("Fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - LOG_INFO("Fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - LOG_INFO("Fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - LOG_INFO("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_INFO("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_INFO("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_INFO("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_INFO("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_INFO("Fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_INFO("Fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_INFO("Fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_INFO("Fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_INFO("Fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_INFO("Fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_INFO("Fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_INFO("Fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - LOG_INFO("Fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_INFO("Fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_INFO("Fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_INFO("Fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_INFO("Fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_INFO("Fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_INFO("Fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_INFO("Fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_INFO("Fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_INFO("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 1; } free(offset); diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index cd9132e17..c5092bada 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -145,13 +145,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); return 1; } // create an object property @@ -432,7 +432,7 @@ main(int argc, char **argv) if (test_method == 2) { ret = PDCregion_transfer_start_all(temp_requests, 8); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for all regions\n"); + LOG_ERROR("Failed to start transfer for all regions\n"); return 1; } } @@ -444,28 +444,28 @@ main(int argc, char **argv) else { ret = PDCreg_obtain_lock(obj_xx[i], region_xx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); ret = PDCreg_obtain_lock(obj_yy[i], region_yy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz[i], region_zz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_zz\n"); + LOG_ERROR("Failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx[i], region_pxx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("Failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy[i], region_pyy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("Failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz[i], region_pzz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("Failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11[i], region_id11, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_id11\n"); + LOG_ERROR("Failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22[i], region_id22, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_INFO("Failed to obtain lock for region_id22\n"); + LOG_ERROR("Failed to obtain lock for region_id22\n"); } #ifdef ENABLE_MPI transfer_start += MPI_Wtime() - start; @@ -489,7 +489,7 @@ main(int argc, char **argv) if (test_method == 2) { ret = PDCregion_transfer_wait_all(temp_requests, 8); if (ret != SUCCEED) { - LOG_INFO("Failed to start transfer for all regions\n"); + LOG_ERROR("Failed to start transfer for all regions\n"); return 1; } } @@ -501,28 +501,28 @@ main(int argc, char **argv) else { ret = PDCreg_release_lock(obj_xx[i], region_xx, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_xx\n"); + LOG_ERROR("Failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy[i], region_yy, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_yy\n"); + LOG_ERROR("Failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz[i], region_zz, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_zz\n"); + LOG_ERROR("Failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx[i], region_pxx, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_pxx\n"); + LOG_ERROR("Failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy[i], region_pyy, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_pyy\n"); + LOG_ERROR("Failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz[i], region_pzz, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_pzz\n"); + LOG_ERROR("Failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11[i], region_id11, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_id11\n"); + LOG_ERROR("Failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22[i], region_id22, PDC_WRITE); if (ret != SUCCEED) - LOG_INFO("Failed to release lock for region_id22\n"); + LOG_ERROR("Failed to release lock for region_id22\n"); } #ifdef ENABLE_MPI end = MPI_Wtime(); @@ -608,35 +608,35 @@ main(int argc, char **argv) #endif if (PDCregion_close(region_xx) < 0) { - LOG_INFO("Fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_INFO("Fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_INFO("Fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_INFO("Fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_INFO("Fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_INFO("Fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); return 1; } if (PDCregion_close(region_id11) < 0) { - LOG_INFO("Fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); return 1; } if (PDCregion_close(region_id22) < 0) { - LOG_INFO("Fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); return 1; } MPI_Barrier(MPI_COMM_WORLD); @@ -649,35 +649,35 @@ main(int argc, char **argv) PDC_timing_report("write"); for (i = 0; i < timestamps; ++i) { if (PDCobj_close(obj_xx[i]) < 0) { - LOG_INFO("Fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy[i]) < 0) { - LOG_INFO("Fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz[i]) < 0) { - LOG_INFO("Fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx[i]) < 0) { - LOG_INFO("Fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy[i]) < 0) { - LOG_INFO("Fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz[i]) < 0) { - LOG_INFO("Fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11[i]) < 0) { - LOG_INFO("Fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22[i]) < 0) { - LOG_INFO("Fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); return 1; } } @@ -731,81 +731,81 @@ main(int argc, char **argv) free(obj_id11); free(obj_id22); if (PDCprop_close(obj_prop_xx) < 0) { - LOG_INFO("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_INFO("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_INFO("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_INFO("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_INFO("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_INFO("Fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_INFO("Fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_INFO("Fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_INFO("Fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_INFO("Fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_INFO("Fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_INFO("Fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_INFO("Fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_INFO("Fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_INFO("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 1; } free(offset); diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index 4643eb92a..c098935e9 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -109,13 +109,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_INFO("Fail to create container property"); + LOG_ERROR("Fail to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_INFO("Fail to create container"); + LOG_ERROR("Fail to create container"); return 1; } // create an object property @@ -263,42 +263,42 @@ main(int argc, char **argv) } ret = PDCreg_obtain_lock(obj_xx, region_xx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_xx\n"); + LOG_ERROR("Failed to obtain lock for region_xx\n"); return 1; } ret = PDCreg_obtain_lock(obj_yy, region_yy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_yy\n"); + LOG_ERROR("Failed to obtain lock for region_yy\n"); return 1; } ret = PDCreg_obtain_lock(obj_zz, region_zz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_zz\n"); + LOG_ERROR("Failed to obtain lock for region_zz\n"); return 1; } ret = PDCreg_obtain_lock(obj_pxx, region_pxx, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_pxx\n"); + LOG_ERROR("Failed to obtain lock for region_pxx\n"); return 1; } ret = PDCreg_obtain_lock(obj_pyy, region_pyy, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_pyy\n"); + LOG_ERROR("Failed to obtain lock for region_pyy\n"); return 1; } ret = PDCreg_obtain_lock(obj_pzz, region_pzz, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_pzz\n"); + LOG_ERROR("Failed to obtain lock for region_pzz\n"); return 1; } ret = PDCreg_obtain_lock(obj_id11, region_id11, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_id11\n"); + LOG_ERROR("Failed to obtain lock for region_id11\n"); return 1; } ret = PDCreg_obtain_lock(obj_id22, region_id22, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_INFO("Failed to obtain lock for region_id22\n"); + LOG_ERROR("Failed to obtain lock for region_id22\n"); return 1; } @@ -314,42 +314,42 @@ main(int argc, char **argv) } ret = PDCreg_release_lock(obj_xx, region_xx, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_xx\n"); + LOG_ERROR("Failed to release lock for region_xx\n"); return 1; } ret = PDCreg_release_lock(obj_yy, region_yy, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_yy\n"); + LOG_ERROR("Failed to release lock for region_yy\n"); return 1; } ret = PDCreg_release_lock(obj_zz, region_zz, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_zz\n"); + LOG_ERROR("Failed to release lock for region_zz\n"); return 1; } ret = PDCreg_release_lock(obj_pxx, region_pxx, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_pxx\n"); + LOG_ERROR("Failed to release lock for region_pxx\n"); return 1; } ret = PDCreg_release_lock(obj_pyy, region_pyy, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_pyy\n"); + LOG_ERROR("Failed to release lock for region_pyy\n"); return 1; } ret = PDCreg_release_lock(obj_pzz, region_pzz, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_pzz\n"); + LOG_ERROR("Failed to release lock for region_pzz\n"); return 1; } ret = PDCreg_release_lock(obj_id11, region_id11, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_id11\n"); + LOG_ERROR("Failed to release lock for region_id11\n"); return 1; } ret = PDCreg_release_lock(obj_id22, region_id22, PDC_WRITE); if (ret != SUCCEED) { - LOG_INFO("Failed to release lock for region_id22\n"); + LOG_ERROR("Failed to release lock for region_id22\n"); return 1; } ret = PDCbuf_obj_unmap(obj_xx, region_xx); @@ -394,146 +394,146 @@ main(int argc, char **argv) } PDC_timing_report("write"); if (PDCobj_close(obj_xx) < 0) { - LOG_INFO("Fail to close obj_xx\n"); + LOG_ERROR("Fail to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - LOG_INFO("Fail to close object obj_yy\n"); + LOG_ERROR("Fail to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - LOG_INFO("Fail to close object obj_zz\n"); + LOG_ERROR("Fail to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - LOG_INFO("Fail to close object obj_pxx\n"); + LOG_ERROR("Fail to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - LOG_INFO("Fail to close object obj_pyy\n"); + LOG_ERROR("Fail to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - LOG_INFO("Fail to close object obj_pzz\n"); + LOG_ERROR("Fail to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - LOG_INFO("Fail to close object obj_id11\n"); + LOG_ERROR("Fail to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - LOG_INFO("Fail to close object obj_id22\n"); + LOG_ERROR("Fail to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - LOG_INFO("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Fail to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_INFO("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Fail to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_INFO("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Fail to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_INFO("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_INFO("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Fail to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_INFO("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Fail to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_INFO("Fail to close region region_x\n"); + LOG_ERROR("Fail to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_INFO("Fail to close region region_y\n"); + LOG_ERROR("Fail to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_INFO("Fail to close region region_z\n"); + LOG_ERROR("Fail to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_INFO("Fail to close region region_px\n"); + LOG_ERROR("Fail to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_INFO("Fail to close region region_py\n"); + LOG_ERROR("Fail to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_INFO("Fail to close region region_pz\n"); + LOG_ERROR("Fail to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_INFO("Fail to close region region_id1\n"); + LOG_ERROR("Fail to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_INFO("Fail to close region region_id2\n"); + LOG_ERROR("Fail to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - LOG_INFO("Fail to close region region_xx\n"); + LOG_ERROR("Fail to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_INFO("Fail to close region region_yy\n"); + LOG_ERROR("Fail to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_INFO("Fail to close region region_zz\n"); + LOG_ERROR("Fail to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_INFO("Fail to close region region_pxx\n"); + LOG_ERROR("Fail to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_INFO("Fail to close region region_pyy\n"); + LOG_ERROR("Fail to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_INFO("Fail to close region region_pzz\n"); + LOG_ERROR("Fail to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_INFO("Fail to close region region_id11\n"); + LOG_ERROR("Fail to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_INFO("Fail to close region region_id22\n"); + LOG_ERROR("Fail to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_INFO("Fail to close container c1\n"); + LOG_ERROR("Fail to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_INFO("Fail to close property"); + LOG_ERROR("Fail to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_INFO("Fail to close PDC\n"); + LOG_ERROR("Fail to close PDC\n"); return 1; } free(offset); From 36b39c04a43ebd0d9dc2df1012fde66b4e66fd56 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 19 Mar 2025 18:00:34 -0700 Subject: [PATCH 3/7] Correct grammar from fail -> failed --- examples/bdcats.c | 54 +++---- examples/bdcats_batch.c | 50 +++---- examples/bdcats_old.c | 54 +++---- examples/haccio.c | 6 +- examples/llsm/llsm_importer.c | 6 +- examples/obj_get_data.c | 22 +-- examples/pdc_init.c | 2 +- examples/read_write_col_perf.c | 32 ++--- examples/read_write_perf.c | 32 ++--- examples/region_transfer_2D.c | 32 ++--- examples/region_transfer_3D.c | 32 ++--- examples/tileio.c | 6 +- examples/vpicio.c | 74 +++++----- examples/vpicio_batch.c | 74 +++++----- examples/vpicio_old.c | 74 +++++----- src/api/close_server.c | 2 +- src/api/pdc.c | 24 ++-- src/api/pdc_obj/pdc_cont.c | 2 +- src/api/pdc_obj/pdc_obj.c | 2 +- src/api/pdc_obj/pdc_prop.c | 4 +- src/api/pdc_region/pdc_region.c | 2 +- .../index/idioms/idioms_local_index_test.c | 24 ++-- src/tests/bdcats.c | 54 +++---- src/tests/bdcats_old.c | 54 +++---- src/tests/bdcats_v2.c | 54 +++---- src/tests/blocked_lock.c | 12 +- src/tests/buf_map_mpi_v2.c | 12 +- src/tests/buf_obj_map.c | 16 +-- src/tests/buf_obj_map_mpi.c | 12 +- src/tests/consistency_semantics.c | 32 ++--- src/tests/cont_add_del.c | 12 +- src/tests/cont_del.c | 12 +- src/tests/cont_getid.c | 16 +-- src/tests/cont_info.c | 14 +- src/tests/cont_iter.c | 18 +-- src/tests/cont_iter_mt.c | 8 +- src/tests/cont_life.c | 10 +- src/tests/cont_life_mt.c | 2 +- src/tests/cont_tags.c | 14 +- src/tests/create_cont.c | 10 +- src/tests/create_cont_coll.c | 10 +- src/tests/create_obj.c | 20 +-- src/tests/create_obj_scale.c | 12 +- src/tests/create_prop.c | 14 +- src/tests/create_region.c | 2 +- src/tests/dart_attr_dist_test.c | 18 +-- src/tests/dart_func_test.c | 12 +- src/tests/dart_test.c | 12 +- src/tests/data_rw_test.c | 12 +- src/tests/data_server_meta.c | 12 +- src/tests/data_server_meta_test.c | 12 +- src/tests/data_server_read.c | 10 +- src/tests/data_server_read_multi.c | 12 +- src/tests/data_server_read_vpic.c | 10 +- src/tests/data_server_read_vpic_multits.c | 10 +- src/tests/data_server_read_vpic_spatial.c | 10 +- .../data_server_read_vpic_spatial_multits.c | 10 +- src/tests/data_server_write.c | 12 +- src/tests/data_server_write_multi.c | 12 +- src/tests/data_server_write_vpic.c | 14 +- src/tests/data_server_write_vpic_multits.c | 14 +- src/tests/delete_obj.c | 12 +- src/tests/delete_obj_scale.c | 12 +- src/tests/dt_conv.c | 2 +- src/tests/dup_prop.c | 12 +- src/tests/gen_fastbit_idx.c | 2 +- src/tests/idioms_ci_test.c | 48 +++---- src/tests/init_only.c | 10 +- src/tests/kvtag_add_get.c | 44 +++--- src/tests/kvtag_add_get_benchmark.c | 22 +-- src/tests/kvtag_add_get_scale.c | 12 +- src/tests/kvtag_affix_query_scale.c | 18 +-- src/tests/kvtag_get.c | 34 ++--- src/tests/kvtag_query.c | 22 +-- src/tests/kvtag_range_query_scale.c | 22 +-- src/tests/list_all.c | 12 +- src/tests/llsm_idioms_bench.c | 12 +- src/tests/obj_buf.c | 18 +-- src/tests/obj_del.c | 24 ++-- src/tests/obj_dim.c | 18 +-- src/tests/obj_get_data.c | 22 +-- src/tests/obj_info.c | 26 ++-- src/tests/obj_iter.c | 30 ++-- src/tests/obj_life.c | 10 +- src/tests/obj_lock.c | 18 +-- src/tests/obj_map.c | 10 +- src/tests/obj_put_data.c | 18 +-- src/tests/obj_round_robin_io.c | 16 +-- src/tests/obj_round_robin_io_all.c | 20 +-- src/tests/obj_tags.c | 26 ++-- src/tests/obj_transformation.c | 74 +++++----- src/tests/open_cont.c | 14 +- src/tests/open_obj_round_robin.c | 4 +- src/tests/pdc_init.c | 2 +- src/tests/producer_waitall.c | 10 +- src/tests/query_data.c | 12 +- src/tests/query_metadata_agg.c | 12 +- src/tests/query_vpic.c | 2 +- src/tests/query_vpic_bin_sds1_nopreload.c | 2 +- src/tests/query_vpic_bin_sds1_preload.c | 2 +- src/tests/query_vpic_bin_sds_nopreload.c | 2 +- src/tests/query_vpic_bin_sds_preload.c | 2 +- src/tests/query_vpic_create_data.c | 14 +- src/tests/query_vpic_exyz_nopreload.c | 2 +- src/tests/query_vpic_exyz_preload.c | 2 +- src/tests/query_vpic_multi.c | 2 +- src/tests/query_vpic_multi_nopreload.c | 2 +- src/tests/query_vpic_multi_nopreload1.c | 2 +- src/tests/query_vpic_multi_preload.c | 2 +- src/tests/read_obj.c | 18 +-- src/tests/read_obj_shared.c | 28 ++-- src/tests/read_write_col_perf.c | 32 ++--- src/tests/read_write_perf.c | 32 ++--- src/tests/region_obj_map.c | 32 ++--- src/tests/region_obj_map_2D.c | 32 ++--- src/tests/region_obj_map_2D_partial.c | 32 ++--- src/tests/region_obj_map_3D.c | 32 ++--- src/tests/region_obj_map_3D_partial.c | 32 ++--- src/tests/region_obj_map_merge.c | 34 ++--- src/tests/region_obj_map_overlap.c | 42 +++--- src/tests/region_obj_map_overlap_2D.c | 42 +++--- src/tests/region_obj_map_overlap_3D.c | 42 +++--- src/tests/region_obj_map_partial.c | 32 ++--- src/tests/region_transfer.c | 48 +++---- src/tests/region_transfer_2D.c | 32 ++--- src/tests/region_transfer_2D_partial.c | 32 ++--- src/tests/region_transfer_2D_skewed.c | 40 +++--- src/tests/region_transfer_3D.c | 32 ++--- src/tests/region_transfer_3D_partial.c | 32 ++--- src/tests/region_transfer_3D_skewed.c | 40 +++--- src/tests/region_transfer_all.c | 58 ++++---- src/tests/region_transfer_all_2D.c | 56 ++++---- src/tests/region_transfer_all_3D.c | 56 ++++---- src/tests/region_transfer_all_append.c | 132 ++++++++--------- src/tests/region_transfer_all_append_2D.c | 134 ++++++++--------- src/tests/region_transfer_all_append_3D.c | 136 +++++++++--------- src/tests/region_transfer_all_fold.c | 10 +- src/tests/region_transfer_all_split_wait.c | 56 ++++---- src/tests/region_transfer_all_test.c | 40 +++--- src/tests/region_transfer_merge.c | 34 ++--- src/tests/region_transfer_overlap.c | 42 +++--- src/tests/region_transfer_overlap_2D.c | 42 +++--- src/tests/region_transfer_overlap_3D.c | 42 +++--- src/tests/region_transfer_partial.c | 32 ++--- src/tests/region_transfer_query.c | 34 ++--- src/tests/region_transfer_read_only.c | 56 ++++---- src/tests/region_transfer_set_dims.c | 110 +++++++------- src/tests/region_transfer_set_dims_2D.c | 110 +++++++------- src/tests/region_transfer_set_dims_3D.c | 110 +++++++------- src/tests/region_transfer_skewed.c | 32 ++--- src/tests/region_transfer_status.c | 36 ++--- src/tests/region_transfer_write_only.c | 84 +++++------ src/tests/region_transfer_write_read.c | 130 ++++++++--------- src/tests/search_obj.c | 12 +- src/tests/search_obj_scale.c | 12 +- src/tests/set_prop.c | 26 ++-- src/tests/stat_obj.c | 12 +- src/tests/update_obj.c | 12 +- src/tests/vpicio.c | 74 +++++----- src/tests/vpicio_mts.c | 34 ++--- src/tests/vpicio_old.c | 74 +++++----- src/tests/vpicio_v2.c | 74 +++++----- src/tests/write_obj_shared.c | 18 +-- src/tools/meta_json/metadata_json_importer.c | 22 +-- src/tools/pdc_access_eqsim.c | 6 +- src/tools/pdc_import.c | 4 +- src/tools/pdc_import_eqsim.c | 12 +- src/tools/pdc_query_eqsim.c | 12 +- 168 files changed, 2316 insertions(+), 2316 deletions(-) diff --git a/examples/bdcats.c b/examples/bdcats.c index 2d954bcbe..456c5226c 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -99,7 +99,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // open objects #ifdef ENABLE_MPI @@ -373,83 +373,83 @@ main(int argc, char **argv) PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); free(x); free(y); diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index ce830402a..877f41080 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -543,36 +543,36 @@ main(int argc, char **argv) transfer_close += MPI_Wtime() - start; #endif if (PDCregion_close(region_xx) < 0) { - LOG_ERROR("fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_ERROR("fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_ERROR("fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_ERROR("fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_ERROR("fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_ERROR("fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_ERROR("fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_ERROR("fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); return 1; } } @@ -584,35 +584,35 @@ main(int argc, char **argv) for (i = 0; i < timestep; ++i) { if (PDCobj_close(obj_xx[i]) < 0) { - LOG_ERROR("fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy[i]) < 0) { - LOG_ERROR("fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz[i]) < 0) { - LOG_ERROR("fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx[i]) < 0) { - LOG_ERROR("fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy[i]) < 0) { - LOG_ERROR("fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz[i]) < 0) { - LOG_ERROR("fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11[i]) < 0) { - LOG_ERROR("fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22[i]) < 0) { - LOG_ERROR("fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return 1; } } @@ -663,40 +663,40 @@ main(int argc, char **argv) free(obj_id22); if (PDCregion_close(region_x) < 0) { - LOG_ERROR("fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_ERROR("fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_ERROR("fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_ERROR("fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_ERROR("fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_ERROR("fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_ERROR("fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_ERROR("fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } free(offset); diff --git a/examples/bdcats_old.c b/examples/bdcats_old.c index 9d3cf805b..07728a54f 100644 --- a/examples/bdcats_old.c +++ b/examples/bdcats_old.c @@ -95,7 +95,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); @@ -300,83 +300,83 @@ main(int argc, char **argv) PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); free(x); free(y); diff --git a/examples/haccio.c b/examples/haccio.c index 0d2025aad..2710fcb0c 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -142,7 +142,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCreg_obtain_lock(obj_ids[i], region_remote_ids[i], PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_ERROR("Fail to obtain lock"); + LOG_ERROR("Failed to obtain lock"); } } MPI_Barrier(MPI_COMM_WORLD); @@ -174,7 +174,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCreg_release_lock(obj_ids[i], region_remote_ids[i], PDC_WRITE); if (ret != SUCCEED) { - LOG_ERROR("Fail to release lock"); + LOG_ERROR("Failed to release lock"); } } MPI_Barrier(MPI_COMM_WORLD); @@ -184,7 +184,7 @@ main(int argc, char **argv) for (i = 0; i < NUM_VARS; i++) { ret = PDCbuf_obj_unmap(obj_ids[i], region_remote_ids[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to unmap"); + LOG_ERROR("Failed to unmap"); } } MPI_Barrier(MPI_COMM_WORLD); diff --git a/examples/llsm/llsm_importer.c b/examples/llsm/llsm_importer.c index bd68c856c..0564049b7 100644 --- a/examples/llsm/llsm_importer.c +++ b/examples/llsm/llsm_importer.c @@ -295,12 +295,12 @@ main(int argc, char *argv[]) // create a container property cont_prop_g = PDCprop_create(PDC_CONT_CREATE, pdc_id_g); if (cont_prop_g <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id_g = PDCcont_create("c1", cont_prop_g); if (cont_id_g <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // Rank 0 reads the filename list and distribute data to other ranks if (rank == 0) { @@ -341,7 +341,7 @@ main(int argc, char *argv[]) // parse the csv csv_table_t *csv_table = csv_parse_list(list, csv_field_types); if (csv_table == NULL) { - LOG_ERROR("Fail to parse csv file"); + LOG_ERROR("Failed to parse csv file"); return -1; } llsm_args = (llsm_importer_args_t *)malloc(sizeof(llsm_importer_args_t)); diff --git a/examples/obj_get_data.c b/examples/obj_get_data.c index 6afdff93a..bfb1c2f41 100644 --- a/examples/obj_get_data.c +++ b/examples/obj_get_data.c @@ -56,7 +56,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -66,7 +66,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } @@ -77,7 +77,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name1); } else { - LOG_ERROR("Fail to put data into object"); + LOG_ERROR("Failed to put data into object"); ret_value = 1; } @@ -88,14 +88,14 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name2); } else { - LOG_ERROR("Fail to put data into object"); + LOG_ERROR("Failed to put data into object"); ret_value = 1; } memset(data, 0, 128 * sizeof(double)); error_code = PDCobj_get_data(obj1, (void *)(data), 16 * sizeof(double)); if (error_code != SUCCEED) { - LOG_ERROR("Fail to get obj 1 data\n"); + LOG_ERROR("Failed to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < 16 * sizeof(double); ++i) { @@ -108,7 +108,7 @@ main(int argc, char **argv) memset(data, 0, 128 * sizeof(double)); error_code = PDCobj_get_data(obj2, (void *)(data), 128 * sizeof(double)); if (error_code != SUCCEED) { - LOG_ERROR("Fail to get obj 1 data\n"); + LOG_ERROR("Failed to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < 128 * sizeof(double); ++i) { @@ -121,14 +121,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -137,7 +137,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -145,7 +145,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -153,7 +153,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/pdc_init.c b/examples/pdc_init.c index b06a2bc73..6a84d0816 100644 --- a/examples/pdc_init.c +++ b/examples/pdc_init.c @@ -46,7 +46,7 @@ main(int argc, char **argv) // close pdc if (PDCclose(pdc) < 0) { - LOGI("fail to close PDC\n"); + LOGI("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index a09e12bfc..7aa15998a 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -135,26 +135,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -177,7 +177,7 @@ main(int argc, char **argv) #endif if (obj1 <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -215,16 +215,16 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -235,7 +235,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Fail to open object"); + LOG_ERROR("Failed to open object"); ret_value = 1; } @@ -282,17 +282,17 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -301,22 +301,22 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/read_write_perf.c b/examples/read_write_perf.c index 2db091c76..923fdae1a 100644 --- a/examples/read_write_perf.c +++ b/examples/read_write_perf.c @@ -129,26 +129,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -165,7 +165,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -207,16 +207,16 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -227,7 +227,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Fail to open object"); + LOG_ERROR("Failed to open object"); ret_value = 1; } @@ -274,17 +274,17 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -293,22 +293,22 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/region_transfer_2D.c b/examples/region_transfer_2D.c index 5b82228eb..95c6a30f5 100644 --- a/examples/region_transfer_2D.c +++ b/examples/region_transfer_2D.c @@ -68,7 +68,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -87,13 +87,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -109,7 +109,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -143,7 +143,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -151,7 +151,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -183,7 +183,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -191,7 +191,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -200,14 +200,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -215,7 +215,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -223,7 +223,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -231,7 +231,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -241,7 +241,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/region_transfer_3D.c b/examples/region_transfer_3D.c index 35156f732..ad5f36b49 100644 --- a/examples/region_transfer_3D.c +++ b/examples/region_transfer_3D.c @@ -69,7 +69,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -79,7 +79,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -88,13 +88,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -110,7 +110,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -120,7 +120,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -154,7 +154,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -188,7 +188,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -196,7 +196,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -205,14 +205,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -220,7 +220,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -228,7 +228,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -236,7 +236,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -246,7 +246,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/examples/tileio.c b/examples/tileio.c index 46d6a7cee..c1060669e 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -133,7 +133,7 @@ main(int argc, char **argv) time_acquire_lock = MPI_Wtime(); ret = PDCreg_obtain_lock(obj_id, global_region_id, PDC_WRITE, PDC_NOBLOCK); if (ret != SUCCEED) { - LOG_ERROR("Fail to obtain lock"); + LOG_ERROR("Failed to obtain lock"); } MPI_Barrier(MPI_COMM_WORLD); time_acquire_lock = MPI_Wtime() - time_acquire_lock; @@ -153,7 +153,7 @@ main(int argc, char **argv) time_release_lock = MPI_Wtime(); ret = PDCreg_release_lock(obj_id, global_region_id, PDC_WRITE); if (ret != SUCCEED) { - LOG_ERROR("Fail to release lock"); + LOG_ERROR("Failed to release lock"); } MPI_Barrier(MPI_COMM_WORLD); time_release_lock = MPI_Wtime() - time_release_lock; @@ -161,7 +161,7 @@ main(int argc, char **argv) // Unmap object ret = PDCbuf_obj_unmap(obj_id, global_region_id); if (ret != SUCCEED) { - LOG_ERROR("Fail to unmap"); + LOG_ERROR("Failed to unmap"); } // TODO delete before close ? PDCobj_close(obj_id); diff --git a/examples/vpicio.c b/examples/vpicio.c index 8aa27683d..566b9443c 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -112,13 +112,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return 1; } // create an object property @@ -407,146 +407,146 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj_xx) < 0) { - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Failed to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Failed to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Failed to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Failed to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Failed to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Failed to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Failed to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Failed to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } free(offset); diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index c5092bada..7d71d3cdf 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -145,13 +145,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return 1; } // create an object property @@ -608,35 +608,35 @@ main(int argc, char **argv) #endif if (PDCregion_close(region_xx) < 0) { - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); return 1; } if (PDCregion_close(region_id11) < 0) { - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); return 1; } if (PDCregion_close(region_id22) < 0) { - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); return 1; } MPI_Barrier(MPI_COMM_WORLD); @@ -649,35 +649,35 @@ main(int argc, char **argv) PDC_timing_report("write"); for (i = 0; i < timestamps; ++i) { if (PDCobj_close(obj_xx[i]) < 0) { - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy[i]) < 0) { - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz[i]) < 0) { - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx[i]) < 0) { - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy[i]) < 0) { - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz[i]) < 0) { - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11[i]) < 0) { - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22[i]) < 0) { - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return 1; } } @@ -731,81 +731,81 @@ main(int argc, char **argv) free(obj_id11); free(obj_id22); if (PDCprop_close(obj_prop_xx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Failed to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Failed to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Failed to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Failed to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Failed to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Failed to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Failed to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Failed to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } free(offset); diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index c098935e9..624f151c8 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -109,13 +109,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return 1; } // create an object property @@ -394,146 +394,146 @@ main(int argc, char **argv) } PDC_timing_report("write"); if (PDCobj_close(obj_xx) < 0) { - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Failed to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Failed to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Failed to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Failed to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Failed to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Failed to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Failed to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Failed to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } free(offset); diff --git a/src/api/close_server.c b/src/api/close_server.c index 5ad2d8c4c..b3bdcdb1c 100644 --- a/src/api/close_server.c +++ b/src/api/close_server.c @@ -49,7 +49,7 @@ main(int argc, char *argv[]) PDC_Client_close_all_server(); if (PDCclose(pdc) < 0) - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI if (!rank) { diff --git a/src/api/pdc.c b/src/api/pdc.c index f2f3b68cb..dee2a7f76 100644 --- a/src/api/pdc.c +++ b/src/api/pdc.c @@ -180,35 +180,35 @@ PDCclose(pdcid_t pdcid) // check every list before closing // container property if (PDC_prop_cont_list_null() < 0) - PGOTO_ERROR(FAIL, "fail to close container property"); + PGOTO_ERROR(FAIL, "Failed to close container property"); // object property if (PDC_prop_obj_list_null() < 0) - PGOTO_ERROR(FAIL, "fail to close object property"); + PGOTO_ERROR(FAIL, "Failed to close object property"); // container if (PDC_cont_list_null() < 0) - PGOTO_ERROR(FAIL, "fail to close container"); + PGOTO_ERROR(FAIL, "Failed to close container"); // object if (PDC_obj_list_null() < 0) - PGOTO_ERROR(FAIL, "fail to close object"); + PGOTO_ERROR(FAIL, "Failed to close object"); // region if (PDC_region_list_null() < 0) - PGOTO_ERROR(FAIL, "fail to close region"); + PGOTO_ERROR(FAIL, "Failed to close region"); if (PDC_prop_end() < 0) - PGOTO_ERROR(FAIL, "fail to destroy property"); + PGOTO_ERROR(FAIL, "Failed to destroy property"); if (PDC_cont_end() < 0) - PGOTO_ERROR(FAIL, "fail to destroy container"); + PGOTO_ERROR(FAIL, "Failed to destroy container"); if (PDC_obj_end() < 0) - PGOTO_ERROR(FAIL, "fail to destroy object"); + PGOTO_ERROR(FAIL, "Failed to destroy object"); if (PDC_region_end() < 0) - PGOTO_ERROR(FAIL, "fail to destroy region"); + PGOTO_ERROR(FAIL, "Failed to destroy region"); if (PDC_iterator_end() < 0) - PGOTO_ERROR(FAIL, "fail to destroy iterator"); + PGOTO_ERROR(FAIL, "Failed to destroy iterator"); if (PDC_analysis_end() < 0) - PGOTO_ERROR(FAIL, "fail to destroy analysis"); + PGOTO_ERROR(FAIL, "Failed to destroy analysis"); if (PDC_transform_end() < 0) - PGOTO_ERROR(FAIL, "fail to destroy transform"); + PGOTO_ERROR(FAIL, "Failed to destroy transform"); PDC_class_close(pdcid); diff --git a/src/api/pdc_obj/pdc_cont.c b/src/api/pdc_obj/pdc_cont.c index 4366c4156..5b2bd1e9d 100644 --- a/src/api/pdc_obj/pdc_cont.c +++ b/src/api/pdc_obj/pdc_cont.c @@ -206,7 +206,7 @@ PDC_cont_list_null() nelemts = PDC_id_list_null(PDC_CONT); if (nelemts > 0) { if (PDC_id_list_clear(PDC_CONT) < 0) - PGOTO_ERROR(FAIL, "fail to clear container list"); + PGOTO_ERROR(FAIL, "Failed to clear container list"); } done: diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 737ba4220..18e62382e 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -380,7 +380,7 @@ PDC_obj_list_null() nelemts = PDC_id_list_null(PDC_OBJ); if (nelemts > 0) { if (PDC_id_list_clear(PDC_OBJ) < 0) - PGOTO_ERROR(FAIL, "fail to clear object list"); + PGOTO_ERROR(FAIL, "Failed to clear object list"); } done: diff --git a/src/api/pdc_obj/pdc_prop.c b/src/api/pdc_obj/pdc_prop.c index 65f1985ec..575193c96 100644 --- a/src/api/pdc_obj/pdc_prop.c +++ b/src/api/pdc_obj/pdc_prop.c @@ -192,7 +192,7 @@ PDC_prop_cont_list_null() nelemts = PDC_id_list_null(PDC_CONT_PROP); if (nelemts > 0) { if (PDC_id_list_clear(PDC_CONT_PROP) < 0) - PGOTO_ERROR(FAIL, "fail to clear container property list"); + PGOTO_ERROR(FAIL, "Failed to clear container property list"); } done: @@ -212,7 +212,7 @@ PDC_prop_obj_list_null() nelemts = PDC_id_list_null(PDC_OBJ_PROP); if (nelemts > 0) { if (PDC_id_list_clear(PDC_OBJ_PROP) < 0) - PGOTO_ERROR(FAIL, "fail to clear obj property list"); + PGOTO_ERROR(FAIL, "Failed to clear obj property list"); } done: diff --git a/src/api/pdc_region/pdc_region.c b/src/api/pdc_region/pdc_region.c index 5b5aa1fe3..b4a6d8a66 100644 --- a/src/api/pdc_region/pdc_region.c +++ b/src/api/pdc_region/pdc_region.c @@ -88,7 +88,7 @@ PDC_region_list_null() nelemts = PDC_id_list_null(PDC_REGION); if (nelemts > 0) { if (PDC_id_list_clear(PDC_REGION) < 0) - PGOTO_ERROR(FAIL, "fail to clear object list"); + PGOTO_ERROR(FAIL, "Failed to clear object list"); } done: diff --git a/src/commons/index/dart/index/idioms/idioms_local_index_test.c b/src/commons/index/dart/index/idioms/idioms_local_index_test.c index 343d86c2d..e934b4060 100644 --- a/src/commons/index/dart/index/idioms/idioms_local_index_test.c +++ b/src/commons/index/dart/index/idioms/idioms_local_index_test.c @@ -460,13 +460,13 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) switch (query_series) { case 0: if (nres != 1) { - LOG_ERROR("fail to query kvtag [%s] with rank %d. Expect 1 result but got %d result\n", + LOG_ERROR("Failed to query kvtag [%s] with rank %d. Expect 1 result but got %d result\n", "str109str=str109str", world_rank, nres); step_failed = 0; } if (pdc_ids[0] != 109) { LOG_ERROR( - "fail to query kvtag [%s] with rank %d. Expect 1 result which is 109, but got result " + "Failed to query kvtag [%s] with rank %d. Expect 1 result which is 109, but got result " "%" PRIu64 ".\n", "str109str=str109str", world_rank, pdc_ids[0]); step_failed = 0; @@ -474,7 +474,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 1: if (nres != 10) { - LOG_ERROR("fail to query kvtag [%s] with rank %d. Expect 10 Result, but got %d result.\n", + LOG_ERROR("Failed to query kvtag [%s] with rank %d. Expect 10 Result, but got %d result.\n", "str09*=str09*", world_rank, nres); step_failed = 1; } @@ -483,7 +483,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { LOG_ERROR( - "fail to query kvtag [%s] with rank %d. The %d th result does not match. Expect " + "Failed to query kvtag [%s] with rank %d. The %d th result does not match. Expect " "%d, but got %" PRIu64 "\n", "str09*=str09*", world_rank, i, i + 90, pdc_ids[i]); step_failed = 1; @@ -493,7 +493,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 2: if (nres != 10) { - LOG_ERROR("fail to query kvtag [%s] with rank %d. Expect 10 result, but got %d result.\n", + LOG_ERROR("Failed to query kvtag [%s] with rank %d. Expect 10 result, but got %d result.\n", "*09str=*09str", world_rank, nres); step_failed = 2; } @@ -502,7 +502,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) for (i = 0; i < nres; i++) { if (pdc_ids[i] != i * 10 + 9) { LOG_ERROR( - "fail to query kvtag [%s] with rank %d. The $d th result does not match. Expect " + "Failed to query kvtag [%s] with rank %d. The $d th result does not match. Expect " "%d, but got %" PRIu64 "\n", "*09str=*09str", world_rank, i, i * 10 + 9, pdc_ids[i]); step_failed = 2; @@ -512,7 +512,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 3: if (nres != 20) { - LOG_ERROR("fail to query kvtag [%s] with rank %d. Expected 20 results, but got %d results\n", + LOG_ERROR("Failed to query kvtag [%s] with rank %d. Expected 20 results, but got %d results\n", "*09*=*09*", world_rank, nres); step_failed = 3; } @@ -523,7 +523,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) for (i = 0; i < nres; i++) { if (pdc_ids[i] != expected[i]) { LOG_ERROR( - "fail to query kvtag [%s] with rank %d. The %d th result does not match. Expect " + "Failed to query kvtag [%s] with rank %d. The %d th result does not match. Expect " "%" PRIu64 ", but got %" PRIu64 " results.\n", "*09*=*09*", world_rank, i, expected[i], pdc_ids[i]); step_failed = 3; @@ -533,13 +533,13 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 4: if (nres != 1) { - LOG_ERROR("fail to query kvtag [%s] with rank %d. Expected 1 result, but got %d results\n", + LOG_ERROR("Failed to query kvtag [%s] with rank %d. Expected 1 result, but got %d results\n", "intkey=109", world_rank, nres); step_failed = 4; } if (pdc_ids[0] != 109) { LOG_ERROR( - "fail to query kvtag [%s] with rank %d. Expected 1 result which is 109, but got %" PRIu64 + "Failed to query kvtag [%s] with rank %d. Expected 1 result which is 109, but got %" PRIu64 "\n", "intkey=109", world_rank, pdc_ids[0]); step_failed = 4; @@ -548,7 +548,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) case 5: if (nres != 10) { LOG_ERROR( - "fail to query kvtag [%s] with rank %d. Expected 10 results, but got %d results. \n", + "Failed to query kvtag [%s] with rank %d. Expected 10 results, but got %d results. \n", "intkey=90|~|99", world_rank, nres); step_failed = 5; } @@ -557,7 +557,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { LOG_ERROR( - "fail to query kvtag [%s] with rank %d. The %d th result does not match, expect " + "Failed to query kvtag [%s] with rank %d. The %d th result does not match, expect " "%d but got %" PRIu64 "\n", "intkey=90|~|99", world_rank, i, i + 90, pdc_ids[i]); step_failed = 5; diff --git a/src/tests/bdcats.c b/src/tests/bdcats.c index db5d4b34d..228aa1b2e 100644 --- a/src/tests/bdcats.c +++ b/src/tests/bdcats.c @@ -99,7 +99,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); @@ -341,83 +341,83 @@ main(int argc, char **argv) PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); free(x); free(y); diff --git a/src/tests/bdcats_old.c b/src/tests/bdcats_old.c index 653dfc631..7570988a4 100644 --- a/src/tests/bdcats_old.c +++ b/src/tests/bdcats_old.c @@ -95,7 +95,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); @@ -300,83 +300,83 @@ main(int argc, char **argv) PDC_timing_report("read"); if (PDCobj_close(obj_xx) < 0) - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); free(x); free(y); diff --git a/src/tests/bdcats_v2.c b/src/tests/bdcats_v2.c index c6c2a83a8..e945cdeaf 100644 --- a/src/tests/bdcats_v2.c +++ b/src/tests/bdcats_v2.c @@ -94,7 +94,7 @@ main(int argc, char **argv) // open a container cont_id = PDCcont_open("c1", pdc_id); if (cont_id == 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); @@ -377,83 +377,83 @@ main(int argc, char **argv) } if (PDCobj_close(obj_xx) < 0) - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); free(x); free(y); diff --git a/src/tests/blocked_lock.c b/src/tests/blocked_lock.c index 090b09218..d821b088f 100644 --- a/src/tests/blocked_lock.c +++ b/src/tests/blocked_lock.c @@ -71,12 +71,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -151,18 +151,18 @@ main(int argc, char **argv) LOG_ERROR("region unmap failed\n"); if (PDCobj_close(obj2) < 0) - LOG_ERROR("Fail to close obj2\n"); + LOG_ERROR("Failed to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDC_close(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/buf_map_mpi_v2.c b/src/tests/buf_map_mpi_v2.c index ebab67991..db965755c 100644 --- a/src/tests/buf_map_mpi_v2.c +++ b/src/tests/buf_map_mpi_v2.c @@ -85,12 +85,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -161,18 +161,18 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj2) < 0) - LOG_ERROR("Fail to close obj2\n"); + LOG_ERROR("Failed to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/buf_obj_map.c b/src/tests/buf_obj_map.c index e1fbcaf8f..5ade41ca4 100644 --- a/src/tests/buf_obj_map.c +++ b/src/tests/buf_obj_map.c @@ -56,12 +56,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -100,25 +100,25 @@ main(int argc, char **argv) // close region if (PDCregion_close(r1) < 0) - LOG_ERROR("Fail to close region r1\n"); + LOG_ERROR("Failed to close region r1\n"); if (PDCregion_close(r2) < 0) - LOG_ERROR("Fail to close region r2\n"); + LOG_ERROR("Failed to close region r2\n"); // close object if (PDCobj_close(obj2) < 0) - LOG_ERROR("Fail to close obj2\n"); + LOG_ERROR("Failed to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/buf_obj_map_mpi.c b/src/tests/buf_obj_map_mpi.c index 81bff7673..8e71b6401 100644 --- a/src/tests/buf_obj_map_mpi.c +++ b/src/tests/buf_obj_map_mpi.c @@ -76,12 +76,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -153,18 +153,18 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj2) < 0) - LOG_ERROR("Fail to close obj2\n"); + LOG_ERROR("Failed to close obj2\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/consistency_semantics.c b/src/tests/consistency_semantics.c index 798f4fa4a..3f64d5c45 100644 --- a/src/tests/consistency_semantics.c +++ b/src/tests/consistency_semantics.c @@ -68,7 +68,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -87,13 +87,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -110,7 +110,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -120,7 +120,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -154,7 +154,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -188,7 +188,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -196,7 +196,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -205,14 +205,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -220,7 +220,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -228,7 +228,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -236,7 +236,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -246,7 +246,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_add_del.c b/src/tests/cont_add_del.c index a13e65782..a0bb80043 100644 --- a/src/tests/cont_add_del.c +++ b/src/tests/cont_add_del.c @@ -124,20 +124,20 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create NCONT container for (i = 0; i < NCONT; i++) { sprintf(cont_name, "Cont%d", i); cont[i] = PDCcont_create(cont_name, cont_prop); if (cont[i] <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); PDCprop_set_obj_type(obj_prop, PDC_INT); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -229,15 +229,15 @@ main(int argc, char **argv) // close all container for (i = 0; i < NCONT; i++) { if (PDCcont_close(cont[i]) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/cont_del.c b/src/tests/cont_del.c index b6120de2e..06ac70706 100644 --- a/src/tests/cont_del.c +++ b/src/tests/cont_del.c @@ -53,7 +53,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -62,17 +62,17 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } ret = PDCcont_del(cont); if (ret != SUCCEED) { - LOG_ERROR("Fail to delete container"); + LOG_ERROR("Failed to delete container"); ret_value = 1; } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -86,7 +86,7 @@ main(int argc, char **argv) // close a container property if (PDCprop_close(create_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -94,7 +94,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_getid.c b/src/tests/cont_getid.c index c0500e5eb..9a6abadaf 100644 --- a/src/tests/cont_getid.c +++ b/src/tests/cont_getid.c @@ -48,13 +48,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -63,7 +63,7 @@ main(int argc, char **argv) cont_id2 = PDCcont_open("c1", pdc_id); if (cont_id2 == 0) { - LOG_ERROR("Fail to open container"); + LOG_ERROR("Failed to open container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -72,25 +72,25 @@ main(int argc, char **argv) cont_id3 = PDCcont_get_id("c1", pdc_id); if (PDCcont_close(cont_id3) < 0) { - LOG_ERROR("Fail to close container cont_id3\n"); + LOG_ERROR("Failed to close container cont_id3\n"); ret_value = 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_ERROR("Fail to close container cont_id1\n"); + LOG_ERROR("Failed to close container cont_id1\n"); ret_value = 1; } if (PDCcont_close(cont_id2) < 0) { - LOG_ERROR("Fail to close container cont_id2\n"); + LOG_ERROR("Failed to close container cont_id2\n"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_info.c b/src/tests/cont_info.c index e68a579ba..9315ecb61 100644 --- a/src/tests/cont_info.c +++ b/src/tests/cont_info.c @@ -48,12 +48,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -61,7 +61,7 @@ main(int argc, char **argv) cont_id2 = PDCcont_open("c1", pdc_id); if (cont_id2 == 0) - LOG_ERROR("Fail to open container"); + LOG_ERROR("Failed to open container"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif @@ -74,17 +74,17 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container cont_id1\n"); + LOG_ERROR("Failed to close container cont_id1\n"); if (PDCcont_close(cont_id2) < 0) - LOG_ERROR("Fail to close container cont_id2\n"); + LOG_ERROR("Failed to close container cont_id2\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/cont_iter.c b/src/tests/cont_iter.c index 9ab9c18b8..2bee74b8e 100644 --- a/src/tests/cont_iter.c +++ b/src/tests/cont_iter.c @@ -51,7 +51,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -60,7 +60,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create second container @@ -69,7 +69,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c2\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create third container @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c3\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // start container iteration @@ -93,7 +93,7 @@ main(int argc, char **argv) // close cont1 if (PDCcont_close(cont1) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -101,7 +101,7 @@ main(int argc, char **argv) } // close cont2 if (PDCcont_close(cont2) < 0) { - LOG_ERROR("Fail to close container c2\n"); + LOG_ERROR("Failed to close container c2\n"); ret_value = 1; } else { @@ -109,7 +109,7 @@ main(int argc, char **argv) } // close cont3 if (PDCcont_close(cont3) < 0) { - LOG_ERROR("Fail to close container c3\n"); + LOG_ERROR("Failed to close container c3\n"); ret_value = 1; } else { @@ -117,7 +117,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(create_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -125,7 +125,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_iter_mt.c b/src/tests/cont_iter_mt.c index b56985e2e..4868c0507 100644 --- a/src/tests/cont_iter_mt.c +++ b/src/tests/cont_iter_mt.c @@ -86,19 +86,19 @@ TestThread(void *ThreadArgs) // close cont1 if (PDCcont_close(cont1) < 0) - LOG_ERROR("Fail to close container %lld\n", cont1); + LOG_ERROR("Failed to close container %lld\n", cont1); else LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont1); // close cont2 if (PDCcont_close(cont2) < 0) - LOG_ERROR("Fail to close container %lld\n", cont2); + LOG_ERROR("Failed to close container %lld\n", cont2); else LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont2); // close cont3 if (PDCcont_close(cont3) < 0) - LOG_ERROR("Fail to close container %lld\n", cont3); + LOG_ERROR("Failed to close container %lld\n", cont3); else LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont3); @@ -152,7 +152,7 @@ main(int argc, char **argv) // close pdc if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); else LOG_INFO("PDC is closed\n"); diff --git a/src/tests/cont_life.c b/src/tests/cont_life.c index fa249a545..bfa619d67 100644 --- a/src/tests/cont_life.c +++ b/src/tests/cont_life.c @@ -50,7 +50,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // print default container lifetime (persistent) @@ -63,7 +63,7 @@ main(int argc, char **argv) LOG_INFO("Create a container, c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // set container lifetime to transient @@ -78,7 +78,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -86,7 +86,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(create_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -94,7 +94,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/cont_life_mt.c b/src/tests/cont_life_mt.c index c4982c80a..3c13b7dc2 100644 --- a/src/tests/cont_life_mt.c +++ b/src/tests/cont_life_mt.c @@ -142,7 +142,7 @@ main(int argc, char **argv) // close pdc if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); else LOG_INFO("PDC is closed\n"); diff --git a/src/tests/cont_tags.c b/src/tests/cont_tags.c index 554154b28..0d25494c5 100644 --- a/src/tests/cont_tags.c +++ b/src/tests/cont_tags.c @@ -56,7 +56,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); return -1; } // create a container @@ -65,7 +65,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return -1; } @@ -74,7 +74,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c2\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return -1; } @@ -174,7 +174,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return -1; } else { @@ -182,7 +182,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont2) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return -1; } else { @@ -191,7 +191,7 @@ main(int argc, char **argv) // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return -1; } else { @@ -199,7 +199,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return -1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_cont.c b/src/tests/create_cont.c index a6986b005..6cdac0245 100644 --- a/src/tests/create_cont.c +++ b/src/tests/create_cont.c @@ -51,7 +51,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -60,12 +60,12 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -73,7 +73,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(create_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -81,7 +81,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_cont_coll.c b/src/tests/create_cont_coll.c index 0c113eb24..50826929a 100644 --- a/src/tests/create_cont_coll.c +++ b/src/tests/create_cont_coll.c @@ -51,7 +51,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -60,12 +60,12 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -73,7 +73,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(create_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -81,7 +81,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_obj.c b/src/tests/create_obj.c index fec4590c9..4554387ed 100644 --- a/src/tests/create_obj.c +++ b/src/tests/create_obj.c @@ -53,7 +53,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -63,7 +63,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -72,7 +72,7 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } // create first object @@ -82,7 +82,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -92,12 +92,12 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // close first object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { @@ -105,7 +105,7 @@ main(int argc, char **argv) } // close second object if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -113,7 +113,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -121,7 +121,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -129,7 +129,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_obj_scale.c b/src/tests/create_obj_scale.c index 650044778..f618fae3e 100644 --- a/src/tests/create_obj_scale.c +++ b/src/tests/create_obj_scale.c @@ -125,12 +125,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create_col("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); char *cont_tags = "cont_tags0=123"; if (rank == 0) { @@ -140,7 +140,7 @@ main(int argc, char **argv) // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); PDCprop_set_obj_type(obj_prop, PDC_INT); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -225,14 +225,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/create_prop.c b/src/tests/create_prop.c index 9c7bb1fb6..90b30ae65 100644 --- a/src/tests/create_prop.c +++ b/src/tests/create_prop.c @@ -47,25 +47,25 @@ main(int argc, char **argv) // create an object property create_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop1 <= 0) { - LOG_ERROR("Fail to create"); + LOG_ERROR("Failed to create"); ret_value = 1; } // create another object property create_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop2 <= 0) { - LOG_ERROR("Fail to create"); + LOG_ERROR("Failed to create"); ret_value = 1; } if (PDCprop_close(create_prop1) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { LOG_INFO("successfully close first property\n"); } if (PDCprop_close(create_prop2) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -80,12 +80,12 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create"); + LOG_ERROR("Failed to create"); ret_value = 1; } // close property if (PDCprop_close(create_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -93,7 +93,7 @@ main(int argc, char **argv) } // close a pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/create_region.c b/src/tests/create_region.c index f09158c4d..a7ed5e6eb 100644 --- a/src/tests/create_region.c +++ b/src/tests/create_region.c @@ -66,7 +66,7 @@ main(int argc, char **argv) // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } diff --git a/src/tests/dart_attr_dist_test.c b/src/tests/dart_attr_dist_test.c index 9295bdfe3..a619d36c8 100644 --- a/src/tests/dart_attr_dist_test.c +++ b/src/tests/dart_attr_dist_test.c @@ -149,16 +149,16 @@ main(int argc, char *argv[]) pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); sprintf(pdc_container_name, "c1_%d", rank); pdcid_t cont = PDCcont_create(pdc_container_name, cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -172,7 +172,7 @@ main(int argc, char *argv[]) sprintf(pdc_obj_name, "obj%d", i); obj_ids[i] = PDCobj_create(cont, pdc_obj_name, obj_prop); if (obj_ids[i] <= 0) - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); } else { obj_ids[i] = -1; @@ -222,7 +222,7 @@ main(int argc, char *argv[]) // attach attribute to object timer_start(&timer_obj); if (PDCobj_put_tag(obj_ids[j], key, (void *)&val, PDC_INT, sizeof(int)) < 0) - LOG_ERROR("Fail to add a kvtag to o%d\n", j); + LOG_ERROR("Failed to add a kvtag to o%d\n", j); timer_pause(&timer_obj); duration_obj_ms += (double)timer_delta_ms(&timer_obj); } @@ -305,7 +305,7 @@ main(int argc, char *argv[]) // naive query methods if (PDC_Client_query_kvtag(&kvtag, &rest_count1, &out1) < 0) { - LOG_ERROR("Fail to query kvtag\n"); + LOG_ERROR("Failed to query kvtag\n"); break; } } @@ -361,13 +361,13 @@ main(int argc, char *argv[]) total_num_attr, total_num_obj, size, total_time); if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container %lld\n", cont); + LOG_ERROR("Failed to close container %lld\n", cont); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); // free attr_2_obj_array free(attr_2_obj_array); diff --git a/src/tests/dart_func_test.c b/src/tests/dart_func_test.c index a884c5ec3..e4b34313a 100644 --- a/src/tests/dart_func_test.c +++ b/src/tests/dart_func_test.c @@ -37,15 +37,15 @@ main(int argc, char **argv) pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); dart_object_ref_type_t ref_type = REF_PRIMARY_ID; dart_hash_algo_t hash_algo = DART_HASH; @@ -94,13 +94,13 @@ main(int argc, char **argv) // done: if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container %lld\n", cont); + LOG_ERROR("Failed to close container %lld\n", cont); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); // } #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index 50ab98cd3..baee6b791 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -186,15 +186,15 @@ main(int argc, char **argv) pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); DART *dart_g = get_dart_g(); dart_g->replication_factor = replication_factor; @@ -590,13 +590,13 @@ main(int argc, char **argv) // done: if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container %lld\n", cont); + LOG_ERROR("Failed to close container %lld\n", cont); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_rw_test.c b/src/tests/data_rw_test.c index b9baa731f..e79517170 100644 --- a/src/tests/data_rw_test.c +++ b/src/tests/data_rw_test.c @@ -27,7 +27,7 @@ create_obj(char *obj_name, uint32_t ndim, uint64_t *dims) pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); PDCprop_set_obj_dims(obj_prop, ndim, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -822,12 +822,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); test1d("test_obj_1d"); @@ -848,14 +848,14 @@ main(int argc, char **argv) // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_meta.c b/src/tests/data_server_meta.c index bf837b041..844383e5d 100644 --- a/src/tests/data_server_meta.c +++ b/src/tests/data_server_meta.c @@ -93,18 +93,18 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container i = 0 sprintf(cont_name, "Cont%d", i); cont[i] = PDCcont_create(cont_name, cont_prop); if (cont[i] <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); PDCprop_set_obj_type(obj_prop, PDC_INT); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -143,14 +143,14 @@ main(int argc, char **argv) done: // close all container if (PDCcont_close(cont[0]) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_meta_test.c b/src/tests/data_server_meta_test.c index 6ca6ee485..ed9b4cb48 100644 --- a/src/tests/data_server_meta_test.c +++ b/src/tests/data_server_meta_test.c @@ -56,17 +56,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); PDCprop_set_obj_dims(obj_prop, 1, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -147,14 +147,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read.c b/src/tests/data_server_read.c index 38dbc9f8e..4bd096aff 100644 --- a/src/tests/data_server_read.c +++ b/src/tests/data_server_read.c @@ -54,12 +54,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); PDC_Client_query_metadata_name_timestep(argv[1], 0, &metadata); @@ -98,14 +98,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read_multi.c b/src/tests/data_server_read_multi.c index 8b8249b9b..798325105 100644 --- a/src/tests/data_server_read_multi.c +++ b/src/tests/data_server_read_multi.c @@ -64,21 +64,21 @@ main(int argc, char **argv) // create a container property pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); goto done; } // create a container pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); goto done; } // create an object property pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); goto done; } @@ -189,14 +189,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container %ld\n", cont); + LOG_ERROR("Failed to close container %ld\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read_vpic.c b/src/tests/data_server_read_vpic.c index 721b1c92c..b0103c2be 100644 --- a/src/tests/data_server_read_vpic.c +++ b/src/tests/data_server_read_vpic.c @@ -103,12 +103,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // Query obj metadata and create read region one by one for (i = 0; i < NUM_VAR; i++) { @@ -224,13 +224,13 @@ main(int argc, char **argv) fflush(stdout); if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close container property\n"); + LOG_ERROR("Failed to close container property\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_read_vpic_multits.c b/src/tests/data_server_read_vpic_multits.c index 81c7bcb5f..f17735434 100644 --- a/src/tests/data_server_read_vpic_multits.c +++ b/src/tests/data_server_read_vpic_multits.c @@ -137,12 +137,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // Float vars are first in the array follow by int vars for (i = 0; i < n_var; i++) { @@ -345,13 +345,13 @@ main(int argc, char **argv) done: if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close container property\n"); + LOG_ERROR("Failed to close container property\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/data_server_read_vpic_spatial.c b/src/tests/data_server_read_vpic_spatial.c index 81fcdcaac..9a68cf512 100644 --- a/src/tests/data_server_read_vpic_spatial.c +++ b/src/tests/data_server_read_vpic_spatial.c @@ -126,12 +126,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // Query obj metadata and create read region one by one for (i = 0; i < NUM_VAR; i++) { @@ -218,13 +218,13 @@ main(int argc, char **argv) fflush(stdout); if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close container property\n"); + LOG_ERROR("Failed to close container property\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/data_server_read_vpic_spatial_multits.c b/src/tests/data_server_read_vpic_spatial_multits.c index a67da9c2a..a10c2ad29 100644 --- a/src/tests/data_server_read_vpic_spatial_multits.c +++ b/src/tests/data_server_read_vpic_spatial_multits.c @@ -142,12 +142,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // Float vars are first in the array follow by int vars for (i = 0; i < n_var; i++) { @@ -352,13 +352,13 @@ main(int argc, char **argv) done: if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close container property\n"); + LOG_ERROR("Failed to close container property\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/data_server_write.c b/src/tests/data_server_write.c index d401f8e37..aa26d0ab9 100644 --- a/src/tests/data_server_write.c +++ b/src/tests/data_server_write.c @@ -60,17 +60,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); my_data_size = size_MB / size; dims[0] = my_data_size; @@ -130,14 +130,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_write_multi.c b/src/tests/data_server_write_multi.c index 95c8e2782..c796534d2 100644 --- a/src/tests/data_server_write_multi.c +++ b/src/tests/data_server_write_multi.c @@ -64,21 +64,21 @@ main(int argc, char **argv) // create a container property pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); goto done; } // create a container pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); goto done; } // create an object property pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); goto done; } @@ -216,14 +216,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container %ld\n", cont); + LOG_ERROR("Failed to close container %ld\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_write_vpic.c b/src/tests/data_server_write_vpic.c index d6b0c4543..3dc142952 100644 --- a/src/tests/data_server_write_vpic.c +++ b/src/tests/data_server_write_vpic.c @@ -113,12 +113,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create object property for float and int obj_prop_float = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -256,19 +256,19 @@ main(int argc, char **argv) done: if (PDCprop_close(obj_prop_float) < 0) - LOG_ERROR("Fail to close float obj property \n"); + LOG_ERROR("Failed to close float obj property \n"); if (PDCprop_close(obj_prop_int) < 0) - LOG_ERROR("Fail to close int obj property \n"); + LOG_ERROR("Failed to close int obj property \n"); if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close container property\n"); + LOG_ERROR("Failed to close container property\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/data_server_write_vpic_multits.c b/src/tests/data_server_write_vpic_multits.c index ef136c1bd..025095641 100644 --- a/src/tests/data_server_write_vpic_multits.c +++ b/src/tests/data_server_write_vpic_multits.c @@ -142,12 +142,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create object property for float and int obj_prop_float = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -396,19 +396,19 @@ main(int argc, char **argv) done: if (PDCprop_close(obj_prop_float) < 0) - LOG_ERROR("Fail to close float obj property \n"); + LOG_ERROR("Failed to close float obj property \n"); if (PDCprop_close(obj_prop_int) < 0) - LOG_ERROR("Fail to close int obj property \n"); + LOG_ERROR("Failed to close int obj property \n"); if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close container property\n"); + LOG_ERROR("Failed to close container property\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); exit: #ifdef ENABLE_MPI diff --git a/src/tests/delete_obj.c b/src/tests/delete_obj.c index ec6878022..dea7727a6 100644 --- a/src/tests/delete_obj.c +++ b/src/tests/delete_obj.c @@ -112,17 +112,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); create_obj_ids = (pdcid_t *)malloc(sizeof(pdcid_t) * count); @@ -191,14 +191,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/delete_obj_scale.c b/src/tests/delete_obj_scale.c index 9e3108665..6cdb54eb3 100644 --- a/src/tests/delete_obj_scale.c +++ b/src/tests/delete_obj_scale.c @@ -115,17 +115,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -198,14 +198,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/dt_conv.c b/src/tests/dt_conv.c index 66e36a16b..96ad9a027 100644 --- a/src/tests/dt_conv.c +++ b/src/tests/dt_conv.c @@ -51,7 +51,7 @@ main(int argc, char **argv) LOG_INFO("b[%d] is %d\n", i, b[i]); // close pdc if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); else LOG_INFO("PDC is closed\n"); diff --git a/src/tests/dup_prop.c b/src/tests/dup_prop.c index 37548942a..06fa907db 100644 --- a/src/tests/dup_prop.c +++ b/src/tests/dup_prop.c @@ -46,19 +46,19 @@ main(int argc, char **argv) // create an object property create_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop1 <= 0) { - LOG_ERROR("Fail to create"); + LOG_ERROR("Failed to create"); ret_value = 1; } // create another object property create_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop2 <= 0) { - LOG_ERROR("Fail to create"); + LOG_ERROR("Failed to create"); ret_value = 1; } dup_prop = PDCprop_obj_dup(create_prop2); if (PDCprop_close(dup_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -66,7 +66,7 @@ main(int argc, char **argv) } if (PDCprop_close(create_prop1) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -74,7 +74,7 @@ main(int argc, char **argv) } if (PDCprop_close(create_prop2) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -82,7 +82,7 @@ main(int argc, char **argv) } // close a pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/gen_fastbit_idx.c b/src/tests/gen_fastbit_idx.c index 1eeab5259..9e07151cd 100644 --- a/src/tests/gen_fastbit_idx.c +++ b/src/tests/gen_fastbit_idx.c @@ -43,7 +43,7 @@ main(int argc, char **argv) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/idioms_ci_test.c b/src/tests/idioms_ci_test.c index fcbebaad1..afb52e3f6 100644 --- a/src/tests/idioms_ci_test.c +++ b/src/tests/idioms_ci_test.c @@ -166,7 +166,7 @@ validate_empty_result(int world_rank, int nres, uint64_t *pdc_ids) { int query_series = world_rank % 6; if (nres > 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); return query_series; } return -1; @@ -181,24 +181,24 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) switch (query_series) { case 0: if (nres != 1) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); step_failed = 0; } if (pdc_ids[0] != 109) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); step_failed = 0; } break; case 1: if (nres != 10) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); step_failed = 1; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); step_failed = 1; break; } @@ -206,14 +206,14 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 2: if (nres != 10) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); step_failed = 2; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i * 100 + 9) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); step_failed = 2; break; } @@ -221,7 +221,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 3: if (nres != 20) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d, nres = %d, expected 20\n", "*09*=*09*", + LOG_ERROR("Failed to query kvtag [%s] with rank %d, nres = %d, expected 20\n", "*09*=*09*", world_rank, nres); step_failed = 3; } @@ -231,7 +231,7 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) 99, 109, 209, 309, 409, 509, 609, 709, 809, 909}; for (i = 0; i < nres; i++) { if (pdc_ids[i] != expected[i]) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d, pdc_ids[%d]=%" PRIu64 + LOG_ERROR("Failed to query kvtag [%s] with rank %d, pdc_ids[%d]=%" PRIu64 ", expected %" PRIu64 "\n", "*09*=*09*", world_rank, i, pdc_ids[i], expected[i]); step_failed = 3; @@ -241,24 +241,24 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 4: if (nres != 1) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); step_failed = 4; } if (pdc_ids[0] != 109) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); step_failed = 4; } break; case 5: if (nres != 10) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); step_failed = 5; } // the result is not in order, so we need to sort the result first qsort(pdc_ids, nres, sizeof(uint64_t), compare_uint64); for (i = 0; i < nres; i++) { if (pdc_ids[i] != i + 90) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); step_failed = 5; break; } @@ -282,7 +282,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // exact string query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "str109str=\"str109str\"", ref_type, &nres, &pdc_ids) < 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "str109str=str109str", world_rank); step_failed = 0; }; break; @@ -290,7 +290,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // prefix string query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "str09*=\"str09*\"", ref_type, &nres, &pdc_ids) < 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "str09*=str09*", world_rank); step_failed = 1; } break; @@ -298,7 +298,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // suffix string query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "*09str=\"*09str\"", ref_type, &nres, &pdc_ids) < 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "*09str=*09str", world_rank); step_failed = 2; } break; @@ -306,7 +306,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // // infix string query // if (PDC_Client_search_obj_ref_through_dart(hash_algo, "*09*=\"*09*\"", ref_type, &nres, // &pdc_ids) < 0) { - // LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "*09*=*09*", world_rank); + // LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "*09*=*09*", world_rank); // step_failed = 3; // } // break; @@ -314,7 +314,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // exact integer query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "intkey=109", ref_type, &nres, &pdc_ids) < 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "intkey=109", world_rank); step_failed = 4; } break; @@ -322,7 +322,7 @@ search_through_index(int world_rank, int world_size, int (*validator)(int r, int // range integer query if (PDC_Client_search_obj_ref_through_dart(hash_algo, "intkey=90|~|99", ref_type, &nres, &pdc_ids) < 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", "intkey=90|~|99", world_rank); step_failed = 5; } break; @@ -350,7 +350,7 @@ main(int argc, char *argv[]) // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, world_rank) < 0) { - println("fail to prepare container"); + println("Failed to prepare container"); goto done; } @@ -466,7 +466,7 @@ main(int argc, char *argv[]) // close a container if (PDCcont_close(cont) < 0) { if (world_rank == 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); } } else { @@ -477,7 +477,7 @@ main(int argc, char *argv[]) // close an object property if (PDCprop_close(obj_prop) < 0) { if (world_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (world_rank == 0) @@ -487,7 +487,7 @@ main(int argc, char *argv[]) // close a container property if (PDCprop_close(cont_prop) < 0) { if (world_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (world_rank == 0) @@ -497,7 +497,7 @@ main(int argc, char *argv[]) // close pdc if (PDCclose(pdc) < 0) { if (world_rank == 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/init_only.c b/src/tests/init_only.c index cff092bc8..691b57f35 100644 --- a/src/tests/init_only.c +++ b/src/tests/init_only.c @@ -29,25 +29,25 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); LOG_INFO("PROC[%d] FINISHED!\n", rank); // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/kvtag_add_get.c b/src/tests/kvtag_add_get.c index dc19b30fd..6b97ae0f8 100644 --- a/src/tests/kvtag_add_get.c +++ b/src/tests/kvtag_add_get.c @@ -51,41 +51,41 @@ main() if (cont_prop > 0) LOG_INFO("Create a container property\n"); else - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont > 0) LOG_INFO("Create a container c1\n"); else - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop1 > 0) LOG_INFO("Create an object property\n"); else - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop2 > 0) LOG_INFO("Create an object property\n"); else - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); // create first object obj1 = PDCobj_create(cont, "o1", obj_prop1); if (obj1 > 0) LOG_INFO("Create an object o1\n"); else - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); // create second object obj2 = PDCobj_create(cont, "o2", obj_prop2); if (obj2 > 0) LOG_INFO("Create an object o2\n"); else - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); kvtag1.name = "key1string"; kvtag1.value = (void *)v1; @@ -103,37 +103,37 @@ main() kvtag3.size = sizeof(double); if (PDCobj_put_tag(obj1, kvtag1.name, kvtag1.value, kvtag1.type, kvtag1.size) < 0) - LOG_ERROR("Fail to add a kvtag to o1\n"); + LOG_ERROR("Failed to add a kvtag to o1\n"); else LOG_INFO("successfully added a kvtag to o1\n"); if (PDCobj_put_tag(obj2, kvtag2.name, kvtag2.value, kvtag2.type, kvtag2.size) < 0) - LOG_ERROR("Fail to add a kvtag to o1\n"); + LOG_ERROR("Failed to add a kvtag to o1\n"); else LOG_INFO("successfully added a kvtag to o1\n"); if (PDCobj_put_tag(obj2, kvtag3.name, kvtag3.value, kvtag3.type, kvtag3.size) < 0) - LOG_ERROR("Fail to add a kvtag to o1\n"); + LOG_ERROR("Failed to add a kvtag to o1\n"); else LOG_INFO("successfully added a kvtag to o1\n"); if (PDCobj_get_tag(obj1, kvtag1.name, (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o1\n"); + LOG_ERROR("Failed to get a kvtag from o1\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", kvtag1.name, (char *)value1); if (PDCobj_get_tag(obj2, kvtag2.name, (void *)&value2, (void *)&type2, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o2\n"); + LOG_ERROR("Failed to get a kvtag from o2\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%d] from o2\n", kvtag2.name, *(int *)value2); if (PDCobj_get_tag(obj2, kvtag3.name, (void *)&value3, (void *)&type3, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o2\n"); + LOG_ERROR("Failed to get a kvtag from o2\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%f] from o2\n", kvtag3.name, *(double *)value3); if (PDCobj_del_tag(obj1, kvtag1.name) < 0) - LOG_ERROR("Fail to delete a kvtag from o1\n"); + LOG_ERROR("Failed to delete a kvtag from o1\n"); else LOG_INFO("successfully deleted a kvtag [%s] from o1\n", kvtag1.name); @@ -142,14 +142,14 @@ main() kvtag1.type = PDC_STRING; kvtag1.size = strlen(v1) + 1; if (PDCobj_put_tag(obj1, kvtag1.name, kvtag1.value, kvtag1.type, kvtag1.size) < 0) - LOG_ERROR("Fail to add a kvtag to o1\n"); + LOG_ERROR("Failed to add a kvtag to o1\n"); else LOG_INFO("successfully added a kvtag to o1\n"); /* PDC_free_kvtag(&value1); */ if (PDCobj_get_tag(obj1, kvtag1.name, (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o1\n"); + LOG_ERROR("Failed to get a kvtag from o1\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", kvtag1.name, (char *)value1); @@ -159,41 +159,41 @@ main() // close first object if (PDCobj_close(obj1) < 0) - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); else LOG_INFO("successfully close object o1\n"); // close second object if (PDCobj_close(obj2) < 0) - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); else LOG_INFO("successfully close object o2\n"); // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); else LOG_INFO("successfully close container c1\n"); // close a container property if (PDCprop_close(obj_prop1) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close object property\n"); if (PDCprop_close(obj_prop2) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close object property\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close container property\n"); // close pdc if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/kvtag_add_get_benchmark.c b/src/tests/kvtag_add_get_benchmark.c index 5f84c9eb0..e7d7bd196 100644 --- a/src/tests/kvtag_add_get_benchmark.c +++ b/src/tests/kvtag_add_get_benchmark.c @@ -153,17 +153,17 @@ init_test(int my_rank, int proc_num, uint64_t n_obj_incr, uint64_t n_query, uint // create a container property *cont_prop = PDCprop_create(PDC_CONT_CREATE, *pdc); if (*cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container *cont = PDCcont_create("c1", *cont_prop); if (*cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property *obj_prop = PDCprop_create(PDC_OBJ_CREATE, *pdc); if (*obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); if (my_rank == 0) LOG_INFO("create obj_ids array\n"); @@ -195,7 +195,7 @@ create_object(uint64_t my_obj, uint64_t my_obj_s, pdcid_t cont, pdcid_t obj_prop sprintf(obj_name, "obj%" PRIu64 "", v); obj_ids[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj_ids[i] <= 0) - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); } } @@ -222,7 +222,7 @@ add_n_tags(uint64_t my_obj, uint64_t my_obj_s, uint64_t n_attr, char **tag_value sprintf(tag_name, "tag%" PRIu64 ".%" PRIu64 "", v, j); if (PDCobj_put_tag(obj_ids[i], tag_name, (void *)tag_values[j], PDC_STRING, tag_value_len + 1) < 0) - LOG_ERROR("Fail to add a kvtag to o%" PRIu64 "\n", v); + LOG_ERROR("Failed to add a kvtag to o%" PRIu64 "\n", v); } } } @@ -246,7 +246,7 @@ get_object_tags(pdcid_t obj_id, uint64_t obj_name_v, uint64_t n_attr, void **tag for (i = 0; i < n_attr; i++) { sprintf(tag_name, "tag%" PRIu64 ".%" PRIu64 "", obj_name_v, i); if (PDCobj_get_tag(obj_id, tag_name, (void **)&tag_values[i], &tag_type, (void *)&value_size[i]) < 0) - LOG_ERROR("Fail to get a kvtag from o%" PRIu64 "\n", obj_name_v); + LOG_ERROR("Failed to get a kvtag from o%" PRIu64 "\n", obj_name_v); } } @@ -299,7 +299,7 @@ check_and_release_query_result(uint64_t n_query, uint64_t my_obj, uint64_t my_ob // for (i = 0; i < my_obj; i++) { // v = i + my_obj_s; // if (PDCobj_close(obj_ids[i]) < 0) - // LOG_ERROR("Fail to close object o%" PRIu64 "\n", v); + // LOG_ERROR("Failed to close object o%" PRIu64 "\n", v); // } } @@ -308,18 +308,18 @@ closePDC(pdcid_t pdc, pdcid_t cont_prop, pdcid_t cont, pdcid_t obj_prop) { // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(obj_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); // close pdc if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); } int diff --git a/src/tests/kvtag_add_get_scale.c b/src/tests/kvtag_add_get_scale.c index 3a3b9b476..9c1bad2b2 100644 --- a/src/tests/kvtag_add_get_scale.c +++ b/src/tests/kvtag_add_get_scale.c @@ -115,17 +115,17 @@ main(int argc, char *argv[]) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); // Create a number of objects, add at least one tag to that object obj_ids = (pdcid_t *)calloc(my_obj, sizeof(pdcid_t)); @@ -139,7 +139,7 @@ main(int argc, char *argv[]) sprintf(obj_name, "obj%d", my_obj_s + i); obj_ids[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj_ids[i] <= 0) - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); if (i > 0 && i % obj_1percent == 0) { #ifdef ENABLE_MPI @@ -178,7 +178,7 @@ main(int argc, char *argv[]) for (i = 0; i < my_add_tag; i++) { v = i + my_add_tag_s; if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); if (i % tag_1percent == 0) { #ifdef ENABLE_MPI @@ -212,7 +212,7 @@ main(int argc, char *argv[]) for (i = 0; i < my_query; i++) { if (PDCobj_get_tag(obj_ids[i], kvtag.name, (void *)&values[i], (void *)&value_type, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o%d\n", i + my_query_s); + LOG_ERROR("Failed to get a kvtag from o%d\n", i + my_query_s); if (i % query_1percent == 0) { #ifdef ENABLE_MPI diff --git a/src/tests/kvtag_affix_query_scale.c b/src/tests/kvtag_affix_query_scale.c index 40986aa27..61e2745ae 100644 --- a/src/tests/kvtag_affix_query_scale.c +++ b/src/tests/kvtag_affix_query_scale.c @@ -169,7 +169,7 @@ main(int argc, char *argv[]) int bypass_query = query_type == -1 ? 1 : 0; // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, my_rank) < 0) { - println("fail to prepare container"); + println("Failed to prepare container"); goto done; } // Create a number of objects, add at least one tag to that object @@ -213,16 +213,16 @@ main(int argc, char *argv[]) pdcid_t meta_id = PDC_obj_get_info(obj_ids[i])->obj_info_pub->meta_id; if (is_using_dart) { if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); } if (PDC_Client_insert_obj_ref_into_dart(hash_algo, kvtag.name, kvtag.value, kvtag.size, kvtag.type, ref_type, meta_id) < 0) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("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) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); } } free(kvtag.name); @@ -330,7 +330,7 @@ main(int argc, char *argv[]) #endif } if (ret_value < 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); break; } @@ -411,7 +411,7 @@ main(int argc, char *argv[]) // close a container if (PDCcont_close(cont) < 0) { if (my_rank == 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); } } else { @@ -422,7 +422,7 @@ main(int argc, char *argv[]) // close an object property if (PDCprop_close(obj_prop) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (my_rank == 0) @@ -432,7 +432,7 @@ main(int argc, char *argv[]) // close a container property if (PDCprop_close(cont_prop) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (my_rank == 0) @@ -442,7 +442,7 @@ main(int argc, char *argv[]) // close pdc if (PDCclose(pdc) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/kvtag_get.c b/src/tests/kvtag_get.c index 8cc5545d0..613d1834c 100644 --- a/src/tests/kvtag_get.c +++ b/src/tests/kvtag_get.c @@ -47,54 +47,54 @@ main() if (cont_prop > 0) LOG_INFO("Create a container property\n"); else - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont > 0) LOG_INFO("Create a container c1\n"); else - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop1 > 0) LOG_INFO("Create an object property\n"); else - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); obj_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop2 > 0) LOG_INFO("Create an object property\n"); else - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); // create first object obj1 = PDCobj_create(cont, "o1", obj_prop1); if (obj1 > 0) LOG_INFO("Create an object o1\n"); else - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); // create second object obj2 = PDCobj_create(cont, "o2", obj_prop2); if (obj2 > 0) LOG_INFO("Create an object o2\n"); else - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); if (PDCobj_get_tag(obj1, "key1string", (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o1\n"); + LOG_ERROR("Failed to get a kvtag from o1\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", value1->name, (char *)value1->value); if (PDCobj_get_tag(obj2, "key2int", (void *)&value2, (void *)&type2, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o2\n"); + LOG_ERROR("Failed to get a kvtag from o2\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%d] from o2\n", value2->name, *(int *)value2->value); if (PDCobj_get_tag(obj2, "key3double", (void *)&value3, (void *)&type3, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o2\n"); + LOG_ERROR("Failed to get a kvtag from o2\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%f] from o2\n", value3->name, *(double *)value3->value); @@ -102,7 +102,7 @@ main() PDC_free_kvtag(&value1); if (PDCobj_get_tag(obj1, "key1string", (void *)&value1, (void *)&type1, (void *)&value_size) < 0) - LOG_ERROR("Fail to get a kvtag from o1\n"); + LOG_ERROR("Failed to get a kvtag from o1\n"); else LOG_INFO("successfully retrieved a kvtag [%s] = [%s] from o1\n", value1->name, (char *)value1->value); @@ -112,41 +112,41 @@ main() // close first object if (PDCobj_close(obj1) < 0) - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); else LOG_INFO("successfully close object o1\n"); // close second object if (PDCobj_close(obj2) < 0) - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); else LOG_INFO("successfully close object o2\n"); // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); else LOG_INFO("successfully close container c1\n"); // close a container property if (PDCprop_close(obj_prop1) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close object property\n"); if (PDCprop_close(obj_prop2) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close object property\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close container property\n"); // close pdc if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/kvtag_query.c b/src/tests/kvtag_query.c index ea42c517d..cd028896d 100644 --- a/src/tests/kvtag_query.c +++ b/src/tests/kvtag_query.c @@ -112,17 +112,17 @@ main(int argc, char *argv[]) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); // Create a number of objects, add at least one tag to that object assign_work_to_rank(my_rank, proc_num, n_obj, &my_obj, &my_obj_s); @@ -134,7 +134,7 @@ main(int argc, char *argv[]) sprintf(obj_name, "obj%d", my_obj_s + i); obj_ids[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj_ids[i] <= 0) - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); } if (my_rank == 0) @@ -165,13 +165,13 @@ main(int argc, char *argv[]) if (is_using_dart) { if (PDC_Client_insert_obj_ref_into_dart(hash_algo, kvtag.name, value, strlen(value), PDC_STRING, ref_type, (uint64_t)obj_ids[i]) < 0) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); } } else { /* println("Rank %d: [%s] [%d], len %d\n", my_rank, kvtag.name, v, kvtag.size); */ if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); } } } @@ -213,7 +213,7 @@ main(int argc, char *argv[]) #else if (PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) < 0) { #endif - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); break; } } @@ -231,25 +231,25 @@ main(int argc, char *argv[]) #endif // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); else LOG_INFO("successfully close container c1\n"); // close an object property if (PDCprop_close(obj_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close object property\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); else LOG_INFO("successfully close container property\n"); // close pdc if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); done: #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/kvtag_range_query_scale.c b/src/tests/kvtag_range_query_scale.c index 1943604de..3659b6d8d 100644 --- a/src/tests/kvtag_range_query_scale.c +++ b/src/tests/kvtag_range_query_scale.c @@ -168,7 +168,7 @@ main(int argc, char *argv[]) int bypass_query = query_type == -1 ? 1 : 0; // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, my_rank) < 0) { - LOG_ERROR("fail to prepare container"); + LOG_ERROR("Failed to prepare container"); goto done; } // Create a number of objects, add at least one tag to that object @@ -208,7 +208,7 @@ main(int argc, char *argv[]) kvtag.name = strdup(attr_name); kvtag.value = malloc(sizeof(int64_t)); if (kvtag.value == NULL) { - LOG_ERROR("Fail to allocate tag_value\n"); + LOG_ERROR("Failed to allocate tag_value\n"); goto done; } int64_t iter_val = iter; @@ -218,18 +218,18 @@ main(int argc, char *argv[]) pdcid_t meta_id = PDC_obj_get_info(obj_ids[i])->obj_info_pub->meta_id; if (is_using_dart) { if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); } // NOTE: object ID is a local ID, we need to get the global object metadata ID if (PDC_Client_insert_obj_ref_into_dart(hash_algo, kvtag.name, kvtag.value, kvtag.size, kvtag.type, ref_type, meta_id) < 0) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); } total_insert++; } else { if (PDCobj_put_tag(obj_ids[i], kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - LOG_ERROR("Fail to add a kvtag to o%d\n", i + my_obj_s); + LOG_ERROR("Failed to add a kvtag to o%d\n", i + my_obj_s); } } free(kvtag.name); @@ -341,7 +341,7 @@ main(int argc, char *argv[]) #endif } if (ret_value < 0) { - LOG_ERROR("Fail to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); + LOG_ERROR("Failed to query kvtag [%s] with rank %d\n", kvtag.name, my_rank); break; } @@ -398,7 +398,7 @@ main(int argc, char *argv[]) kvtag.name = strdup(attr_name); kvtag.value = malloc(sizeof(int64_t)); if (kvtag.value == NULL) { - LOG_ERROR("Fail to allocate tag_value\n"); + LOG_ERROR("Failed to allocate tag_value\n"); goto done; } int64_t iter_val = iter; @@ -431,7 +431,7 @@ main(int argc, char *argv[]) // close a container if (PDCcont_close(cont) < 0) { if (my_rank == 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); } } else { @@ -442,7 +442,7 @@ main(int argc, char *argv[]) // close an object property if (PDCprop_close(obj_prop) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (my_rank == 0) @@ -452,7 +452,7 @@ main(int argc, char *argv[]) // close a container property if (PDCprop_close(cont_prop) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (my_rank == 0) @@ -462,7 +462,7 @@ main(int argc, char *argv[]) // close pdc if (PDCclose(pdc) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/list_all.c b/src/tests/list_all.c index f0bd5b503..5532153e5 100644 --- a/src/tests/list_all.c +++ b/src/tests/list_all.c @@ -120,17 +120,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -220,14 +220,14 @@ main(int argc, char **argv) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index f2db8dff8..a08c5d781 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -196,7 +196,7 @@ add_tag_to_one_object(pid_t obj_id, char *attr_name, char *attr_value, int is_us struct _pdc_obj_info *obj_prop = PDC_obj_get_info(obj_id); uint64_t meta_id = obj_prop->obj_info_pub->meta_id; if (PDCobj_put_tag(obj_id, kvtag.name, kvtag.value, kvtag.type, kvtag.size) < 0) { - LOG_ERROR("Fail to add tag to object %" PRIu64 "\n", obj_id); + LOG_ERROR("Failed to add tag to object %" PRIu64 "\n", obj_id); return -1; } if (is_using_dart) { @@ -432,7 +432,7 @@ main(int argc, char *argv[]) int bypass_query = query_type == -1 ? 1 : 0; // prepare container if (prepare_container(&pdc, &cont_prop, &cont, &obj_prop, my_rank) < 0) { - println("fail to prepare container"); + println("Failed to prepare container"); goto done; } @@ -587,7 +587,7 @@ main(int argc, char *argv[]) // close a container if (PDCcont_close(cont) < 0) { if (my_rank == 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); } } else { @@ -598,7 +598,7 @@ main(int argc, char *argv[]) // close an object property if (PDCprop_close(obj_prop) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (my_rank == 0) @@ -608,7 +608,7 @@ main(int argc, char *argv[]) // close a container property if (PDCprop_close(cont_prop) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } else { if (my_rank == 0) @@ -618,7 +618,7 @@ main(int argc, char *argv[]) // close pdc if (PDCclose(pdc) < 0) { if (my_rank == 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); } #ifdef ENABLE_MPI diff --git a/src/tests/obj_buf.c b/src/tests/obj_buf.c index 6eac5e5a6..3e944bc4b 100644 --- a/src/tests/obj_buf.c +++ b/src/tests/obj_buf.c @@ -53,7 +53,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -63,7 +63,7 @@ main(int argc, char **argv) LOG_INFO("Create a container\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -72,7 +72,7 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, myArray); @@ -84,7 +84,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // set and retrieve the object buffer @@ -94,7 +94,7 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { @@ -102,7 +102,7 @@ main(int argc, char **argv) } // close object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -110,7 +110,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -118,7 +118,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -126,7 +126,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_del.c b/src/tests/obj_del.c index e274f32c3..0e3c218ec 100644 --- a/src/tests/obj_del.c +++ b/src/tests/obj_del.c @@ -53,7 +53,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -63,7 +63,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -72,7 +72,7 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } // create first object @@ -82,7 +82,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -92,21 +92,21 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } if (PDCobj_del(obj1) != SUCCEED) { - LOG_ERROR("Fail to delete object"); + LOG_ERROR("Failed to delete object"); } if (PDCobj_del(obj2) != SUCCEED) { - LOG_ERROR("Fail to delete object"); + LOG_ERROR("Failed to delete object"); } // close first object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { @@ -114,7 +114,7 @@ main(int argc, char **argv) } // close second object if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -122,7 +122,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -130,7 +130,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -138,7 +138,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_dim.c b/src/tests/obj_dim.c index 2371d9a92..4238b7796 100644 --- a/src/tests/obj_dim.c +++ b/src/tests/obj_dim.c @@ -52,7 +52,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -62,7 +62,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c%d\n", rank); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -71,7 +71,7 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } // set object dimension @@ -86,12 +86,12 @@ main(int argc, char **argv) LOG_INFO("Create an objec o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { @@ -99,7 +99,7 @@ main(int argc, char **argv) } // close object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -107,7 +107,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -115,7 +115,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -123,7 +123,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_get_data.c b/src/tests/obj_get_data.c index ec805a8ff..b60da9be1 100644 --- a/src/tests/obj_get_data.c +++ b/src/tests/obj_get_data.c @@ -58,7 +58,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -68,7 +68,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } @@ -79,7 +79,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name1); } else { - LOG_ERROR("Fail to put data into object"); + LOG_ERROR("Failed to put data into object"); ret_value = 1; } @@ -90,14 +90,14 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name2); } else { - LOG_ERROR("Fail to put data into object"); + LOG_ERROR("Failed to put data into object"); ret_value = 1; } memset(data, 0, BUF_LEN * sizeof(double)); error_code = PDCobj_get_data(obj1, (void *)(data), BUF_LEN * sizeof(double)); if (error_code != SUCCEED) { - LOG_ERROR("Fail to get obj 1 data\n"); + LOG_ERROR("Failed to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < BUF_LEN * sizeof(double); ++i) { @@ -110,7 +110,7 @@ main(int argc, char **argv) memset(data, 0, BUF_LEN * sizeof(double)); error_code = PDCobj_get_data(obj2, (void *)(data), BUF_LEN * sizeof(double)); if (error_code != SUCCEED) { - LOG_ERROR("Fail to get obj 1 data\n"); + LOG_ERROR("Failed to get obj 1 data\n"); ret_value = 1; } for (i = 0; i < BUF_LEN * sizeof(double); ++i) { @@ -123,14 +123,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -139,7 +139,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -147,7 +147,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -155,7 +155,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_info.c b/src/tests/obj_info.c index 960fb018d..6fefd9f4f 100644 --- a/src/tests/obj_info.c +++ b/src/tests/obj_info.c @@ -60,7 +60,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -70,7 +70,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -79,17 +79,17 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } @@ -100,7 +100,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -110,7 +110,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } obj1_info = PDCobj_get_info(obj1); @@ -171,14 +171,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -186,7 +186,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -194,7 +194,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -202,7 +202,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -210,7 +210,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_iter.c b/src/tests/obj_iter.c index 3c1077e15..31ebcc4ac 100644 --- a/src/tests/obj_iter.c +++ b/src/tests/obj_iter.c @@ -59,7 +59,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -69,7 +69,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -78,17 +78,17 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } @@ -99,7 +99,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -109,7 +109,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create third object @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o3\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // start object iteration @@ -153,7 +153,7 @@ main(int argc, char **argv) // close first object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { @@ -161,7 +161,7 @@ main(int argc, char **argv) } // close second object if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -169,7 +169,7 @@ main(int argc, char **argv) } // close third object if (PDCobj_close(obj3) < 0) { - LOG_ERROR("Fail to close object o3\n"); + LOG_ERROR("Failed to close object o3\n"); ret_value = 1; } else { @@ -177,7 +177,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -185,7 +185,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -193,7 +193,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -201,7 +201,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_life.c b/src/tests/obj_life.c index ffc32b392..45209e3e8 100644 --- a/src/tests/obj_life.c +++ b/src/tests/obj_life.c @@ -48,7 +48,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); return 1; } // create a container @@ -57,12 +57,12 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return 1; } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return 1; } else { @@ -70,7 +70,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return 1; } else { @@ -78,7 +78,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_lock.c b/src/tests/obj_lock.c index 1069c75e5..068baf636 100644 --- a/src/tests/obj_lock.c +++ b/src/tests/obj_lock.c @@ -64,17 +64,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); // set object dimension PDCprop_set_obj_dims(obj_prop, 3, d); @@ -85,7 +85,7 @@ main(int argc, char **argv) sprintf(obj_name, "test_obj"); obj1 = PDCobj_create(cont, obj_name, obj_prop); if (obj1 <= 0) - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); } for (i = 0; i < 3; i++) { @@ -148,24 +148,24 @@ main(int argc, char **argv) // close object if (rank == 0) { if (PDCobj_close(obj1) < 0) - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); } // close object property if (PDCprop_close(obj_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); // close pdc if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/obj_map.c b/src/tests/obj_map.c index b31efb722..6332500fb 100644 --- a/src/tests/obj_map.c +++ b/src/tests/obj_map.c @@ -87,12 +87,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -186,14 +186,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDC_close(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/obj_put_data.c b/src/tests/obj_put_data.c index 531083c10..ef0b31cb7 100644 --- a/src/tests/obj_put_data.c +++ b/src/tests/obj_put_data.c @@ -57,7 +57,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -67,7 +67,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } @@ -77,7 +77,7 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name1); } else { - LOG_ERROR("Fail to put data into object"); + LOG_ERROR("Failed to put data into object"); ret_value = 1; } @@ -87,20 +87,20 @@ main(int argc, char **argv) LOG_INFO("Rank %d Put data to %s\n", rank, obj_name2); } else { - LOG_ERROR("Fail to put data into object"); + LOG_ERROR("Failed to put data into object"); ret_value = 1; } // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -109,7 +109,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -117,7 +117,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -125,7 +125,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_round_robin_io.c b/src/tests/obj_round_robin_io.c index 050d8e780..0461a8ce8 100644 --- a/src/tests/obj_round_robin_io.c +++ b/src/tests/obj_round_robin_io.c @@ -151,12 +151,12 @@ main(int argc, char **argv) ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } PDCprop_set_obj_type(obj_prop, var_type); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } @@ -202,12 +202,12 @@ main(int argc, char **argv) } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } @@ -253,12 +253,12 @@ main(int argc, char **argv) } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } @@ -351,12 +351,12 @@ main(int argc, char **argv) free(data_read); if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } diff --git a/src/tests/obj_round_robin_io_all.c b/src/tests/obj_round_robin_io_all.c index cae6b84fb..255b3d667 100644 --- a/src/tests/obj_round_robin_io_all.c +++ b/src/tests/obj_round_robin_io_all.c @@ -155,12 +155,12 @@ main(int argc, char **argv) ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } PDCprop_set_obj_type(obj_prop, var_type); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } @@ -195,12 +195,12 @@ main(int argc, char **argv) ret_value = 1; } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } @@ -248,12 +248,12 @@ main(int argc, char **argv) } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } @@ -314,12 +314,12 @@ main(int argc, char **argv) } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } @@ -346,12 +346,12 @@ main(int argc, char **argv) } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } } diff --git a/src/tests/obj_tags.c b/src/tests/obj_tags.c index fd3280073..79b8668e3 100644 --- a/src/tests/obj_tags.c +++ b/src/tests/obj_tags.c @@ -65,7 +65,7 @@ main(int argc, char **argv) LOG_ERROR("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -75,7 +75,7 @@ main(int argc, char **argv) LOG_ERROR("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -84,18 +84,18 @@ main(int argc, char **argv) LOG_ERROR("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj dim"); + LOG_ERROR("Failed to set obj dim"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } @@ -106,7 +106,7 @@ main(int argc, char **argv) LOG_ERROR("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -116,7 +116,7 @@ main(int argc, char **argv) LOG_ERROR("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -189,14 +189,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -204,7 +204,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -212,7 +212,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -220,7 +220,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -228,7 +228,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/obj_transformation.c b/src/tests/obj_transformation.c index 63d6c0568..d6f8b2791 100644 --- a/src/tests/obj_transformation.c +++ b/src/tests/obj_transformation.c @@ -101,12 +101,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop_xx = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -428,111 +428,111 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj_xx) < 0) - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); if (PDCprop_close(obj_prop_xx) < 0) - LOG_ERROR("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Failed to close obj property obj_prop_xx\n"); if (PDCprop_close(obj_prop_yy) < 0) - LOG_ERROR("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Failed to close obj property obj_prop_yy\n"); if (PDCprop_close(obj_prop_zz) < 0) - LOG_ERROR("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Failed to close obj property obj_prop_zz\n"); if (PDCprop_close(obj_prop_pxx) < 0) - LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Failed to close obj property obj_prop_pxx\n"); if (PDCprop_close(obj_prop_pyy) < 0) - LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Failed to close obj property obj_prop_pyy\n"); if (PDCprop_close(obj_prop_pzz) < 0) - LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Failed to close obj property obj_prop_pzz\n"); if (PDCprop_close(obj_prop_id11) < 0) - LOG_ERROR("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Failed to close obj property obj_prop_id11\n"); if (PDCprop_close(obj_prop_id22) < 0) - LOG_ERROR("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Failed to close obj property obj_prop_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); free(x); free(y); diff --git a/src/tests/open_cont.c b/src/tests/open_cont.c index b984e0ad2..5aaf2b2e7 100644 --- a/src/tests/open_cont.c +++ b/src/tests/open_cont.c @@ -49,13 +49,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -64,7 +64,7 @@ main(int argc, char **argv) cont_id2 = PDCcont_open("c1", pdc_id); if (cont_id2 == 0) { - LOG_ERROR("Fail to open container"); + LOG_ERROR("Failed to open container"); ret_value = 1; } #ifdef ENABLE_MPI @@ -73,20 +73,20 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont_id) < 0) { - LOG_ERROR("Fail to close container cont_id1\n"); + LOG_ERROR("Failed to close container cont_id1\n"); ret_value = 1; } if (PDCcont_close(cont_id2) < 0) { - LOG_ERROR("Fail to close container cont_id2\n"); + LOG_ERROR("Failed to close container cont_id2\n"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/open_obj_round_robin.c b/src/tests/open_obj_round_robin.c index 02207e968..054bd544a 100644 --- a/src/tests/open_obj_round_robin.c +++ b/src/tests/open_obj_round_robin.c @@ -84,12 +84,12 @@ main(int argc, char **argv) } ret = PDCprop_set_obj_dims(obj_prop, ndim, dims); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } diff --git a/src/tests/pdc_init.c b/src/tests/pdc_init.c index d74d48b29..4403516f3 100644 --- a/src/tests/pdc_init.c +++ b/src/tests/pdc_init.c @@ -46,7 +46,7 @@ main(int argc, char **argv) // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/producer_waitall.c b/src/tests/producer_waitall.c index 90eb9f972..6315bc4f9 100644 --- a/src/tests/producer_waitall.c +++ b/src/tests/producer_waitall.c @@ -152,12 +152,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); } // create an object property @@ -182,15 +182,15 @@ main(int argc, char **argv) LOG_ERROR("Rank %4d: Write read wait all took %.6f\n", mpi_rank, MPI_Wtime() - stime); if (PDCobj_close(obj_id) < 0) { - LOG_ERROR("Fail to close obj_id\n"); + LOG_ERROR("Failed to close obj_id\n"); } if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); } MPI_Finalize(); diff --git a/src/tests/query_data.c b/src/tests/query_data.c index 393cc0a12..22db011a7 100644 --- a/src/tests/query_data.c +++ b/src/tests/query_data.c @@ -70,19 +70,19 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } my_data_count = size_MB / size; @@ -171,16 +171,16 @@ main(int argc, char **argv) PDCselection_free(&sel); // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/query_metadata_agg.c b/src/tests/query_metadata_agg.c index 019ff4d9e..a1ac2228c 100644 --- a/src/tests/query_metadata_agg.c +++ b/src/tests/query_metadata_agg.c @@ -32,17 +32,17 @@ main(int argc, const char *argv[]) // create a container property pdcid_t cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container pdcid_t cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property pdcid_t obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); pdcid_t test_obj = -1; uint64_t my_data_size = size_MB / size; @@ -87,14 +87,14 @@ main(int argc, const char *argv[]) done: // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container %lu\n", cont); + LOG_ERROR("Failed to close container %lu\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/query_vpic.c b/src/tests/query_vpic.c index 8371e8fc8..35853e995 100644 --- a/src/tests/query_vpic.c +++ b/src/tests/query_vpic.c @@ -78,7 +78,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds1_nopreload.c b/src/tests/query_vpic_bin_sds1_nopreload.c index a91c2edc5..0e9ba53fa 100644 --- a/src/tests/query_vpic_bin_sds1_nopreload.c +++ b/src/tests/query_vpic_bin_sds1_nopreload.c @@ -112,7 +112,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds1_preload.c b/src/tests/query_vpic_bin_sds1_preload.c index 550297bc8..50aa09e1e 100644 --- a/src/tests/query_vpic_bin_sds1_preload.c +++ b/src/tests/query_vpic_bin_sds1_preload.c @@ -128,7 +128,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds_nopreload.c b/src/tests/query_vpic_bin_sds_nopreload.c index 9e2373815..7738e8e40 100644 --- a/src/tests/query_vpic_bin_sds_nopreload.c +++ b/src/tests/query_vpic_bin_sds_nopreload.c @@ -131,7 +131,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_bin_sds_preload.c b/src/tests/query_vpic_bin_sds_preload.c index a0c68cbc7..86bb3b55e 100644 --- a/src/tests/query_vpic_bin_sds_preload.c +++ b/src/tests/query_vpic_bin_sds_preload.c @@ -130,7 +130,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_create_data.c b/src/tests/query_vpic_create_data.c index 35b5ae750..71598eaa6 100644 --- a/src/tests/query_vpic_create_data.c +++ b/src/tests/query_vpic_create_data.c @@ -109,10 +109,10 @@ main(int argc, char **argv) pdc_id = PDCinit("pdc"); cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); cont_id = PDCcont_create("VPIC_cont", cont_prop); if (cont_id <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create object property for float and int obj_prop_float = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -221,19 +221,19 @@ main(int argc, char **argv) done: if (PDCprop_close(obj_prop_float) < 0) - LOG_ERROR("Fail to close float obj property \n"); + LOG_ERROR("Failed to close float obj property \n"); if (PDCprop_close(obj_prop_int) < 0) - LOG_ERROR("Fail to close int obj property \n"); + LOG_ERROR("Failed to close int obj property \n"); if (PDCcont_close(cont_id) < 0) - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close container property\n"); + LOG_ERROR("Failed to close container property\n"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/query_vpic_exyz_nopreload.c b/src/tests/query_vpic_exyz_nopreload.c index 42ecc2deb..50f1bf301 100644 --- a/src/tests/query_vpic_exyz_nopreload.c +++ b/src/tests/query_vpic_exyz_nopreload.c @@ -156,7 +156,7 @@ main(int argc, char **argv) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_exyz_preload.c b/src/tests/query_vpic_exyz_preload.c index 6455a9173..b0d38208e 100644 --- a/src/tests/query_vpic_exyz_preload.c +++ b/src/tests/query_vpic_exyz_preload.c @@ -131,7 +131,7 @@ main(int argc, char **argv) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi.c b/src/tests/query_vpic_multi.c index 91c5544ac..03991643d 100644 --- a/src/tests/query_vpic_multi.c +++ b/src/tests/query_vpic_multi.c @@ -86,7 +86,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi_nopreload.c b/src/tests/query_vpic_multi_nopreload.c index f10149527..7ed287a2e 100644 --- a/src/tests/query_vpic_multi_nopreload.c +++ b/src/tests/query_vpic_multi_nopreload.c @@ -84,7 +84,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi_nopreload1.c b/src/tests/query_vpic_multi_nopreload1.c index 631e2644e..a56e7ba3a 100644 --- a/src/tests/query_vpic_multi_nopreload1.c +++ b/src/tests/query_vpic_multi_nopreload1.c @@ -84,7 +84,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/query_vpic_multi_preload.c b/src/tests/query_vpic_multi_preload.c index 91c5544ac..03991643d 100644 --- a/src/tests/query_vpic_multi_preload.c +++ b/src/tests/query_vpic_multi_preload.c @@ -86,7 +86,7 @@ main(void) done: if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 0; } diff --git a/src/tests/read_obj.c b/src/tests/read_obj.c index 2794e79c6..e7de07c99 100644 --- a/src/tests/read_obj.c +++ b/src/tests/read_obj.c @@ -118,20 +118,20 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } dims[0] = size_B; @@ -268,29 +268,29 @@ main(int argc, char **argv) free(mydata); if (PDCobj_close(global_obj) < 0) { - LOG_ERROR("Fail to close global obj"); + LOG_ERROR("Failed to close global obj"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container"); + LOG_ERROR("Failed to close container"); ret_value = 1; } if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/read_obj_shared.c b/src/tests/read_obj_shared.c index 9cf6779b1..5b3427326 100644 --- a/src/tests/read_obj_shared.c +++ b/src/tests/read_obj_shared.c @@ -114,7 +114,7 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -122,13 +122,13 @@ main(int argc, char **argv) sprintf(cont_name, "c"); cont = PDCcont_create_col(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } dims[0] = size_B; @@ -196,21 +196,21 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCobj_close(global_obj) < 0) { - LOG_ERROR("Fail to close global obj"); + LOG_ERROR("Failed to close global obj"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } #ifdef ENABLE_MPI @@ -251,7 +251,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } @@ -268,29 +268,29 @@ main(int argc, char **argv) } if (PDCobj_close(global_obj) < 0) { - LOG_ERROR("Fail to close global obj\n"); + LOG_ERROR("Failed to close global obj\n"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); ret_value = 1; } if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } free(mydata); diff --git a/src/tests/read_write_col_perf.c b/src/tests/read_write_col_perf.c index 7df79a282..d9d0d0ee1 100644 --- a/src/tests/read_write_col_perf.c +++ b/src/tests/read_write_col_perf.c @@ -138,26 +138,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -180,7 +180,7 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont, obj_name1, obj_prop); #endif if (obj1 <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -218,16 +218,16 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -238,7 +238,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Fail to open object"); + LOG_ERROR("Failed to open object"); ret_value = 1; } @@ -285,17 +285,17 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -304,22 +304,22 @@ main(int argc, char **argv) #endif // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/read_write_perf.c b/src/tests/read_write_perf.c index 1836fab34..152140d5f 100644 --- a/src/tests/read_write_perf.c +++ b/src/tests/read_write_perf.c @@ -131,26 +131,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -167,7 +167,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -209,16 +209,16 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -230,7 +230,7 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Fail to open object"); + LOG_ERROR("Failed to open object"); ret_value = 1; } @@ -277,17 +277,17 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } } @@ -296,22 +296,22 @@ main(int argc, char **argv) #endif // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map.c b/src/tests/region_obj_map.c index fdfec0afd..a44f04f6a 100644 --- a/src/tests/region_obj_map.c +++ b/src/tests/region_obj_map.c @@ -76,7 +76,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -86,7 +86,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -95,13 +95,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -118,7 +118,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -128,7 +128,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -167,7 +167,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -175,7 +175,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -217,7 +217,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -225,7 +225,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -234,14 +234,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -249,7 +249,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -257,7 +257,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -265,7 +265,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -276,7 +276,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_2D.c b/src/tests/region_obj_map_2D.c index 83d23936e..21623ca62 100644 --- a/src/tests/region_obj_map_2D.c +++ b/src/tests/region_obj_map_2D.c @@ -75,7 +75,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -85,7 +85,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -94,13 +94,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -117,7 +117,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -127,7 +127,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -168,7 +168,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -176,7 +176,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -221,7 +221,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -229,7 +229,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -238,14 +238,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -253,7 +253,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -261,7 +261,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -269,7 +269,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -280,7 +280,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_2D_partial.c b/src/tests/region_obj_map_2D_partial.c index bf6728acb..096718ea8 100644 --- a/src/tests/region_obj_map_2D_partial.c +++ b/src/tests/region_obj_map_2D_partial.c @@ -75,7 +75,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -85,7 +85,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -94,13 +94,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -117,7 +117,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -127,7 +127,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -176,7 +176,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -184,7 +184,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -237,7 +237,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -245,7 +245,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -254,14 +254,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -269,7 +269,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -277,7 +277,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -285,7 +285,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -296,7 +296,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_3D.c b/src/tests/region_obj_map_3D.c index 5f9f074fa..cf88d24cd 100644 --- a/src/tests/region_obj_map_3D.c +++ b/src/tests/region_obj_map_3D.c @@ -77,7 +77,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -87,7 +87,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -96,13 +96,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -129,7 +129,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -170,7 +170,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -178,7 +178,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -223,7 +223,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -231,7 +231,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -240,14 +240,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -255,7 +255,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -263,7 +263,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -271,7 +271,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -282,7 +282,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_3D_partial.c b/src/tests/region_obj_map_3D_partial.c index 43078bbf3..fe9760621 100644 --- a/src/tests/region_obj_map_3D_partial.c +++ b/src/tests/region_obj_map_3D_partial.c @@ -77,7 +77,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -87,7 +87,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -96,13 +96,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -129,7 +129,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -170,7 +170,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -178,7 +178,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -235,7 +235,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -243,7 +243,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -252,14 +252,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -267,7 +267,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -275,7 +275,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -283,7 +283,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -294,7 +294,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_merge.c b/src/tests/region_obj_map_merge.c index fe5b39b21..be95f4929 100644 --- a/src/tests/region_obj_map_merge.c +++ b/src/tests/region_obj_map_merge.c @@ -76,7 +76,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -86,7 +86,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -95,13 +95,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -118,7 +118,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -128,7 +128,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -165,7 +165,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -200,14 +200,14 @@ main(int argc, char **argv) ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -256,7 +256,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -264,7 +264,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -273,14 +273,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -288,7 +288,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -296,7 +296,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -304,7 +304,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -315,7 +315,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_overlap.c b/src/tests/region_obj_map_overlap.c index b731963a0..50d754c15 100644 --- a/src/tests/region_obj_map_overlap.c +++ b/src/tests/region_obj_map_overlap.c @@ -76,7 +76,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -86,7 +86,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -95,13 +95,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -118,7 +118,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -128,7 +128,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -165,7 +165,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -200,14 +200,14 @@ main(int argc, char **argv) ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -256,7 +256,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -264,7 +264,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -308,7 +308,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -316,7 +316,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -364,7 +364,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -372,7 +372,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -381,14 +381,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -396,7 +396,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -404,7 +404,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -412,7 +412,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -423,7 +423,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_overlap_2D.c b/src/tests/region_obj_map_overlap_2D.c index c24fedf1e..7d1049818 100644 --- a/src/tests/region_obj_map_overlap_2D.c +++ b/src/tests/region_obj_map_overlap_2D.c @@ -77,7 +77,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -87,7 +87,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -96,13 +96,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -129,7 +129,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -168,7 +168,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -205,14 +205,14 @@ main(int argc, char **argv) ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -268,7 +268,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -276,7 +276,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -322,14 +322,14 @@ main(int argc, char **argv) ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -385,14 +385,14 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -401,14 +401,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -416,7 +416,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -424,7 +424,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -432,7 +432,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -443,7 +443,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_overlap_3D.c b/src/tests/region_obj_map_overlap_3D.c index 374dfe6bc..afde86875 100644 --- a/src/tests/region_obj_map_overlap_3D.c +++ b/src/tests/region_obj_map_overlap_3D.c @@ -79,7 +79,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -89,7 +89,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -98,13 +98,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -121,7 +121,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -131,7 +131,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -156,7 +156,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -179,14 +179,14 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -226,14 +226,14 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -267,7 +267,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -275,7 +275,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -315,7 +315,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -323,7 +323,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -332,14 +332,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -347,7 +347,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -355,7 +355,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -363,7 +363,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -374,7 +374,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_obj_map_partial.c b/src/tests/region_obj_map_partial.c index 60cb3d2f9..e70ee95af 100644 --- a/src/tests/region_obj_map_partial.c +++ b/src/tests/region_obj_map_partial.c @@ -75,7 +75,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -85,7 +85,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -94,13 +94,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_buf(obj_prop, obj_data); @@ -117,7 +117,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -127,7 +127,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -164,7 +164,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -172,7 +172,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -221,7 +221,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -229,7 +229,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -238,14 +238,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -253,7 +253,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -261,7 +261,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -269,7 +269,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -280,7 +280,7 @@ main(int argc, char **argv) free(obj_data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } diff --git a/src/tests/region_transfer.c b/src/tests/region_transfer.c index f72632b48..83e683082 100644 --- a/src/tests/region_transfer.c +++ b/src/tests/region_transfer.c @@ -74,7 +74,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -84,7 +84,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -93,13 +93,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -115,7 +115,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -125,7 +125,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -136,7 +136,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); @@ -144,7 +144,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -155,21 +155,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -177,7 +177,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -192,17 +192,17 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } // Check if data written previously has been correctly read. @@ -215,7 +215,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -223,7 +223,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -232,14 +232,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -247,7 +247,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -255,7 +255,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -263,7 +263,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -273,7 +273,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_2D.c b/src/tests/region_transfer_2D.c index b5f1841d7..84297b44a 100644 --- a/src/tests/region_transfer_2D.c +++ b/src/tests/region_transfer_2D.c @@ -68,7 +68,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -87,13 +87,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -109,7 +109,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -143,7 +143,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -151,7 +151,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -183,7 +183,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -191,7 +191,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -200,14 +200,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -215,7 +215,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -223,7 +223,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -231,7 +231,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -241,7 +241,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_2D_partial.c b/src/tests/region_transfer_2D_partial.c index 8d3ae7d81..b64ea43d0 100644 --- a/src/tests/region_transfer_2D_partial.c +++ b/src/tests/region_transfer_2D_partial.c @@ -73,7 +73,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property\n"); + LOG_ERROR("Failed to create container property\n"); ret_value = 1; } // create a container @@ -83,7 +83,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container\n"); + LOG_ERROR("Failed to create container\n"); ret_value = 1; } // create an object property @@ -92,13 +92,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property\n"); + LOG_ERROR("Failed to create object property\n"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type\n"); + LOG_ERROR("Failed to set obj type\n"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -114,7 +114,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -124,7 +124,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -153,7 +153,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -161,7 +161,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -197,7 +197,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -205,7 +205,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -214,14 +214,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -229,7 +229,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -237,7 +237,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property\n"); + LOG_ERROR("Failed to close property\n"); ret_value = 1; } else { @@ -245,7 +245,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property\n"); + LOG_ERROR("Failed to close property\n"); ret_value = 1; } else { @@ -255,7 +255,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_2D_skewed.c b/src/tests/region_transfer_2D_skewed.c index 6e7be67d9..91134faa3 100644 --- a/src/tests/region_transfer_2D_skewed.c +++ b/src/tests/region_transfer_2D_skewed.c @@ -68,7 +68,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -87,13 +87,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -109,7 +109,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -119,7 +119,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // Testing first object @@ -145,7 +145,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -153,7 +153,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -186,7 +186,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -194,7 +194,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -224,7 +224,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -232,7 +232,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -267,7 +267,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -275,7 +275,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -284,14 +284,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -299,7 +299,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -307,7 +307,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -315,7 +315,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -325,7 +325,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_3D.c b/src/tests/region_transfer_3D.c index da10195f0..30a1099e1 100644 --- a/src/tests/region_transfer_3D.c +++ b/src/tests/region_transfer_3D.c @@ -69,7 +69,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -79,7 +79,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -88,13 +88,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -110,7 +110,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -120,7 +120,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -154,7 +154,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -188,7 +188,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -196,7 +196,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -205,14 +205,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -220,7 +220,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -228,7 +228,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -236,7 +236,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -246,7 +246,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_3D_partial.c b/src/tests/region_transfer_3D_partial.c index a66f39122..e59910d30 100644 --- a/src/tests/region_transfer_3D_partial.c +++ b/src/tests/region_transfer_3D_partial.c @@ -75,7 +75,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -85,7 +85,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -94,13 +94,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -116,7 +116,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -126,7 +126,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -147,7 +147,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -155,7 +155,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -195,7 +195,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -203,7 +203,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -212,14 +212,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -227,7 +227,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -235,7 +235,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -243,7 +243,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -253,7 +253,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_3D_skewed.c b/src/tests/region_transfer_3D_skewed.c index 4cb26ecee..4ffe99350 100644 --- a/src/tests/region_transfer_3D_skewed.c +++ b/src/tests/region_transfer_3D_skewed.c @@ -69,7 +69,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -79,7 +79,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -88,13 +88,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -110,7 +110,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -120,7 +120,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // Testing the first object @@ -150,7 +150,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -158,7 +158,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -200,7 +200,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -208,7 +208,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -242,7 +242,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -250,7 +250,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -288,7 +288,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -296,7 +296,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -305,14 +305,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -320,7 +320,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -328,7 +328,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -336,7 +336,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -346,7 +346,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all.c b/src/tests/region_transfer_all.c index 3f8570cc8..4a5f765be 100644 --- a/src/tests/region_transfer_all.c +++ b/src/tests/region_transfer_all.c @@ -88,7 +88,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -98,7 +98,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -107,13 +107,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -146,7 +146,7 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } @@ -156,7 +156,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -168,7 +168,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -179,7 +179,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -196,7 +196,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -204,7 +204,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -212,7 +212,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -225,7 +225,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -235,7 +235,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -243,12 +243,12 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -256,7 +256,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -277,7 +277,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -285,7 +285,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -293,7 +293,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -306,7 +306,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -316,7 +316,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -324,7 +324,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -332,7 +332,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -351,7 +351,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -359,7 +359,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -368,7 +368,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -376,7 +376,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -384,7 +384,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -398,7 +398,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_2D.c b/src/tests/region_transfer_all_2D.c index c91071d61..9181b48a6 100644 --- a/src/tests/region_transfer_all_2D.c +++ b/src/tests/region_transfer_all_2D.c @@ -87,7 +87,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -97,7 +97,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -106,13 +106,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -150,7 +150,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -162,7 +162,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -175,7 +175,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -193,7 +193,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -201,7 +201,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -209,7 +209,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -222,7 +222,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -232,7 +232,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -240,12 +240,12 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -253,7 +253,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -276,7 +276,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -284,7 +284,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -292,7 +292,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -305,7 +305,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -315,7 +315,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -323,7 +323,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -331,7 +331,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -350,7 +350,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -358,7 +358,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -367,7 +367,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -375,7 +375,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -383,7 +383,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -397,7 +397,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_3D.c b/src/tests/region_transfer_all_3D.c index 2f2991d2d..bfd430dd6 100644 --- a/src/tests/region_transfer_all_3D.c +++ b/src/tests/region_transfer_all_3D.c @@ -90,7 +90,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -100,7 +100,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -109,13 +109,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -153,7 +153,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -165,7 +165,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -180,7 +180,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -198,7 +198,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -206,7 +206,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -214,7 +214,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -222,14 +222,14 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } for (i = 1; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -237,12 +237,12 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -250,7 +250,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -275,7 +275,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -283,7 +283,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -291,7 +291,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -299,14 +299,14 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } for (i = 1; i < OBJ_NUM; i += 2) { ret = PDCregion_transfer_wait(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -314,7 +314,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -322,7 +322,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -341,7 +341,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -349,7 +349,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -358,7 +358,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -366,7 +366,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -374,7 +374,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -388,7 +388,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_append.c b/src/tests/region_transfer_all_append.c index d547a9157..efd5b9d60 100644 --- a/src/tests/region_transfer_all_append.c +++ b/src/tests/region_transfer_all_append.c @@ -89,26 +89,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -143,7 +143,7 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_create(cont, obj_name, obj_prop); if (obj[i] <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -152,7 +152,7 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -170,13 +170,13 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data[i] + j * BUF_LEN / REQ_SIZE, PDC_WRITE, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } /* else { */ @@ -188,7 +188,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -196,7 +196,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -204,7 +204,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -217,7 +217,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -227,7 +227,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -236,7 +236,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -244,7 +244,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } /* else { */ @@ -253,7 +253,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } /* else { */ @@ -267,7 +267,7 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -283,13 +283,13 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN / REQ_SIZE; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data_read[i] + j * BUF_LEN / REQ_SIZE, PDC_READ, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } /* else { */ @@ -300,7 +300,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -308,7 +308,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -316,7 +316,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -329,7 +329,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -339,7 +339,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -348,7 +348,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -357,7 +357,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } /* else { */ @@ -383,7 +383,7 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - LOG_ERROR("Fail to open object"); + LOG_ERROR("Failed to open object"); ret_value = 1; } } @@ -392,7 +392,7 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -400,7 +400,7 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -409,7 +409,7 @@ main(int argc, char **argv) transfer_request[i] = PDCregion_transfer_create(data_read[i], PDC_READ, obj[i], reg, reg_global); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } /* else { */ @@ -419,7 +419,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -427,7 +427,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -435,7 +435,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -448,7 +448,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -458,7 +458,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -466,7 +466,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -474,7 +474,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } /* else { */ @@ -494,7 +494,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } /* else { */ @@ -510,7 +510,7 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -525,13 +525,13 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -542,7 +542,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -550,7 +550,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -558,7 +558,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -571,7 +571,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -581,7 +581,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -589,13 +589,13 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } /* else { */ @@ -603,7 +603,7 @@ main(int argc, char **argv) /* } */ if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } /* else { */ @@ -613,7 +613,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } /* else { */ @@ -629,7 +629,7 @@ main(int argc, char **argv) sprintf(obj_name, "o%d_%d", i, rank); obj[i] = PDCobj_open(obj_name, pdc); if (obj[i] <= 0) { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -638,13 +638,13 @@ main(int argc, char **argv) offset_length[0] = BUF_LEN; reg = PDCregion_create(1, offset, offset_length); if (reg <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); if (reg_global <= 0) { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -655,7 +655,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -663,7 +663,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -671,7 +671,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -684,7 +684,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -694,7 +694,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -702,13 +702,13 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } /* else { */ @@ -716,7 +716,7 @@ main(int argc, char **argv) /* } */ if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } /* else { */ @@ -726,7 +726,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } /* else { */ @@ -749,7 +749,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } /* else { */ @@ -757,7 +757,7 @@ main(int argc, char **argv) /* } */ // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } /* else { */ @@ -765,7 +765,7 @@ main(int argc, char **argv) /* } */ // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } /* else { */ @@ -777,7 +777,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } diff --git a/src/tests/region_transfer_all_append_2D.c b/src/tests/region_transfer_all_append_2D.c index bad6cd573..a28269320 100644 --- a/src/tests/region_transfer_all_append_2D.c +++ b/src/tests/region_transfer_all_append_2D.c @@ -92,7 +92,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -102,7 +102,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -111,13 +111,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -155,7 +155,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -167,7 +167,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -190,13 +190,13 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data[i] + j * BUF_LEN / REQ_SIZE, PDC_WRITE, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -208,7 +208,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -216,7 +216,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -224,7 +224,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -237,7 +237,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -247,7 +247,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -256,14 +256,14 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } } for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -272,7 +272,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -290,7 +290,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -307,13 +307,13 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data_read[i] + j * BUF_LEN / REQ_SIZE, PDC_READ, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -322,7 +322,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -332,7 +332,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -340,7 +340,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -348,7 +348,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -361,7 +361,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -371,7 +371,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -380,7 +380,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -388,7 +388,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -414,7 +414,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -426,7 +426,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -439,7 +439,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -449,7 +449,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -457,7 +457,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -467,7 +467,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -475,7 +475,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -483,7 +483,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -496,7 +496,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -506,7 +506,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -514,7 +514,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -522,7 +522,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -553,7 +553,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -571,7 +571,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -584,7 +584,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -595,7 +595,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -603,7 +603,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -611,7 +611,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -624,7 +624,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -634,7 +634,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -642,13 +642,13 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -656,7 +656,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -666,7 +666,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -682,7 +682,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -694,7 +694,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -707,7 +707,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -718,7 +718,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -726,7 +726,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -734,7 +734,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -747,7 +747,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -757,7 +757,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -765,13 +765,13 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -779,7 +779,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -789,7 +789,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -809,7 +809,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -817,7 +817,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -825,7 +825,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -837,7 +837,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_append_3D.c b/src/tests/region_transfer_all_append_3D.c index c26e0005e..92fddf77a 100644 --- a/src/tests/region_transfer_all_append_3D.c +++ b/src/tests/region_transfer_all_append_3D.c @@ -94,7 +94,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -104,7 +104,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -113,13 +113,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -157,7 +157,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -169,7 +169,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -194,13 +194,13 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data[i] + j * BUF_LEN / REQ_SIZE, PDC_WRITE, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -212,7 +212,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -220,7 +220,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -228,7 +228,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -241,7 +241,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -251,7 +251,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -260,7 +260,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -269,7 +269,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -278,7 +278,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -292,7 +292,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -303,7 +303,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -322,13 +322,13 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } transfer_request[i * REQ_SIZE + j] = PDCregion_transfer_create( data_read[i] + j * BUF_LEN / REQ_SIZE, PDC_READ, obj[i], reg, reg_global); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -339,7 +339,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -347,7 +347,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM * REQ_SIZE; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -355,7 +355,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM * REQ_SIZE); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -368,7 +368,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -378,7 +378,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -387,7 +387,7 @@ main(int argc, char **argv) for (j = 0; j < REQ_SIZE; ++j) { ret = PDCregion_transfer_close(transfer_request[i * REQ_SIZE + j]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -396,7 +396,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -422,13 +422,13 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -442,7 +442,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } offset[0] = 0; @@ -456,7 +456,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -466,7 +466,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -474,7 +474,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -484,7 +484,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -492,7 +492,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -500,7 +500,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -513,7 +513,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -523,7 +523,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -531,7 +531,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -539,7 +539,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -573,7 +573,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -591,7 +591,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -606,7 +606,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -617,7 +617,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -625,7 +625,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -633,7 +633,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -646,7 +646,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -656,7 +656,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -664,13 +664,13 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -678,7 +678,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -688,7 +688,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -704,7 +704,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -716,7 +716,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -731,7 +731,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -742,7 +742,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -750,7 +750,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -758,7 +758,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -771,7 +771,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -781,7 +781,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -789,13 +789,13 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -803,7 +803,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -813,7 +813,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -833,7 +833,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -841,7 +841,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -849,7 +849,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -861,7 +861,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_fold.c b/src/tests/region_transfer_all_fold.c index e9f4dc67c..bb5f696ef 100644 --- a/src/tests/region_transfer_all_fold.c +++ b/src/tests/region_transfer_all_fold.c @@ -161,7 +161,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -200,7 +200,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -208,7 +208,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -216,7 +216,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -228,7 +228,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_split_wait.c b/src/tests/region_transfer_all_split_wait.c index 71a361b25..e1d793ba8 100644 --- a/src/tests/region_transfer_all_split_wait.c +++ b/src/tests/region_transfer_all_split_wait.c @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -88,7 +88,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -97,13 +97,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -141,7 +141,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -153,7 +153,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -164,7 +164,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -180,38 +180,38 @@ main(int argc, char **argv) } ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM / 2); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_start_all(transfer_request + OBJ_NUM / 2, OBJ_NUM / 2); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM / 4, OBJ_NUM / 2); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM / 4); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM * 3 / 4, OBJ_NUM / 4); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -219,7 +219,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -239,33 +239,33 @@ main(int argc, char **argv) } ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM / 2); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_start_all(transfer_request + OBJ_NUM / 2, OBJ_NUM / 2); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM / 4, OBJ_NUM / 2); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM / 4); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request + OBJ_NUM * 3 / 4, OBJ_NUM / 4); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -273,7 +273,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -292,7 +292,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -300,7 +300,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -309,7 +309,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -317,7 +317,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -325,7 +325,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -339,7 +339,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_all_test.c b/src/tests/region_transfer_all_test.c index ab842c083..a93c024d6 100644 --- a/src/tests/region_transfer_all_test.c +++ b/src/tests/region_transfer_all_test.c @@ -78,7 +78,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -88,7 +88,7 @@ main(int argc, char **argv) LOG_ERROR("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -97,13 +97,13 @@ main(int argc, char **argv) LOG_ERROR("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -121,7 +121,7 @@ main(int argc, char **argv) LOG_ERROR("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -133,7 +133,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -144,7 +144,7 @@ main(int argc, char **argv) LOG_ERROR("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -161,18 +161,18 @@ main(int argc, char **argv) ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -184,25 +184,25 @@ main(int argc, char **argv) ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -210,7 +210,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - zv("fail to close global region"); + zv("Failed to close global region"); ret_value = 1; } else { @@ -220,7 +220,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -229,7 +229,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -237,7 +237,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -245,7 +245,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -259,7 +259,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } else { diff --git a/src/tests/region_transfer_merge.c b/src/tests/region_transfer_merge.c index 870705cfd..6f7fee26a 100644 --- a/src/tests/region_transfer_merge.c +++ b/src/tests/region_transfer_merge.c @@ -74,7 +74,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -84,7 +84,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -93,13 +93,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -115,7 +115,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -125,7 +125,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -165,14 +165,14 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -204,7 +204,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -212,7 +212,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -221,14 +221,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -236,7 +236,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -244,7 +244,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -252,7 +252,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -262,7 +262,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_overlap.c b/src/tests/region_transfer_overlap.c index b551c3a96..5728c0a4e 100644 --- a/src/tests/region_transfer_overlap.c +++ b/src/tests/region_transfer_overlap.c @@ -74,7 +74,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -84,7 +84,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -93,13 +93,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -115,7 +115,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -125,7 +125,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -165,14 +165,14 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -204,7 +204,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -212,7 +212,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -240,7 +240,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -248,7 +248,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -279,7 +279,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -287,7 +287,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -296,14 +296,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -311,7 +311,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -319,7 +319,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -327,7 +327,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -337,7 +337,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_overlap_2D.c b/src/tests/region_transfer_overlap_2D.c index f02a46134..b2ab23abd 100644 --- a/src/tests/region_transfer_overlap_2D.c +++ b/src/tests/region_transfer_overlap_2D.c @@ -75,7 +75,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -85,7 +85,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -94,13 +94,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 2, dims); @@ -116,7 +116,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -126,7 +126,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -149,7 +149,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -170,14 +170,14 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -216,7 +216,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -224,7 +224,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -254,14 +254,14 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -300,14 +300,14 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -316,14 +316,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -331,7 +331,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -339,7 +339,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -347,7 +347,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -357,7 +357,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_overlap_3D.c b/src/tests/region_transfer_overlap_3D.c index 05436d5e5..6a68b0b3e 100644 --- a/src/tests/region_transfer_overlap_3D.c +++ b/src/tests/region_transfer_overlap_3D.c @@ -76,7 +76,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -86,7 +86,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -95,13 +95,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 3, dims); @@ -117,7 +117,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -127,7 +127,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -152,7 +152,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -175,14 +175,14 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -222,14 +222,14 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { LOG_INFO("successfully closed local region"); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -263,7 +263,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -271,7 +271,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -311,7 +311,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -319,7 +319,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -328,14 +328,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -343,7 +343,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -351,7 +351,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -359,7 +359,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -369,7 +369,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_partial.c b/src/tests/region_transfer_partial.c index c4b273dda..4308fc940 100644 --- a/src/tests/region_transfer_partial.c +++ b/src/tests/region_transfer_partial.c @@ -73,7 +73,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -83,7 +83,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -92,13 +92,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -114,7 +114,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -124,7 +124,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -145,7 +145,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -153,7 +153,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -185,7 +185,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } else { @@ -193,7 +193,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } else { @@ -202,14 +202,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1\n"); + LOG_ERROR("Failed to close object o1\n"); ret_value = 1; } else { LOG_INFO("successfully close object o1\n"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2\n"); + LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { @@ -217,7 +217,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); ret_value = 1; } else { @@ -225,7 +225,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -233,7 +233,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -243,7 +243,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } diff --git a/src/tests/region_transfer_query.c b/src/tests/region_transfer_query.c index 8e5b9ff44..497a95a80 100644 --- a/src/tests/region_transfer_query.c +++ b/src/tests/region_transfer_query.c @@ -74,7 +74,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -84,7 +84,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -93,13 +93,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_DOUBLE); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -115,7 +115,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -126,7 +126,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); @@ -134,7 +134,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -145,17 +145,17 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } @@ -181,7 +181,7 @@ main(int argc, char **argv) PDCselection_free(&sel); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -189,7 +189,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -198,7 +198,7 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj_id) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -207,7 +207,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -215,7 +215,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -223,7 +223,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -232,7 +232,7 @@ main(int argc, char **argv) free(data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_read_only.c b/src/tests/region_transfer_read_only.c index 810fe71d8..21e172403 100644 --- a/src/tests/region_transfer_read_only.c +++ b/src/tests/region_transfer_read_only.c @@ -65,7 +65,7 @@ main(int argc, char **argv) LOG_INFO("Open a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } @@ -76,7 +76,7 @@ main(int argc, char **argv) LOG_INFO("Open an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -86,7 +86,7 @@ main(int argc, char **argv) LOG_INFO("Open an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create third object @@ -96,7 +96,7 @@ main(int argc, char **argv) LOG_INFO("Open an object o3\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -109,12 +109,12 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. @@ -127,11 +127,11 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -139,7 +139,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -156,7 +156,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); @@ -164,7 +164,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -172,12 +172,12 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. @@ -190,11 +190,11 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -202,7 +202,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -221,7 +221,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); @@ -229,7 +229,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -237,12 +237,12 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. @@ -255,11 +255,11 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -267,7 +267,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -275,21 +275,21 @@ main(int argc, char **argv) } // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - LOG_ERROR("Fail to close object o3"); + LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { @@ -297,7 +297,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -306,7 +306,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_set_dims.c b/src/tests/region_transfer_set_dims.c index bf894fb65..d3a20c74a 100644 --- a/src/tests/region_transfer_set_dims.c +++ b/src/tests/region_transfer_set_dims.c @@ -89,7 +89,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -99,7 +99,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -108,13 +108,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -147,7 +147,7 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } @@ -157,7 +157,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -169,7 +169,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -180,7 +180,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -197,7 +197,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -205,7 +205,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -213,7 +213,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -226,7 +226,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -236,7 +236,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -244,12 +244,12 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -257,7 +257,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -278,7 +278,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -286,7 +286,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -294,7 +294,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -307,7 +307,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -317,7 +317,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -325,7 +325,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -341,7 +341,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -349,7 +349,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -386,7 +386,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -394,7 +394,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -404,7 +404,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -412,7 +412,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -420,7 +420,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -433,7 +433,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -443,7 +443,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -451,7 +451,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -469,7 +469,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -477,7 +477,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -487,7 +487,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -495,7 +495,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -503,7 +503,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -516,7 +516,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -526,7 +526,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -534,7 +534,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -542,7 +542,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -569,7 +569,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -610,7 +610,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -618,7 +618,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -628,7 +628,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -636,7 +636,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -644,7 +644,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -657,7 +657,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -667,7 +667,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -675,7 +675,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -683,7 +683,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -705,7 +705,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -713,7 +713,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -721,7 +721,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -735,7 +735,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_set_dims_2D.c b/src/tests/region_transfer_set_dims_2D.c index bd8219b21..599acb6b1 100644 --- a/src/tests/region_transfer_set_dims_2D.c +++ b/src/tests/region_transfer_set_dims_2D.c @@ -92,7 +92,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -102,7 +102,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -111,13 +111,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -150,7 +150,7 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } @@ -160,7 +160,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -174,7 +174,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -187,7 +187,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -204,7 +204,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -212,7 +212,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -220,7 +220,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -233,7 +233,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -243,7 +243,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -251,12 +251,12 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -264,7 +264,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -285,7 +285,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -293,7 +293,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -301,7 +301,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -314,7 +314,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -324,7 +324,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -332,7 +332,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -348,7 +348,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -356,7 +356,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -394,7 +394,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -402,7 +402,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -412,7 +412,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -420,7 +420,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -428,7 +428,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -441,7 +441,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -451,7 +451,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -459,7 +459,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -477,7 +477,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -485,7 +485,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -495,7 +495,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -503,7 +503,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -511,7 +511,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -524,7 +524,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -534,7 +534,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -542,7 +542,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -550,7 +550,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -577,7 +577,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -619,7 +619,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -627,7 +627,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -637,7 +637,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -645,7 +645,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -653,7 +653,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -666,7 +666,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -676,7 +676,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -684,7 +684,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -692,7 +692,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -715,7 +715,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -723,7 +723,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -731,7 +731,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -745,7 +745,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_set_dims_3D.c b/src/tests/region_transfer_set_dims_3D.c index 7db01ca76..94280037c 100644 --- a/src/tests/region_transfer_set_dims_3D.c +++ b/src/tests/region_transfer_set_dims_3D.c @@ -94,7 +94,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -104,7 +104,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -113,13 +113,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, ndim, dims); @@ -152,7 +152,7 @@ main(int argc, char **argv) } } if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } @@ -162,7 +162,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -178,7 +178,7 @@ main(int argc, char **argv) LOG_INFO("Create local region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } @@ -193,7 +193,7 @@ main(int argc, char **argv) LOG_INFO("Create global region\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (j = 0; j < OBJ_NUM; ++j) { @@ -210,7 +210,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -218,7 +218,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -226,7 +226,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -239,7 +239,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -249,7 +249,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -257,12 +257,12 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -270,7 +270,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -293,7 +293,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -301,7 +301,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -309,7 +309,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -322,7 +322,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -332,7 +332,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -340,7 +340,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -356,7 +356,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -364,7 +364,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -405,7 +405,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -413,7 +413,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -423,7 +423,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -431,7 +431,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -439,7 +439,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -452,7 +452,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -462,7 +462,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -470,7 +470,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -490,7 +490,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -498,7 +498,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -508,7 +508,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -516,7 +516,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -524,7 +524,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -537,7 +537,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -547,7 +547,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -555,7 +555,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -563,7 +563,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -590,7 +590,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } } @@ -635,7 +635,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -643,7 +643,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -653,7 +653,7 @@ main(int argc, char **argv) if (start_method) { ret = PDCregion_transfer_start_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -661,7 +661,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_start(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } } @@ -669,7 +669,7 @@ main(int argc, char **argv) if (wait_method == 1) { ret = PDCregion_transfer_wait_all(transfer_request, OBJ_NUM); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } } @@ -682,7 +682,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } request_size = 0; @@ -692,7 +692,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_wait_all(transfer_request_all, request_size); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } free(transfer_request_all); @@ -700,7 +700,7 @@ main(int argc, char **argv) for (i = 0; i < OBJ_NUM; ++i) { ret = PDCregion_transfer_close(transfer_request[i]); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } } @@ -708,7 +708,7 @@ main(int argc, char **argv) // close object for (i = 0; i < OBJ_NUM; ++i) { if (PDCobj_close(obj[i]) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { @@ -731,7 +731,7 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -739,7 +739,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -747,7 +747,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -761,7 +761,7 @@ main(int argc, char **argv) free(transfer_request); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_skewed.c b/src/tests/region_transfer_skewed.c index def32453a..c8f1075e7 100644 --- a/src/tests/region_transfer_skewed.c +++ b/src/tests/region_transfer_skewed.c @@ -67,7 +67,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -77,7 +77,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -86,13 +86,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -108,7 +108,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -118,7 +118,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -140,7 +140,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -148,7 +148,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -178,7 +178,7 @@ main(int argc, char **argv) } } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -186,7 +186,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -195,14 +195,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -210,7 +210,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -218,7 +218,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -226,7 +226,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -236,7 +236,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_status.c b/src/tests/region_transfer_status.c index cad2328f7..9642df728 100644 --- a/src/tests/region_transfer_status.c +++ b/src/tests/region_transfer_status.c @@ -76,7 +76,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -86,7 +86,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -95,13 +95,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_dims(obj_prop, 1, dims); @@ -117,7 +117,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -127,7 +127,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -138,7 +138,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); @@ -146,7 +146,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -178,7 +178,7 @@ main(int argc, char **argv) PDCregion_transfer_close(transfer_request); if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -186,7 +186,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -232,7 +232,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -240,7 +240,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -249,14 +249,14 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { @@ -264,7 +264,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -272,7 +272,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -280,7 +280,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -290,7 +290,7 @@ main(int argc, char **argv) free(data_read); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_write_only.c b/src/tests/region_transfer_write_only.c index 5e8d67d6f..e5e2ca980 100644 --- a/src/tests/region_transfer_write_only.c +++ b/src/tests/region_transfer_write_only.c @@ -66,7 +66,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -76,7 +76,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -85,13 +85,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -108,7 +108,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -121,7 +121,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create third object @@ -135,7 +135,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o3\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -146,7 +146,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); @@ -154,7 +154,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -165,21 +165,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -187,7 +187,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -201,7 +201,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); @@ -209,7 +209,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -220,21 +220,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -242,7 +242,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -259,7 +259,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); @@ -267,7 +267,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -278,21 +278,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -300,7 +300,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -319,7 +319,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); @@ -327,7 +327,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -338,21 +338,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -360,7 +360,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -369,21 +369,21 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - LOG_ERROR("Fail to close object o3"); + LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { @@ -391,7 +391,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -399,7 +399,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -407,7 +407,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -416,7 +416,7 @@ main(int argc, char **argv) free(data); // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/region_transfer_write_read.c b/src/tests/region_transfer_write_read.c index 8e9dd7166..a51926f86 100644 --- a/src/tests/region_transfer_write_read.c +++ b/src/tests/region_transfer_write_read.c @@ -73,7 +73,7 @@ main(int argc, char **argv) LOG_INFO("Create a container property\n"); } else { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container @@ -83,7 +83,7 @@ main(int argc, char **argv) LOG_INFO("Create a container c1\n"); } else { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property @@ -92,13 +92,13 @@ main(int argc, char **argv) LOG_INFO("Create an object property\n"); } else { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj type"); + LOG_ERROR("Failed to set obj type"); ret_value = 1; } PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -115,7 +115,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -128,7 +128,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create third object @@ -142,7 +142,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o3\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -153,7 +153,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); @@ -161,7 +161,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -172,21 +172,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -194,7 +194,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -208,7 +208,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(1, offset, offset_length); @@ -216,7 +216,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -227,21 +227,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -249,7 +249,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -266,7 +266,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); @@ -274,7 +274,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -285,21 +285,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -307,7 +307,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -326,7 +326,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); @@ -334,7 +334,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } for (i = 0; i < BUF_LEN; ++i) { @@ -345,21 +345,21 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -367,7 +367,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -376,21 +376,21 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - LOG_ERROR("Fail to close object o3"); + LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { @@ -398,7 +398,7 @@ main(int argc, char **argv) } // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Fail to close container c1"); + LOG_ERROR("Failed to close container c1"); ret_value = 1; } else { @@ -406,7 +406,7 @@ main(int argc, char **argv) } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -414,7 +414,7 @@ main(int argc, char **argv) } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -429,7 +429,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o1\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create second object @@ -439,7 +439,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o2\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } // create third object @@ -449,7 +449,7 @@ main(int argc, char **argv) LOG_INFO("Create an object o3\n"); } else { - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); ret_value = 1; } @@ -463,12 +463,12 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. @@ -481,7 +481,7 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } // Read the second object @@ -494,7 +494,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(2, offset, offset_length); @@ -502,7 +502,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -510,12 +510,12 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. @@ -528,11 +528,11 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -540,7 +540,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -559,7 +559,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } reg_global = PDCregion_create(3, offset, offset_length); @@ -567,7 +567,7 @@ main(int argc, char **argv) LOG_INFO("Create an region o1\n"); } else { - LOG_ERROR("Fail to create region"); + LOG_ERROR("Failed to create region"); ret_value = 1; } memset(data_read, 0, BUF_LEN); @@ -575,12 +575,12 @@ main(int argc, char **argv) ret = PDCregion_transfer_start(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer start"); + LOG_ERROR("Failed to region transfer start"); ret_value = 1; } ret = PDCregion_transfer_wait(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer wait"); + LOG_ERROR("Failed to region transfer wait"); ret_value = 1; } // Check if data written previously has been correctly read. @@ -593,11 +593,11 @@ main(int argc, char **argv) } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("Fail to region transfer close"); + LOG_ERROR("Failed to region transfer close"); ret_value = 1; } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Fail to close local region"); + LOG_ERROR("Failed to close local region"); ret_value = 1; } else { @@ -605,7 +605,7 @@ main(int argc, char **argv) } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Fail to close global region"); + LOG_ERROR("Failed to close global region"); ret_value = 1; } else { @@ -614,21 +614,21 @@ main(int argc, char **argv) // close object if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Fail to close object o1"); + LOG_ERROR("Failed to close object o1"); ret_value = 1; } else { LOG_INFO("successfully close object o1"); } if (PDCobj_close(obj2) < 0) { - LOG_ERROR("Fail to close object o2"); + LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { LOG_INFO("successfully close object o2"); } if (PDCobj_close(obj3) < 0) { - LOG_ERROR("Fail to close object o3"); + LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { @@ -636,7 +636,7 @@ main(int argc, char **argv) } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC"); + LOG_ERROR("Failed to close PDC"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/search_obj.c b/src/tests/search_obj.c index c7593d7e6..77c21f351 100644 --- a/src/tests/search_obj.c +++ b/src/tests/search_obj.c @@ -119,17 +119,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -240,14 +240,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container %lld\n", cont); + LOG_ERROR("Failed to close container %lld\n", cont); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDC_close(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/search_obj_scale.c b/src/tests/search_obj_scale.c index 94d89f8a5..47cab7cf7 100644 --- a/src/tests/search_obj_scale.c +++ b/src/tests/search_obj_scale.c @@ -117,17 +117,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -201,14 +201,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/set_prop.c b/src/tests/set_prop.c index 4ca5d78d1..c68921018 100644 --- a/src/tests/set_prop.c +++ b/src/tests/set_prop.c @@ -53,66 +53,66 @@ main(int argc, char **argv) // create an object property create_prop1 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop1 <= 0) { - LOG_ERROR("Fail to create"); + LOG_ERROR("Failed to create"); ret_value = 1; } // create another object property create_prop2 = PDCprop_create(PDC_OBJ_CREATE, pdc); if (create_prop2 <= 0) { - LOG_ERROR("Fail to create"); + LOG_ERROR("Failed to create"); ret_value = 1; } ret = PDCprop_set_obj_user_id(create_prop2, 666); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj user id"); + LOG_ERROR("Failed to set obj user id"); ret_value = 1; } ret = PDCprop_set_obj_data_loc(create_prop2, "somewhere"); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj user id"); + LOG_ERROR("Failed to set obj user id"); ret_value = 1; } ret = PDCprop_set_obj_app_name(create_prop2, "someapp name"); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj user id"); + LOG_ERROR("Failed to set obj user id"); ret_value = 1; } ret = PDCprop_set_obj_time_step(create_prop2, 666); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_tags(create_prop2, "sometag"); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_dims(create_prop2, ndim, dims); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_type(create_prop2, PDC_DOUBLE); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } ret = PDCprop_set_obj_buf(create_prop2, NULL); if (ret != SUCCEED) { - LOG_ERROR("Fail to set obj time step"); + LOG_ERROR("Failed to set obj time step"); ret_value = 1; } if (PDCprop_close(create_prop1) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { LOG_INFO("successfully close first property\n"); } if (PDCprop_close(create_prop2) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } else { @@ -120,7 +120,7 @@ main(int argc, char **argv) } // close a pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } #ifdef ENABLE_MPI diff --git a/src/tests/stat_obj.c b/src/tests/stat_obj.c index 8e9b3ef4f..514a32296 100644 --- a/src/tests/stat_obj.c +++ b/src/tests/stat_obj.c @@ -106,17 +106,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -231,14 +231,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/update_obj.c b/src/tests/update_obj.c index 622f7c782..758cbbdce 100644 --- a/src/tests/update_obj.c +++ b/src/tests/update_obj.c @@ -106,17 +106,17 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont = PDCcont_create("c1", cont_prop); if (cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); env_str = getenv("PDC_OBJ_NAME"); if (env_str != NULL) { @@ -231,14 +231,14 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/vpicio.c b/src/tests/vpicio.c index 7b6adc007..f0bf64f92 100644 --- a/src/tests/vpicio.c +++ b/src/tests/vpicio.c @@ -113,13 +113,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("fail to create container property"); + LOG_ERROR("Failed to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("fail to create container"); + LOG_ERROR("Failed to create container"); return 1; } // create an object property @@ -444,146 +444,146 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj_xx) < 0) { - LOG_ERROR("fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - LOG_ERROR("fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - LOG_ERROR("fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - LOG_ERROR("fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - LOG_ERROR("fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - LOG_ERROR("fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - LOG_ERROR("fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - LOG_ERROR("fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - LOG_ERROR("fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Failed to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_ERROR("fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Failed to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_ERROR("fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Failed to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_ERROR("fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Failed to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_ERROR("fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Failed to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_ERROR("fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Failed to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_ERROR("fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Failed to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_ERROR("fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Failed to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_ERROR("fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_ERROR("fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_ERROR("fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_ERROR("fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_ERROR("fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_ERROR("fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_ERROR("fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_ERROR("fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - LOG_ERROR("fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_ERROR("fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_ERROR("fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_ERROR("fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_ERROR("fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_ERROR("fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_ERROR("fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_ERROR("fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_ERROR("fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("fail to close property"); + LOG_ERROR("Failed to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } free(offset); diff --git a/src/tests/vpicio_mts.c b/src/tests/vpicio_mts.c index 4dfb7250b..5bbc9791b 100644 --- a/src/tests/vpicio_mts.c +++ b/src/tests/vpicio_mts.c @@ -108,13 +108,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); return FAIL; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return FAIL; } // create an object property @@ -330,35 +330,35 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj_xx) != SUCCEED) { - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return FAIL; } if (PDCobj_close(obj_yy) != SUCCEED) { - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return FAIL; } if (PDCobj_close(obj_zz) != SUCCEED) { - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return FAIL; } if (PDCobj_close(obj_pxx) != SUCCEED) { - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return FAIL; } if (PDCobj_close(obj_pyy) != SUCCEED) { - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return FAIL; } if (PDCobj_close(obj_pzz) != SUCCEED) { - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return FAIL; } if (PDCobj_close(obj_id11) != SUCCEED) { - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return FAIL; } if (PDCobj_close(obj_id22) != SUCCEED) { - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return FAIL; } @@ -374,31 +374,31 @@ main(int argc, char **argv) PDC_timing_report("write"); if (PDCprop_close(obj_prop_float) != SUCCEED) { - LOG_ERROR("Fail to close obj_prop_float\n"); + LOG_ERROR("Failed to close obj_prop_float\n"); return FAIL; } if (PDCprop_close(obj_prop_int) != SUCCEED) { - LOG_ERROR("Fail to close obj_prop_int\n"); + LOG_ERROR("Failed to close obj_prop_int\n"); return FAIL; } if (PDCregion_close(region_local) != SUCCEED) { - LOG_ERROR("Fail to close local region \n"); + LOG_ERROR("Failed to close local region \n"); return FAIL; } if (PDCobj_close(region_remote) != SUCCEED) { - LOG_ERROR("Fail to close remote region\n"); + LOG_ERROR("Failed to close remote region\n"); return FAIL; } if (PDCcont_close(cont_id) != SUCCEED) { - LOG_ERROR("Fail to close container\n"); + LOG_ERROR("Failed to close container\n"); return FAIL; } if (PDCprop_close(cont_prop) != SUCCEED) { - LOG_ERROR("Fail to close property\n"); + LOG_ERROR("Failed to close property\n"); return FAIL; } if (PDCclose(pdc_id) != SUCCEED) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return FAIL; } free(x); diff --git a/src/tests/vpicio_old.c b/src/tests/vpicio_old.c index 361e903a4..fe2786b52 100644 --- a/src/tests/vpicio_old.c +++ b/src/tests/vpicio_old.c @@ -109,13 +109,13 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); return 1; } // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); return 1; } // create an object property @@ -394,146 +394,146 @@ main(int argc, char **argv) } PDC_timing_report("write"); if (PDCobj_close(obj_xx) < 0) { - LOG_ERROR("Fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy) < 0) { - LOG_ERROR("Fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz) < 0) { - LOG_ERROR("Fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx) < 0) { - LOG_ERROR("Fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy) < 0) { - LOG_ERROR("Fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz) < 0) { - LOG_ERROR("Fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11) < 0) { - LOG_ERROR("Fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22) < 0) { - LOG_ERROR("Fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return 1; } if (PDCprop_close(obj_prop_xx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Failed to close obj property obj_prop_xx\n"); return 1; } if (PDCprop_close(obj_prop_yy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Failed to close obj property obj_prop_yy\n"); return 1; } if (PDCprop_close(obj_prop_zz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Failed to close obj property obj_prop_zz\n"); return 1; } if (PDCprop_close(obj_prop_pxx) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Failed to close obj property obj_prop_pxx\n"); return 1; } if (PDCprop_close(obj_prop_pyy) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Failed to close obj property obj_prop_pyy\n"); return 1; } if (PDCprop_close(obj_prop_pzz) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Failed to close obj property obj_prop_pzz\n"); return 1; } if (PDCprop_close(obj_prop_id11) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Failed to close obj property obj_prop_id11\n"); return 1; } if (PDCprop_close(obj_prop_id22) < 0) { - LOG_ERROR("Fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Failed to close obj property obj_prop_id22\n"); return 1; } if (PDCregion_close(region_x) < 0) { - LOG_ERROR("Fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_ERROR("Fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_ERROR("Fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_ERROR("Fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_ERROR("Fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_ERROR("Fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_ERROR("Fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_ERROR("Fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); return 1; } if (PDCregion_close(region_xx) < 0) { - LOG_ERROR("Fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { - LOG_ERROR("Fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); return 1; } if (PDCregion_close(region_zz) < 0) { - LOG_ERROR("Fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { - LOG_ERROR("Fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_ERROR("Fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_ERROR("Fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_ERROR("Fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_ERROR("Fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); return 1; } // close a container if (PDCcont_close(cont_id) < 0) { - LOG_ERROR("Fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return 1; } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } free(offset); diff --git a/src/tests/vpicio_v2.c b/src/tests/vpicio_v2.c index de2f94180..ff0347fbc 100644 --- a/src/tests/vpicio_v2.c +++ b/src/tests/vpicio_v2.c @@ -105,12 +105,12 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id); if (cont_prop <= 0) - LOG_ERROR("fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container cont_id = PDCcont_create_col("c1", cont_prop); if (cont_id <= 0) - LOG_ERROR("fail to create container"); + LOG_ERROR("Failed to create container"); // create an object property obj_prop_xx = PDCprop_create(PDC_OBJ_CREATE, pdc_id); @@ -453,111 +453,111 @@ main(int argc, char **argv) #endif if (PDCobj_close(obj_xx) < 0) - LOG_ERROR("fail to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); if (PDCobj_close(obj_yy) < 0) - LOG_ERROR("fail to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); if (PDCobj_close(obj_zz) < 0) - LOG_ERROR("fail to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); if (PDCobj_close(obj_pxx) < 0) - LOG_ERROR("fail to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); if (PDCobj_close(obj_pyy) < 0) - LOG_ERROR("fail to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); if (PDCobj_close(obj_pzz) < 0) - LOG_ERROR("fail to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); if (PDCobj_close(obj_id11) < 0) - LOG_ERROR("fail to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); if (PDCobj_close(obj_id22) < 0) - LOG_ERROR("fail to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); if (PDCprop_close(obj_prop_xx) < 0) - LOG_ERROR("fail to close obj property obj_prop_xx\n"); + LOG_ERROR("Failed to close obj property obj_prop_xx\n"); if (PDCprop_close(obj_prop_yy) < 0) - LOG_ERROR("fail to close obj property obj_prop_yy\n"); + LOG_ERROR("Failed to close obj property obj_prop_yy\n"); if (PDCprop_close(obj_prop_zz) < 0) - LOG_ERROR("fail to close obj property obj_prop_zz\n"); + LOG_ERROR("Failed to close obj property obj_prop_zz\n"); if (PDCprop_close(obj_prop_pxx) < 0) - LOG_ERROR("fail to close obj property obj_prop_pxx\n"); + LOG_ERROR("Failed to close obj property obj_prop_pxx\n"); if (PDCprop_close(obj_prop_pyy) < 0) - LOG_ERROR("fail to close obj property obj_prop_pyy\n"); + LOG_ERROR("Failed to close obj property obj_prop_pyy\n"); if (PDCprop_close(obj_prop_pzz) < 0) - LOG_ERROR("fail to close obj property obj_prop_pzz\n"); + LOG_ERROR("Failed to close obj property obj_prop_pzz\n"); if (PDCprop_close(obj_prop_id11) < 0) - LOG_ERROR("fail to close obj property obj_prop_id11\n"); + LOG_ERROR("Failed to close obj property obj_prop_id11\n"); if (PDCprop_close(obj_prop_id22) < 0) - LOG_ERROR("fail to close obj property obj_prop_id22\n"); + LOG_ERROR("Failed to close obj property obj_prop_id22\n"); if (PDCregion_close(region_x) < 0) - LOG_ERROR("fail to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); if (PDCregion_close(region_y) < 0) - LOG_ERROR("fail to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); if (PDCregion_close(region_z) < 0) - LOG_ERROR("fail to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); if (PDCregion_close(region_px) < 0) - LOG_ERROR("fail to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); if (PDCregion_close(region_py) < 0) - LOG_ERROR("fail to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); if (PDCobj_close(region_pz) < 0) - LOG_ERROR("fail to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); if (PDCobj_close(region_id1) < 0) - LOG_ERROR("fail to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); if (PDCobj_close(region_id2) < 0) - LOG_ERROR("fail to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); if (PDCregion_close(region_xx) < 0) - LOG_ERROR("fail to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); if (PDCregion_close(region_yy) < 0) - LOG_ERROR("fail to close region region_yy\n"); + LOG_ERROR("Failed to close region region_yy\n"); if (PDCregion_close(region_zz) < 0) - LOG_ERROR("fail to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); if (PDCregion_close(region_pxx) < 0) - LOG_ERROR("fail to close region region_pxx\n"); + LOG_ERROR("Failed to close region region_pxx\n"); if (PDCregion_close(region_pyy) < 0) - LOG_ERROR("fail to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); if (PDCregion_close(region_pzz) < 0) - LOG_ERROR("fail to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); if (PDCobj_close(region_id11) < 0) - LOG_ERROR("fail to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); if (PDCobj_close(region_id22) < 0) - LOG_ERROR("fail to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); // close a container if (PDCcont_close(cont_id) < 0) - LOG_ERROR("fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); // close a container property if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc_id) < 0) - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); free(offset); free(offset_remote); diff --git a/src/tests/write_obj_shared.c b/src/tests/write_obj_shared.c index 1c8ff890b..51125a1bd 100644 --- a/src/tests/write_obj_shared.c +++ b/src/tests/write_obj_shared.c @@ -118,20 +118,20 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); ret_value = 1; } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); ret_value = 1; } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); ret_value = 1; } dims[0] = size_B; @@ -214,29 +214,29 @@ main(int argc, char **argv) } done: if (PDCobj_close(global_obj) < 0) { - LOG_ERROR("fail to close global obj\n"); + LOG_ERROR("Failed to close global obj\n"); ret_value = 1; } if (PDCregion_close(local_region) < 0) { - LOG_ERROR("fail to close local region\n"); + LOG_ERROR("Failed to close local region\n"); ret_value = 1; } if (PDCregion_close(global_region) < 0) { - LOG_ERROR("fail to close global region\n"); + LOG_ERROR("Failed to close global region\n"); ret_value = 1; } if (PDCcont_close(cont) < 0) { - LOG_ERROR("fail to close container\n"); + LOG_ERROR("Failed to close container\n"); ret_value = 1; } if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); ret_value = 1; } if (PDCclose(pdc) < 0) { - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); ret_value = 1; } free(mydata); diff --git a/src/tools/meta_json/metadata_json_importer.c b/src/tools/meta_json/metadata_json_importer.c index 177e885c8..d937325de 100644 --- a/src/tools/meta_json/metadata_json_importer.c +++ b/src/tools/meta_json/metadata_json_importer.c @@ -48,12 +48,12 @@ import_json_header(cJSON *dataset_name, cJSON *dataset_description, cJSON *sourc // create a container property pdc_args->cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_args->pdc); if (pdc_args->cont_prop <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); // create a container pdc_args->cont = PDCcont_create(cJSON_GetStringValue(dataset_name), pdc_args->cont_prop); if (pdc_args->cont <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); // extract the strings from the JSON attributes char *ds_desc = cJSON_GetStringValue(dataset_description); @@ -67,7 +67,7 @@ import_json_header(cJSON *dataset_name, cJSON *dataset_description, cJSON *sourc // create an object property pdc_args->obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc_args->pdc); if (pdc_args->obj_prop <= 0) { - LOG_ERROR("Fail to create object property"); + LOG_ERROR("Failed to create object property"); return -1; } @@ -101,18 +101,18 @@ import_object_base(cJSON *name, cJSON *type, cJSON *full_path, MD_JSON_ARGS *md_ sprintf(object_name, "%s_%d%s", cJSON_GetStringValue(name), md_json_args->mpi_rank, datetime_buff); pdc_args->obj_id = PDCobj_create(pdc_args->cont, object_name, pdc_args->obj_prop); if (pdc_args->obj_id <= 0) { - LOG_ERROR("Fail to create object!\n"); + LOG_ERROR("Failed to create object!\n"); return -1; } if (PDCobj_put_tag(pdc_args->obj_id, "obj_full_path", (void *)cJSON_GetStringValue(full_path), PDC_STRING, strlen(cJSON_GetStringValue(full_path)) + 1) != SUCCEED) { - LOG_ERROR("Fail to put tag!\n"); + LOG_ERROR("Failed to put tag!\n"); return -1; } if (PDCobj_put_tag(pdc_args->obj_id, "obj_type", (void *)cJSON_GetStringValue(type), PDC_STRING, strlen(cJSON_GetStringValue(type)) + 1) != SUCCEED) { - LOG_ERROR("Fail to put tag!\n"); + LOG_ERROR("Failed to put tag!\n"); return -1; } @@ -170,7 +170,7 @@ import_object_property(cJSON *name, cJSON *type, cJSON *cls, cJSON *value, MD_JS if (PDCobj_put_tag(pdc_args->obj_id, name->valuestring, (void *)&property_value, pdc_type, property_value_size) != SUCCEED) { - LOG_ERROR("Fail to add tag!\n"); + LOG_ERROR("Failed to add tag!\n"); } end: @@ -189,18 +189,18 @@ finish_import_one_json(MD_JSON_ARGS *md_json_args) // finalize PDC related things // close a container if (PDCcont_close(pdc_args->cont) < 0) { - LOG_ERROR("fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); return -1; } // close a container property if (PDCprop_close(pdc_args->obj_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return -1; } if (PDCprop_close(pdc_args->cont_prop) < 0) { - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); return -1; } @@ -219,7 +219,7 @@ finalize_importer(MD_JSON_ARGS *md_json_args) // finalize PDC related things // close pdc if (PDCclose(pdc_args->pdc) < 0) { - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return -1; } diff --git a/src/tools/pdc_access_eqsim.c b/src/tools/pdc_access_eqsim.c index af01dd47b..2483665d3 100644 --- a/src/tools/pdc_access_eqsim.c +++ b/src/tools/pdc_access_eqsim.c @@ -49,7 +49,7 @@ main(int argc, char **argv) obj = PDCobj_open_col("run1", pdc); if (obj <= 0) - LOG_ERROR("Fail to open object"); + LOG_ERROR("Failed to open object"); /* //=============PATTERN 1=============== */ /* // Read everything */ @@ -288,10 +288,10 @@ main(int argc, char **argv) free(rec_data); if (PDCobj_close(obj) < 0) - LOG_ERROR("fail to close object\n"); + LOG_ERROR("Failed to close object\n"); if (PDCclose(pdc) < 0) - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tools/pdc_import.c b/src/tools/pdc_import.c index d8c798ee2..29ee531b0 100644 --- a/src/tools/pdc_import.c +++ b/src/tools/pdc_import.c @@ -118,7 +118,7 @@ main(int argc, char **argv) cont_prop_g = PDCprop_create(PDC_CONT_CREATE, pdc_id_g); if (cont_prop_g <= 0) - LOG_ERROR("Fail to create container property"); + LOG_ERROR("Failed to create container property"); obj_prop_g = PDCprop_create(PDC_OBJ_CREATE, pdc_id_g); @@ -345,7 +345,7 @@ scan_group(hid_t gid, int level, char *app_name) if (create_cont) { cont_id_g = PDCcont_create(group_name, cont_prop_g); if (cont_id_g <= 0) - LOG_ERROR("Fail to create container"); + LOG_ERROR("Failed to create container"); LOG_INFO("Importer%2d: Created container [%s]\n", rank, group_name); add(container_names, group_name); } diff --git a/src/tools/pdc_import_eqsim.c b/src/tools/pdc_import_eqsim.c index 2bf7b72a9..ca7e162c8 100644 --- a/src/tools/pdc_import_eqsim.c +++ b/src/tools/pdc_import_eqsim.c @@ -151,7 +151,7 @@ main(int argc, char **argv) obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); /* obj = PDCobj_create(cont, "run1", obj_prop); */ if (obj <= 0) - LOG_ERROR("Fail to create object"); + LOG_ERROR("Failed to create object"); remote_reg = PDCregion_create(3, pdc_offset, pdc_size); @@ -192,19 +192,19 @@ main(int argc, char **argv) PDCregion_close(local_reg); if (PDCobj_close(obj) < 0) - LOG_ERROR("fail to close object\n"); + LOG_ERROR("Failed to close object\n"); if (PDCcont_close(cont) < 0) - LOG_ERROR("fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); if (PDCprop_close(obj_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tools/pdc_query_eqsim.c b/src/tools/pdc_query_eqsim.c index a5e1ac490..4ef8ddfe6 100644 --- a/src/tools/pdc_query_eqsim.c +++ b/src/tools/pdc_query_eqsim.c @@ -142,7 +142,7 @@ main(int argc, char **argv) obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); /* obj = PDCobj_create(cont, "run1", obj_prop); */ if (obj <= 0) - LOG_ERROR("Fail to create object\n"); + LOG_ERROR("Failed to create object\n"); remote_reg = PDCregion_create(3, pdc_offset, pdc_size); @@ -220,19 +220,19 @@ main(int argc, char **argv) PDCregion_close(local_reg); if (PDCobj_close(obj) < 0) - LOG_ERROR("fail to close object\n"); + LOG_ERROR("Failed to close object\n"); if (PDCcont_close(cont) < 0) - LOG_ERROR("fail to close container c1\n"); + LOG_ERROR("Failed to close container c1\n"); if (PDCprop_close(obj_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCprop_close(cont_prop) < 0) - LOG_ERROR("Fail to close property"); + LOG_ERROR("Failed to close property"); if (PDCclose(pdc) < 0) - LOG_ERROR("fail to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); #ifdef ENABLE_MPI MPI_Finalize(); From 714308ef457e03f288923b54111efc49ed9810d6 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 19 Mar 2025 18:04:24 -0700 Subject: [PATCH 4/7] update grammer succesfully close -> successfully closed --- examples/obj_get_data.c | 8 ++++---- examples/region_transfer_2D.c | 10 +++++----- examples/region_transfer_3D.c | 10 +++++----- src/tests/consistency_semantics.c | 10 +++++----- src/tests/cont_del.c | 4 ++-- src/tests/cont_iter.c | 8 ++++---- src/tests/cont_iter_mt.c | 6 +++--- src/tests/cont_life.c | 4 ++-- src/tests/cont_tags.c | 6 +++--- src/tests/create_cont.c | 4 ++-- src/tests/create_cont_coll.c | 4 ++-- src/tests/create_obj.c | 8 ++++---- src/tests/create_obj_coll.c | 16 ++++++++-------- src/tests/create_prop.c | 6 +++--- src/tests/dup_prop.c | 6 +++--- src/tests/idioms_ci_test.c | 6 +++--- src/tests/kvtag_add_get.c | 12 ++++++------ src/tests/kvtag_affix_query_scale.c | 6 +++--- src/tests/kvtag_get.c | 12 ++++++------ src/tests/kvtag_query.c | 6 +++--- src/tests/kvtag_range_query_scale.c | 6 +++--- src/tests/llsm_idioms_bench.c | 6 +++--- src/tests/obj_buf.c | 8 ++++---- src/tests/obj_del.c | 8 ++++---- src/tests/obj_dim.c | 8 ++++---- src/tests/obj_get_data.c | 8 ++++---- src/tests/obj_info.c | 10 +++++----- src/tests/obj_iter.c | 12 ++++++------ src/tests/obj_life.c | 4 ++-- src/tests/obj_put_data.c | 8 ++++---- src/tests/obj_round_robin_io.c | 14 +++++++------- src/tests/obj_round_robin_io_all.c | 14 +++++++------- src/tests/obj_tags.c | 10 +++++----- src/tests/open_existing_obj.c | 6 +++--- src/tests/open_obj.c | 16 ++++++++-------- src/tests/open_obj_round_robin.c | 14 +++++++------- src/tests/region_obj_map.c | 10 +++++----- src/tests/region_obj_map_2D.c | 10 +++++----- src/tests/region_obj_map_2D_partial.c | 10 +++++----- src/tests/region_obj_map_3D.c | 10 +++++----- src/tests/region_obj_map_3D_partial.c | 10 +++++----- src/tests/region_obj_map_merge.c | 10 +++++----- src/tests/region_obj_map_overlap.c | 10 +++++----- src/tests/region_obj_map_overlap_2D.c | 10 +++++----- src/tests/region_obj_map_overlap_3D.c | 10 +++++----- src/tests/region_obj_map_partial.c | 10 +++++----- src/tests/region_transfer.c | 10 +++++----- src/tests/region_transfer_2D.c | 10 +++++----- src/tests/region_transfer_2D_partial.c | 10 +++++----- src/tests/region_transfer_2D_skewed.c | 10 +++++----- src/tests/region_transfer_3D.c | 10 +++++----- src/tests/region_transfer_3D_partial.c | 10 +++++----- src/tests/region_transfer_3D_skewed.c | 10 +++++----- src/tests/region_transfer_all.c | 8 ++++---- src/tests/region_transfer_all_2D.c | 8 ++++---- src/tests/region_transfer_all_3D.c | 8 ++++---- src/tests/region_transfer_all_append_2D.c | 16 ++++++++-------- src/tests/region_transfer_all_append_3D.c | 16 ++++++++-------- src/tests/region_transfer_all_fold.c | 6 +++--- src/tests/region_transfer_all_split_wait.c | 8 ++++---- src/tests/region_transfer_all_test.c | 10 +++++----- src/tests/region_transfer_merge.c | 10 +++++----- src/tests/region_transfer_overlap.c | 10 +++++----- src/tests/region_transfer_overlap_2D.c | 10 +++++----- src/tests/region_transfer_overlap_3D.c | 10 +++++----- src/tests/region_transfer_partial.c | 10 +++++----- src/tests/region_transfer_query.c | 8 ++++---- src/tests/region_transfer_read_only.c | 8 ++++---- src/tests/region_transfer_set_dims.c | 10 +++++----- src/tests/region_transfer_set_dims_2D.c | 10 +++++----- src/tests/region_transfer_set_dims_3D.c | 10 +++++----- src/tests/region_transfer_skewed.c | 10 +++++----- src/tests/region_transfer_status.c | 10 +++++----- src/tests/region_transfer_write_only.c | 12 ++++++------ src/tests/region_transfer_write_read.c | 18 +++++++++--------- src/tests/set_prop.c | 4 ++-- 76 files changed, 352 insertions(+), 352 deletions(-) diff --git a/examples/obj_get_data.c b/examples/obj_get_data.c index bfb1c2f41..c0f23d660 100644 --- a/examples/obj_get_data.c +++ b/examples/obj_get_data.c @@ -125,14 +125,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container @@ -141,7 +141,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -149,7 +149,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/examples/region_transfer_2D.c b/examples/region_transfer_2D.c index 95c6a30f5..6aad007c5 100644 --- a/examples/region_transfer_2D.c +++ b/examples/region_transfer_2D.c @@ -204,14 +204,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -219,7 +219,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -227,7 +227,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -235,7 +235,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/examples/region_transfer_3D.c b/examples/region_transfer_3D.c index ad5f36b49..6aefd40d5 100644 --- a/examples/region_transfer_3D.c +++ b/examples/region_transfer_3D.c @@ -209,14 +209,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -224,7 +224,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -232,7 +232,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -240,7 +240,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/consistency_semantics.c b/src/tests/consistency_semantics.c index 3f64d5c45..9f0583d1c 100644 --- a/src/tests/consistency_semantics.c +++ b/src/tests/consistency_semantics.c @@ -209,14 +209,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -224,7 +224,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -232,7 +232,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -240,7 +240,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/cont_del.c b/src/tests/cont_del.c index 06ac70706..987be51fe 100644 --- a/src/tests/cont_del.c +++ b/src/tests/cont_del.c @@ -76,7 +76,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } LOG_INFO("Trying to open a deleted container, should fail\n"); @@ -90,7 +90,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/cont_iter.c b/src/tests/cont_iter.c index 2bee74b8e..e9d3ba973 100644 --- a/src/tests/cont_iter.c +++ b/src/tests/cont_iter.c @@ -97,7 +97,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close cont2 if (PDCcont_close(cont2) < 0) { @@ -105,7 +105,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c2\n"); + LOG_INFO("Successfully closed container c2\n"); } // close cont3 if (PDCcont_close(cont3) < 0) { @@ -113,7 +113,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c3\n"); + LOG_INFO("Successfully closed container c3\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { @@ -121,7 +121,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/cont_iter_mt.c b/src/tests/cont_iter_mt.c index 4868c0507..8238a27b1 100644 --- a/src/tests/cont_iter_mt.c +++ b/src/tests/cont_iter_mt.c @@ -88,19 +88,19 @@ TestThread(void *ThreadArgs) if (PDCcont_close(cont1) < 0) LOG_ERROR("Failed to close container %lld\n", cont1); else - LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont1); + LOG_INFO("[%d] Successfully closed container # %llx\n", args->ThreadRank, cont1); // close cont2 if (PDCcont_close(cont2) < 0) LOG_ERROR("Failed to close container %lld\n", cont2); else - LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont2); + LOG_INFO("[%d] Successfully closed container # %llx\n", args->ThreadRank, cont2); // close cont3 if (PDCcont_close(cont3) < 0) LOG_ERROR("Failed to close container %lld\n", cont3); else - LOG_INFO("[%d] successfully close container # %llx\n", args->ThreadRank, cont3); + LOG_INFO("[%d] Successfully closed container # %llx\n", args->ThreadRank, cont3); // close a container property if (PDCprop_close(create_prop) < 0) diff --git a/src/tests/cont_life.c b/src/tests/cont_life.c index bfa619d67..7db836807 100644 --- a/src/tests/cont_life.c +++ b/src/tests/cont_life.c @@ -82,7 +82,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { @@ -90,7 +90,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/cont_tags.c b/src/tests/cont_tags.c index 0d25494c5..5afa5dd04 100644 --- a/src/tests/cont_tags.c +++ b/src/tests/cont_tags.c @@ -178,7 +178,7 @@ main(int argc, char **argv) return -1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container if (PDCcont_close(cont2) < 0) { @@ -186,7 +186,7 @@ main(int argc, char **argv) return -1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property @@ -195,7 +195,7 @@ main(int argc, char **argv) return -1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/create_cont.c b/src/tests/create_cont.c index 6cdac0245..03fe603c2 100644 --- a/src/tests/create_cont.c +++ b/src/tests/create_cont.c @@ -69,7 +69,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { @@ -77,7 +77,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/create_cont_coll.c b/src/tests/create_cont_coll.c index 50826929a..a8bb04d8e 100644 --- a/src/tests/create_cont_coll.c +++ b/src/tests/create_cont_coll.c @@ -69,7 +69,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(create_prop) < 0) { @@ -77,7 +77,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/create_obj.c b/src/tests/create_obj.c index 4554387ed..350819200 100644 --- a/src/tests/create_obj.c +++ b/src/tests/create_obj.c @@ -101,7 +101,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } // close second object if (PDCobj_close(obj2) < 0) { @@ -109,7 +109,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -117,7 +117,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -125,7 +125,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/create_obj_coll.c b/src/tests/create_obj_coll.c index 084d6acc8..2e1cb916e 100644 --- a/src/tests/create_obj_coll.c +++ b/src/tests/create_obj_coll.c @@ -135,35 +135,35 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o1\n", rank); + LOG_INFO("Rank %d Successfully closed object o1\n", rank); } if (PDCobj_close(open11) < 0) { LOG_ERROR("Rank %d Fail to close object open11\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open11\n", rank); + LOG_INFO("Rank %d Successfully closed object open11\n", rank); } if (PDCobj_close(open12) < 0) { LOG_ERROR("Rank %d Fail to close object open12\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open12\n", rank); + LOG_INFO("Rank %d Successfully closed object open12\n", rank); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Rank %d Fail to close object o2\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o2\n", rank); + LOG_INFO("Rank %d Successfully closed object o2\n", rank); } if (PDCobj_close(open21) < 0) { LOG_ERROR("Rank %d Fail to close object open21\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open21\n", rank); + LOG_INFO("Rank %d Successfully closed object open21\n", rank); } // close a container if (PDCcont_close(cont) < 0) { @@ -171,7 +171,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container c1\n", rank); + LOG_INFO("Rank %d Successfully closed container c1\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -179,7 +179,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d Successfully closed object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -187,7 +187,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d Successfully closed container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/create_prop.c b/src/tests/create_prop.c index 90b30ae65..2e13d2175 100644 --- a/src/tests/create_prop.c +++ b/src/tests/create_prop.c @@ -62,14 +62,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close first property\n"); + LOG_INFO("Successfully closed first property\n"); } if (PDCprop_close(create_prop2) < 0) { LOG_ERROR("Failed to close property"); ret_value = 1; } else { - LOG_INFO("successfully close second property\n"); + LOG_INFO("Successfully closed second property\n"); } // create a container property create_prop = PDCprop_create(PDC_CONT_CREATE, pdc); @@ -89,7 +89,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close property\n"); + LOG_INFO("Successfully closed property\n"); } // close a pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/dup_prop.c b/src/tests/dup_prop.c index 06fa907db..54dcd0e15 100644 --- a/src/tests/dup_prop.c +++ b/src/tests/dup_prop.c @@ -62,7 +62,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close first property\n"); + LOG_INFO("Successfully closed first property\n"); } if (PDCprop_close(create_prop1) < 0) { @@ -70,7 +70,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close first property\n"); + LOG_INFO("Successfully closed first property\n"); } if (PDCprop_close(create_prop2) < 0) { @@ -78,7 +78,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close second property\n"); + LOG_INFO("Successfully closed second property\n"); } // close a pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/idioms_ci_test.c b/src/tests/idioms_ci_test.c index afb52e3f6..cd8d63ba3 100644 --- a/src/tests/idioms_ci_test.c +++ b/src/tests/idioms_ci_test.c @@ -471,7 +471,7 @@ main(int argc, char *argv[]) } else { if (world_rank == 0) - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close an object property @@ -481,7 +481,7 @@ main(int argc, char *argv[]) } else { if (world_rank == 0) - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property @@ -491,7 +491,7 @@ main(int argc, char *argv[]) } else { if (world_rank == 0) - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc diff --git a/src/tests/kvtag_add_get.c b/src/tests/kvtag_add_get.c index 6b97ae0f8..5915c405e 100644 --- a/src/tests/kvtag_add_get.c +++ b/src/tests/kvtag_add_get.c @@ -161,35 +161,35 @@ main() if (PDCobj_close(obj1) < 0) LOG_ERROR("Failed to close object o1\n"); else - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); // close second object if (PDCobj_close(obj2) < 0) LOG_ERROR("Failed to close object o2\n"); else - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); // close a container if (PDCcont_close(cont) < 0) LOG_ERROR("Failed to close container c1\n"); else - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); // close a container property if (PDCprop_close(obj_prop1) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); if (PDCprop_close(obj_prop2) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); if (PDCprop_close(cont_prop) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); // close pdc if (PDCclose(pdc) < 0) diff --git a/src/tests/kvtag_affix_query_scale.c b/src/tests/kvtag_affix_query_scale.c index 61e2745ae..7470fc742 100644 --- a/src/tests/kvtag_affix_query_scale.c +++ b/src/tests/kvtag_affix_query_scale.c @@ -416,7 +416,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close an object property @@ -426,7 +426,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property @@ -436,7 +436,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc diff --git a/src/tests/kvtag_get.c b/src/tests/kvtag_get.c index 613d1834c..e66d98c23 100644 --- a/src/tests/kvtag_get.c +++ b/src/tests/kvtag_get.c @@ -114,35 +114,35 @@ main() if (PDCobj_close(obj1) < 0) LOG_ERROR("Failed to close object o1\n"); else - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); // close second object if (PDCobj_close(obj2) < 0) LOG_ERROR("Failed to close object o2\n"); else - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); // close a container if (PDCcont_close(cont) < 0) LOG_ERROR("Failed to close container c1\n"); else - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); // close a container property if (PDCprop_close(obj_prop1) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); if (PDCprop_close(obj_prop2) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); if (PDCprop_close(cont_prop) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); // close pdc if (PDCclose(pdc) < 0) diff --git a/src/tests/kvtag_query.c b/src/tests/kvtag_query.c index cd028896d..3f11bae79 100644 --- a/src/tests/kvtag_query.c +++ b/src/tests/kvtag_query.c @@ -233,19 +233,19 @@ main(int argc, char *argv[]) if (PDCcont_close(cont) < 0) LOG_ERROR("Failed to close container c1\n"); else - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); // close an object property if (PDCprop_close(obj_prop) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); // close a container property if (PDCprop_close(cont_prop) < 0) LOG_ERROR("Failed to close property"); else - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); // close pdc if (PDCclose(pdc) < 0) diff --git a/src/tests/kvtag_range_query_scale.c b/src/tests/kvtag_range_query_scale.c index 3659b6d8d..61bec3292 100644 --- a/src/tests/kvtag_range_query_scale.c +++ b/src/tests/kvtag_range_query_scale.c @@ -436,7 +436,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close an object property @@ -446,7 +446,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property @@ -456,7 +456,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index a08c5d781..8f447f5d5 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -592,7 +592,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close an object property @@ -602,7 +602,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property @@ -612,7 +612,7 @@ main(int argc, char *argv[]) } else { if (my_rank == 0) - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc diff --git a/src/tests/obj_buf.c b/src/tests/obj_buf.c index 3e944bc4b..f342f70e1 100644 --- a/src/tests/obj_buf.c +++ b/src/tests/obj_buf.c @@ -98,7 +98,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } // close object property if (PDCprop_close(obj_prop) < 0) { @@ -106,7 +106,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -114,7 +114,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -122,7 +122,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_del.c b/src/tests/obj_del.c index 0e3c218ec..7b544847d 100644 --- a/src/tests/obj_del.c +++ b/src/tests/obj_del.c @@ -110,7 +110,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } // close second object if (PDCobj_close(obj2) < 0) { @@ -118,7 +118,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -126,7 +126,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -134,7 +134,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_dim.c b/src/tests/obj_dim.c index 4238b7796..2a0fedcb4 100644 --- a/src/tests/obj_dim.c +++ b/src/tests/obj_dim.c @@ -95,7 +95,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } // close object property if (PDCprop_close(obj_prop) < 0) { @@ -103,7 +103,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -111,7 +111,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -119,7 +119,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_get_data.c b/src/tests/obj_get_data.c index b60da9be1..92195194e 100644 --- a/src/tests/obj_get_data.c +++ b/src/tests/obj_get_data.c @@ -127,14 +127,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container @@ -143,7 +143,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -151,7 +151,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_info.c b/src/tests/obj_info.c index 6fefd9f4f..e2a6e8bfa 100644 --- a/src/tests/obj_info.c +++ b/src/tests/obj_info.c @@ -175,14 +175,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -190,7 +190,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -198,7 +198,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -206,7 +206,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_iter.c b/src/tests/obj_iter.c index 31ebcc4ac..8a14dbf39 100644 --- a/src/tests/obj_iter.c +++ b/src/tests/obj_iter.c @@ -157,7 +157,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } // close second object if (PDCobj_close(obj2) < 0) { @@ -165,7 +165,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close third object if (PDCobj_close(obj3) < 0) { @@ -173,7 +173,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o3\n"); + LOG_INFO("Successfully closed object o3\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -181,7 +181,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -189,7 +189,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -197,7 +197,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_life.c b/src/tests/obj_life.c index 45209e3e8..0c2cf23ed 100644 --- a/src/tests/obj_life.c +++ b/src/tests/obj_life.c @@ -66,7 +66,7 @@ main(int argc, char **argv) return 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -74,7 +74,7 @@ main(int argc, char **argv) return 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_put_data.c b/src/tests/obj_put_data.c index ef0b31cb7..2893a3da7 100644 --- a/src/tests/obj_put_data.c +++ b/src/tests/obj_put_data.c @@ -97,14 +97,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container @@ -113,7 +113,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -121,7 +121,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_round_robin_io.c b/src/tests/obj_round_robin_io.c index 0461a8ce8..e539d9b75 100644 --- a/src/tests/obj_round_robin_io.c +++ b/src/tests/obj_round_robin_io.c @@ -268,14 +268,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o1_%d\n", rank, rank); + LOG_INFO("Rank %d Successfully closed object o1_%d\n", rank, rank); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Rank %d fail to close object o2_%d\n", rank, rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o2_%d\n", rank, rank); + LOG_INFO("Rank %d Successfully closed object o2_%d\n", rank, rank); } // Wait for all processes to finish their object creation #ifdef ENABLE_MPI @@ -365,14 +365,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Successfully closed object %s\n", rank, obj_name1); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Rank %d fail to close object %s\n", rank, obj_name2); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Successfully closed object %s\n", rank, obj_name2); } } @@ -382,7 +382,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container c\n", rank); + LOG_INFO("Rank %d Successfully closed container c\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -390,7 +390,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d Successfully closed object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -398,7 +398,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d Successfully closed container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/obj_round_robin_io_all.c b/src/tests/obj_round_robin_io_all.c index 255b3d667..4e18a18d1 100644 --- a/src/tests/obj_round_robin_io_all.c +++ b/src/tests/obj_round_robin_io_all.c @@ -263,14 +263,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o1_%d\n", rank, rank); + LOG_INFO("Rank %d Successfully closed object o1_%d\n", rank, rank); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Rank %d fail to close object o2_%d\n", rank, rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o2_%d\n", rank, rank); + LOG_INFO("Rank %d Successfully closed object o2_%d\n", rank, rank); } // Wait for all processes to finish their object creation #ifdef ENABLE_MPI @@ -406,14 +406,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object\n", rank); + LOG_INFO("Rank %d Successfully closed object\n", rank); } if (PDCobj_close(obj2_list[i - 1]) < 0) { LOG_ERROR("Rank %d fail to close object\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object\n", rank); + LOG_INFO("Rank %d Successfully closed object\n", rank); } } @@ -423,7 +423,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container c\n", rank); + LOG_INFO("Rank %d Successfully closed container c\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -431,7 +431,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d Successfully closed object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -439,7 +439,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d Successfully closed container property\n", rank); } LOG_INFO("total number of read request = %d\n", (size - 1) * 2); diff --git a/src/tests/obj_tags.c b/src/tests/obj_tags.c index 79b8668e3..97161b84a 100644 --- a/src/tests/obj_tags.c +++ b/src/tests/obj_tags.c @@ -193,14 +193,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -208,7 +208,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -216,7 +216,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -224,7 +224,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/open_existing_obj.c b/src/tests/open_existing_obj.c index 94a29ddce..3fa5fe555 100644 --- a/src/tests/open_existing_obj.c +++ b/src/tests/open_existing_obj.c @@ -79,21 +79,21 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open11\n", rank); + LOG_INFO("Rank %d Successfully closed object open11\n", rank); } if (PDCobj_close(open12) < 0) { LOG_ERROR("Rank %d fail to close object open12\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open12\n", rank); + LOG_INFO("Rank %d Successfully closed object open12\n", rank); } if (PDCobj_close(open21) < 0) { LOG_ERROR("Rank %d fail to close object open21\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open21\n", rank); + LOG_INFO("Rank %d Successfully closed object open21\n", rank); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/open_obj.c b/src/tests/open_obj.c index e8d527a7d..3558c0ebb 100644 --- a/src/tests/open_obj.c +++ b/src/tests/open_obj.c @@ -126,35 +126,35 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o1\n", rank); + LOG_INFO("Rank %d Successfully closed object o1\n", rank); } if (PDCobj_close(open11) < 0) { LOG_ERROR("Rank %d Fail to close object open11\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open11\n", rank); + LOG_INFO("Rank %d Successfully closed object open11\n", rank); } if (PDCobj_close(open12) < 0) { LOG_ERROR("Rank %d Fail to close object open12\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open12\n", rank); + LOG_INFO("Rank %d Successfully closed object open12\n", rank); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Rank %d Fail to close object o2\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o2\n", rank); + LOG_INFO("Rank %d Successfully closed object o2\n", rank); } if (PDCobj_close(open21) < 0) { LOG_ERROR("Rank %d Fail to close object open21\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object open21\n", rank); + LOG_INFO("Rank %d Successfully closed object open21\n", rank); } // close a container if (PDCcont_close(cont) < 0) { @@ -162,7 +162,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container c1\n", rank); + LOG_INFO("Rank %d Successfully closed container c1\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -170,7 +170,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d Successfully closed object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -178,7 +178,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d Successfully closed container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/open_obj_round_robin.c b/src/tests/open_obj_round_robin.c index 054bd544a..bee7592a9 100644 --- a/src/tests/open_obj_round_robin.c +++ b/src/tests/open_obj_round_robin.c @@ -121,14 +121,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o1\n", rank); + LOG_INFO("Rank %d Successfully closed object o1\n", rank); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Rank %d Fail to close object o2\n", rank); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object o2\n", rank); + LOG_INFO("Rank %d Successfully closed object o2\n", rank); } // Wait for all processes to finish their object creation #ifdef ENABLE_MPI @@ -215,14 +215,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name1); + LOG_INFO("Rank %d Successfully closed object %s\n", rank, obj_name1); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Rank %d Fail to close object %s\n", rank, obj_name2); ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object %s\n", rank, obj_name2); + LOG_INFO("Rank %d Successfully closed object %s\n", rank, obj_name2); } } @@ -232,7 +232,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container c1\n", rank); + LOG_INFO("Rank %d Successfully closed container c1\n", rank); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -240,7 +240,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close object property\n", rank); + LOG_INFO("Rank %d Successfully closed object property\n", rank); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -248,7 +248,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("Rank %d successfully close container property\n", rank); + LOG_INFO("Rank %d Successfully closed container property\n", rank); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/region_obj_map.c b/src/tests/region_obj_map.c index a44f04f6a..1f0ab783c 100644 --- a/src/tests/region_obj_map.c +++ b/src/tests/region_obj_map.c @@ -238,14 +238,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -253,7 +253,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -261,7 +261,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -269,7 +269,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_2D.c b/src/tests/region_obj_map_2D.c index 21623ca62..7372f5f34 100644 --- a/src/tests/region_obj_map_2D.c +++ b/src/tests/region_obj_map_2D.c @@ -242,14 +242,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -257,7 +257,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -265,7 +265,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -273,7 +273,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_2D_partial.c b/src/tests/region_obj_map_2D_partial.c index 096718ea8..18838afe1 100644 --- a/src/tests/region_obj_map_2D_partial.c +++ b/src/tests/region_obj_map_2D_partial.c @@ -258,14 +258,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -273,7 +273,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -281,7 +281,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -289,7 +289,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_3D.c b/src/tests/region_obj_map_3D.c index cf88d24cd..24d0a2fa4 100644 --- a/src/tests/region_obj_map_3D.c +++ b/src/tests/region_obj_map_3D.c @@ -244,14 +244,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -259,7 +259,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -267,7 +267,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -275,7 +275,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_3D_partial.c b/src/tests/region_obj_map_3D_partial.c index fe9760621..66d878de4 100644 --- a/src/tests/region_obj_map_3D_partial.c +++ b/src/tests/region_obj_map_3D_partial.c @@ -256,14 +256,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -271,7 +271,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -279,7 +279,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -287,7 +287,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_merge.c b/src/tests/region_obj_map_merge.c index be95f4929..308c26fb9 100644 --- a/src/tests/region_obj_map_merge.c +++ b/src/tests/region_obj_map_merge.c @@ -277,14 +277,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -292,7 +292,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -300,7 +300,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -308,7 +308,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_overlap.c b/src/tests/region_obj_map_overlap.c index 50d754c15..98391ef11 100644 --- a/src/tests/region_obj_map_overlap.c +++ b/src/tests/region_obj_map_overlap.c @@ -385,14 +385,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -400,7 +400,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -408,7 +408,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -416,7 +416,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_overlap_2D.c b/src/tests/region_obj_map_overlap_2D.c index 7d1049818..cef21ed67 100644 --- a/src/tests/region_obj_map_overlap_2D.c +++ b/src/tests/region_obj_map_overlap_2D.c @@ -405,14 +405,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -420,7 +420,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -428,7 +428,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -436,7 +436,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_overlap_3D.c b/src/tests/region_obj_map_overlap_3D.c index afde86875..fbc96c9ac 100644 --- a/src/tests/region_obj_map_overlap_3D.c +++ b/src/tests/region_obj_map_overlap_3D.c @@ -336,14 +336,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -351,7 +351,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -359,7 +359,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -367,7 +367,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_obj_map_partial.c b/src/tests/region_obj_map_partial.c index e70ee95af..401322fcb 100644 --- a/src/tests/region_obj_map_partial.c +++ b/src/tests/region_obj_map_partial.c @@ -242,14 +242,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -257,7 +257,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -265,7 +265,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -273,7 +273,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_transfer.c b/src/tests/region_transfer.c index 83e683082..76642a58b 100644 --- a/src/tests/region_transfer.c +++ b/src/tests/region_transfer.c @@ -236,14 +236,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -251,7 +251,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -259,7 +259,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -267,7 +267,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_2D.c b/src/tests/region_transfer_2D.c index 84297b44a..4cf3b23dc 100644 --- a/src/tests/region_transfer_2D.c +++ b/src/tests/region_transfer_2D.c @@ -204,14 +204,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -219,7 +219,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -227,7 +227,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -235,7 +235,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_2D_partial.c b/src/tests/region_transfer_2D_partial.c index b64ea43d0..d10c3ee27 100644 --- a/src/tests/region_transfer_2D_partial.c +++ b/src/tests/region_transfer_2D_partial.c @@ -218,14 +218,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -233,7 +233,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -241,7 +241,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -249,7 +249,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_2D_skewed.c b/src/tests/region_transfer_2D_skewed.c index 91134faa3..e952ba210 100644 --- a/src/tests/region_transfer_2D_skewed.c +++ b/src/tests/region_transfer_2D_skewed.c @@ -288,14 +288,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -303,7 +303,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -311,7 +311,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -319,7 +319,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_3D.c b/src/tests/region_transfer_3D.c index 30a1099e1..56c836f2d 100644 --- a/src/tests/region_transfer_3D.c +++ b/src/tests/region_transfer_3D.c @@ -209,14 +209,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -224,7 +224,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -232,7 +232,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -240,7 +240,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_3D_partial.c b/src/tests/region_transfer_3D_partial.c index e59910d30..007e48027 100644 --- a/src/tests/region_transfer_3D_partial.c +++ b/src/tests/region_transfer_3D_partial.c @@ -216,14 +216,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -231,7 +231,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -239,7 +239,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -247,7 +247,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_3D_skewed.c b/src/tests/region_transfer_3D_skewed.c index 4ffe99350..4c0a56b89 100644 --- a/src/tests/region_transfer_3D_skewed.c +++ b/src/tests/region_transfer_3D_skewed.c @@ -309,14 +309,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -324,7 +324,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -332,7 +332,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -340,7 +340,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_all.c b/src/tests/region_transfer_all.c index 4a5f765be..7a384dc9e 100644 --- a/src/tests/region_transfer_all.c +++ b/src/tests/region_transfer_all.c @@ -336,7 +336,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -372,7 +372,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -380,7 +380,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -388,7 +388,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); diff --git a/src/tests/region_transfer_all_2D.c b/src/tests/region_transfer_all_2D.c index 9181b48a6..d27f6ec95 100644 --- a/src/tests/region_transfer_all_2D.c +++ b/src/tests/region_transfer_all_2D.c @@ -335,7 +335,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -371,7 +371,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -379,7 +379,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -387,7 +387,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); diff --git a/src/tests/region_transfer_all_3D.c b/src/tests/region_transfer_all_3D.c index bfd430dd6..358c7c30e 100644 --- a/src/tests/region_transfer_all_3D.c +++ b/src/tests/region_transfer_all_3D.c @@ -326,7 +326,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -362,7 +362,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -370,7 +370,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -378,7 +378,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); diff --git a/src/tests/region_transfer_all_append_2D.c b/src/tests/region_transfer_all_append_2D.c index a28269320..17dd253af 100644 --- a/src/tests/region_transfer_all_append_2D.c +++ b/src/tests/region_transfer_all_append_2D.c @@ -267,7 +267,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -392,7 +392,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -526,7 +526,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -670,7 +670,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -793,7 +793,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -813,7 +813,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -821,7 +821,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -829,7 +829,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_all_append_3D.c b/src/tests/region_transfer_all_append_3D.c index 92fddf77a..bbdfb62a0 100644 --- a/src/tests/region_transfer_all_append_3D.c +++ b/src/tests/region_transfer_all_append_3D.c @@ -273,7 +273,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -400,7 +400,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -543,7 +543,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -692,7 +692,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -817,7 +817,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -837,7 +837,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -845,7 +845,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -853,7 +853,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_all_fold.c b/src/tests/region_transfer_all_fold.c index bb5f696ef..1242612ce 100644 --- a/src/tests/region_transfer_all_fold.c +++ b/src/tests/region_transfer_all_fold.c @@ -204,7 +204,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -212,7 +212,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -220,7 +220,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_all_split_wait.c b/src/tests/region_transfer_all_split_wait.c index e1d793ba8..15732a9fb 100644 --- a/src/tests/region_transfer_all_split_wait.c +++ b/src/tests/region_transfer_all_split_wait.c @@ -277,7 +277,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -313,7 +313,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -321,7 +321,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -329,7 +329,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); diff --git a/src/tests/region_transfer_all_test.c b/src/tests/region_transfer_all_test.c index a93c024d6..c40447b71 100644 --- a/src/tests/region_transfer_all_test.c +++ b/src/tests/region_transfer_all_test.c @@ -224,7 +224,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } // close a container @@ -233,7 +233,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -241,7 +241,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -249,7 +249,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); @@ -263,7 +263,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close PDC"); + LOG_INFO("Successfully closed PDC"); } #ifdef ENABLE_MPI MPI_Finalize(); diff --git a/src/tests/region_transfer_merge.c b/src/tests/region_transfer_merge.c index 6f7fee26a..323899e68 100644 --- a/src/tests/region_transfer_merge.c +++ b/src/tests/region_transfer_merge.c @@ -225,14 +225,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -240,7 +240,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -248,7 +248,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -256,7 +256,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_overlap.c b/src/tests/region_transfer_overlap.c index 5728c0a4e..3facad7cf 100644 --- a/src/tests/region_transfer_overlap.c +++ b/src/tests/region_transfer_overlap.c @@ -300,14 +300,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -315,7 +315,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -323,7 +323,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -331,7 +331,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_overlap_2D.c b/src/tests/region_transfer_overlap_2D.c index b2ab23abd..ef5437b6c 100644 --- a/src/tests/region_transfer_overlap_2D.c +++ b/src/tests/region_transfer_overlap_2D.c @@ -320,14 +320,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -335,7 +335,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -343,7 +343,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -351,7 +351,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_overlap_3D.c b/src/tests/region_transfer_overlap_3D.c index 6a68b0b3e..6e58dc053 100644 --- a/src/tests/region_transfer_overlap_3D.c +++ b/src/tests/region_transfer_overlap_3D.c @@ -332,14 +332,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -347,7 +347,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -355,7 +355,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -363,7 +363,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_partial.c b/src/tests/region_transfer_partial.c index 4308fc940..9519135b1 100644 --- a/src/tests/region_transfer_partial.c +++ b/src/tests/region_transfer_partial.c @@ -206,14 +206,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1\n"); + LOG_INFO("Successfully closed object o1\n"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2\n"); ret_value = 1; } else { - LOG_INFO("successfully close object o2\n"); + LOG_INFO("Successfully closed object o2\n"); } // close a container if (PDCcont_close(cont) < 0) { @@ -221,7 +221,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1\n"); + LOG_INFO("Successfully closed container c1\n"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -229,7 +229,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property\n"); + LOG_INFO("Successfully closed object property\n"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -237,7 +237,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property\n"); + LOG_INFO("Successfully closed container property\n"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_query.c b/src/tests/region_transfer_query.c index 497a95a80..017f8c0cc 100644 --- a/src/tests/region_transfer_query.c +++ b/src/tests/region_transfer_query.c @@ -202,7 +202,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } // close a container @@ -211,7 +211,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -219,7 +219,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -227,7 +227,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); // close pdc diff --git a/src/tests/region_transfer_read_only.c b/src/tests/region_transfer_read_only.c index 21e172403..feef7707a 100644 --- a/src/tests/region_transfer_read_only.c +++ b/src/tests/region_transfer_read_only.c @@ -279,21 +279,21 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } if (PDCobj_close(obj3) < 0) { LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { - LOG_INFO("successfully close object o3"); + LOG_INFO("Successfully closed object o3"); } // close a container if (PDCcont_close(cont) < 0) { @@ -301,7 +301,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } free(data_read); // close pdc diff --git a/src/tests/region_transfer_set_dims.c b/src/tests/region_transfer_set_dims.c index d3a20c74a..d397006c8 100644 --- a/src/tests/region_transfer_set_dims.c +++ b/src/tests/region_transfer_set_dims.c @@ -546,7 +546,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -687,7 +687,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -709,7 +709,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -717,7 +717,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -725,7 +725,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); diff --git a/src/tests/region_transfer_set_dims_2D.c b/src/tests/region_transfer_set_dims_2D.c index 599acb6b1..350f40852 100644 --- a/src/tests/region_transfer_set_dims_2D.c +++ b/src/tests/region_transfer_set_dims_2D.c @@ -554,7 +554,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -696,7 +696,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -719,7 +719,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -727,7 +727,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -735,7 +735,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); diff --git a/src/tests/region_transfer_set_dims_3D.c b/src/tests/region_transfer_set_dims_3D.c index 94280037c..dff1e7bb9 100644 --- a/src/tests/region_transfer_set_dims_3D.c +++ b/src/tests/region_transfer_set_dims_3D.c @@ -567,7 +567,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -712,7 +712,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } } @@ -735,7 +735,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -743,7 +743,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -751,7 +751,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data[0]); free(data_read[0]); diff --git a/src/tests/region_transfer_skewed.c b/src/tests/region_transfer_skewed.c index c8f1075e7..c045d715d 100644 --- a/src/tests/region_transfer_skewed.c +++ b/src/tests/region_transfer_skewed.c @@ -199,14 +199,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -214,7 +214,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -222,7 +222,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -230,7 +230,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_status.c b/src/tests/region_transfer_status.c index 9642df728..6544ee322 100644 --- a/src/tests/region_transfer_status.c +++ b/src/tests/region_transfer_status.c @@ -253,14 +253,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -268,7 +268,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -276,7 +276,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -284,7 +284,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); free(data_read); diff --git a/src/tests/region_transfer_write_only.c b/src/tests/region_transfer_write_only.c index e5e2ca980..759e063cc 100644 --- a/src/tests/region_transfer_write_only.c +++ b/src/tests/region_transfer_write_only.c @@ -373,21 +373,21 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } if (PDCobj_close(obj3) < 0) { LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -395,7 +395,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -403,7 +403,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -411,7 +411,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); // close pdc diff --git a/src/tests/region_transfer_write_read.c b/src/tests/region_transfer_write_read.c index a51926f86..dcf5a3507 100644 --- a/src/tests/region_transfer_write_read.c +++ b/src/tests/region_transfer_write_read.c @@ -380,21 +380,21 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } if (PDCobj_close(obj3) < 0) { LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close a container if (PDCcont_close(cont) < 0) { @@ -402,7 +402,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container c1"); + LOG_INFO("Successfully closed container c1"); } // close a object property if (PDCprop_close(obj_prop) < 0) { @@ -410,7 +410,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object property"); + LOG_INFO("Successfully closed object property"); } // close a container property if (PDCprop_close(cont_prop) < 0) { @@ -418,7 +418,7 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close container property"); + LOG_INFO("Successfully closed container property"); } free(data); @@ -618,21 +618,21 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close object o1"); + LOG_INFO("Successfully closed object o1"); } if (PDCobj_close(obj2) < 0) { LOG_ERROR("Failed to close object o2"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } if (PDCobj_close(obj3) < 0) { LOG_ERROR("Failed to close object o3"); ret_value = 1; } else { - LOG_INFO("successfully close object o2"); + LOG_INFO("Successfully closed object o2"); } // close pdc if (PDCclose(pdc) < 0) { diff --git a/src/tests/set_prop.c b/src/tests/set_prop.c index c68921018..495f7602a 100644 --- a/src/tests/set_prop.c +++ b/src/tests/set_prop.c @@ -109,14 +109,14 @@ main(int argc, char **argv) ret_value = 1; } else { - LOG_INFO("successfully close first property\n"); + LOG_INFO("Successfully closed first property\n"); } if (PDCprop_close(create_prop2) < 0) { LOG_ERROR("Failed to close property"); ret_value = 1; } else { - LOG_INFO("successfully close second property\n"); + LOG_INFO("Successfully closed second property\n"); } // close a pdc if (PDCclose(pdc) < 0) { From 923c0eca14f72a6a66e97b893311429e3913e14e Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 19 Mar 2025 18:15:10 -0700 Subject: [PATCH 5/7] switch type of LOG_INFO to LOG_ERROR --- examples/bdcats.c | 16 ++++++++-------- examples/bdcats_old.c | 16 ++++++++-------- examples/haccio.c | 2 +- examples/haccio_v2.c | 2 +- examples/tileio.c | 2 +- examples/tileio_v2.c | 2 +- examples/vpicio.c | 16 ++++++++-------- examples/vpicio_batch.c | 16 ++++++++-------- examples/vpicio_old.c | 16 ++++++++-------- src/api/pdc_meta/pdc_metadata_client.c | 2 +- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/examples/bdcats.c b/examples/bdcats.c index 456c5226c..b2f585658 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -108,7 +108,7 @@ main(int argc, char **argv) obj_xx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_xx == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-xx"); + LOG_ERROR("Error when open object %s\n", "obj-var-xx"); exit(-1); } #ifdef ENABLE_MPI @@ -117,7 +117,7 @@ main(int argc, char **argv) obj_yy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_yy == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-yy"); + LOG_ERROR("Error when open object %s\n", "obj-var-yy"); exit(-1); } #ifdef ENABLE_MPI @@ -126,7 +126,7 @@ main(int argc, char **argv) obj_zz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_zz == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-zz"); + LOG_ERROR("Error when open object %s\n", "obj-var-zz"); exit(-1); } #ifdef ENABLE_MPI @@ -135,7 +135,7 @@ main(int argc, char **argv) obj_pxx = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pxx == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-pxx"); + LOG_ERROR("Error when open object %s\n", "obj-var-pxx"); exit(-1); } #ifdef ENABLE_MPI @@ -144,7 +144,7 @@ main(int argc, char **argv) obj_pyy = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pyy == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-pyy"); + LOG_ERROR("Error when open object %s\n", "obj-var-pyy"); exit(-1); } #ifdef ENABLE_MPI @@ -153,7 +153,7 @@ main(int argc, char **argv) obj_pzz = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_pzz == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-pzz"); + LOG_ERROR("Error when open object %s\n", "obj-var-pzz"); exit(-1); } #ifdef ENABLE_MPI @@ -162,7 +162,7 @@ main(int argc, char **argv) obj_id11 = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_id11 == 0) { - LOG_INFO("Error when open object %s\n", "id11"); + LOG_ERROR("Error when open object %s\n", "id11"); exit(-1); } #ifdef ENABLE_MPI @@ -171,7 +171,7 @@ main(int argc, char **argv) obj_id22 = PDCobj_open("obj-var-xx", pdc_id); #endif if (obj_id22 == 0) { - LOG_INFO("Error when open object %s\n", "id22"); + LOG_ERROR("Error when open object %s\n", "id22"); exit(-1); } diff --git a/examples/bdcats_old.c b/examples/bdcats_old.c index 07728a54f..34e125a0b 100644 --- a/examples/bdcats_old.c +++ b/examples/bdcats_old.c @@ -100,42 +100,42 @@ main(int argc, char **argv) // open objects obj_xx = PDCobj_open("obj-var-xx", pdc_id); if (obj_xx == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-xx"); + LOG_ERROR("Error when open object %s\n", "obj-var-xx"); exit(-1); } obj_yy = PDCobj_open("obj-var-yy", pdc_id); if (obj_yy == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-yy"); + LOG_ERROR("Error when open object %s\n", "obj-var-yy"); exit(-1); } obj_zz = PDCobj_open("obj-var-zz", pdc_id); if (obj_zz == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-zz"); + LOG_ERROR("Error when open object %s\n", "obj-var-zz"); exit(-1); } obj_pxx = PDCobj_open("obj-var-pxx", pdc_id); if (obj_pxx == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-pxx"); + LOG_ERROR("Error when open object %s\n", "obj-var-pxx"); exit(-1); } obj_pyy = PDCobj_open("obj-var-pyy", pdc_id); if (obj_pyy == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-pyy"); + LOG_ERROR("Error when open object %s\n", "obj-var-pyy"); exit(-1); } obj_pzz = PDCobj_open("obj-var-pzz", pdc_id); if (obj_pzz == 0) { - LOG_INFO("Error when open object %s\n", "obj-var-pzz"); + LOG_ERROR("Error when open object %s\n", "obj-var-pzz"); exit(-1); } obj_id11 = PDCobj_open("id11", pdc_id); if (obj_id11 == 0) { - LOG_INFO("Error when open object %s\n", "id11"); + LOG_ERROR("Error when open object %s\n", "id11"); exit(-1); } obj_id22 = PDCobj_open("id22", pdc_id); if (obj_id22 == 0) { - LOG_INFO("Error when open object %s\n", "id22"); + LOG_ERROR("Error when open object %s\n", "id22"); exit(-1); } diff --git a/examples/haccio.c b/examples/haccio.c index 2710fcb0c..4c78d4da9 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -77,7 +77,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm); if (obj_id == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } diff --git a/examples/haccio_v2.c b/examples/haccio_v2.c index 07d2a5c94..4ad503d74 100644 --- a/examples/haccio_v2.c +++ b/examples/haccio_v2.c @@ -78,7 +78,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm); if (obj_id == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } diff --git a/examples/tileio.c b/examples/tileio.c index c1060669e..7cb691ddf 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -45,7 +45,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); if (obj_id == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } diff --git a/examples/tileio_v2.c b/examples/tileio_v2.c index 194c9660e..0bcb3f1dd 100644 --- a/examples/tileio_v2.c +++ b/examples/tileio_v2.c @@ -45,7 +45,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm); if (obj_id == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); } diff --git a/examples/vpicio.c b/examples/vpicio.c index 566b9443c..d8a4f2428 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -154,44 +154,44 @@ main(int argc, char **argv) obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); if (obj_yy == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); if (obj_zz == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); if (obj_pxx == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); if (obj_pyy == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); if (obj_pzz == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + 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); if (obj_id11 == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id11"); + 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); if (obj_id22 == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id22"); + 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 7d71d3cdf..fc358e8d6 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -252,49 +252,49 @@ main(int argc, char **argv) sprintf(obj_name, "obj-var-xx %" PRIu64 "", i); obj_xx[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_xx, 0, comm); if (obj_xx[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); if (obj_yy[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); if (obj_zz[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); if (obj_pxx[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); if (obj_pyy[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); if (obj_pzz[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + 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); if (obj_id11[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id11"); + 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); if (obj_id22[i] == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id22"); + 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 624f151c8..b514c33c5 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -151,44 +151,44 @@ main(int argc, char **argv) obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); if (obj_xx == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); + 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); if (obj_yy == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-yy"); + 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); if (obj_zz == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-zz"); + 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); if (obj_pxx == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pxx"); + 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); if (obj_pyy == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pyy"); + 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); if (obj_pzz == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); + 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); if (obj_id11 == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id11"); + 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); if (obj_id22 == 0) { - LOG_INFO("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } diff --git a/src/api/pdc_meta/pdc_metadata_client.c b/src/api/pdc_meta/pdc_metadata_client.c index 7c276adfc..97b5c53c7 100644 --- a/src/api/pdc_meta/pdc_metadata_client.c +++ b/src/api/pdc_meta/pdc_metadata_client.c @@ -93,7 +93,7 @@ send_query_condition_get_separate_result(char conditions[][CONDITION_LENGTH], in perr_t rst = PDC_Client_search_obj_ref_through_dart(DART_HASH, condition, REF_PRIMARY_ID, &n_res, &out); if (rst != SUCCEED) { - LOG_INFO("Error with PDC_Client_search_obj_ref_through_dart\n"); + LOG_ERROR("Error with PDC_Client_search_obj_ref_through_dart\n"); return; } (*result)[i] = (separate_query_result_t){n_res, out, condition}; From 4b661e96b5e0147f3eb38e823ccb3aedaf815cef Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 22 Mar 2025 06:21:17 -0700 Subject: [PATCH 6/7] Add logging docs and fix some LOG_INFO->LOG_JUST_PRINT --- docs/source/developer-notes.rst | 24 +++++ examples/bdcats.c | 2 +- examples/bdcats_old.c | 2 +- examples/haccio.c | 2 +- examples/haccio_v2.c | 2 +- examples/tileio.c | 4 +- examples/tileio_v2.c | 4 +- examples/vpicio.c | 2 +- examples/vpicio_batch.c | 2 +- examples/vpicio_old.c | 2 +- src/commons/logging/include/pdc_logger.h | 12 --- src/commons/logging/pdc_logger.c | 101 +++++++++----------- src/server/pdc_server_metadata_index_test.c | 2 +- src/tests/delete_obj.c | 2 +- src/tests/read_obj.c | 2 +- src/tests/read_obj_shared.c | 2 +- src/tests/stat_obj.c | 2 +- src/tests/update_obj.c | 2 +- src/tests/vpicio_mts.c | 2 +- src/tools/pdc_import.c | 2 +- 20 files changed, 90 insertions(+), 85 deletions(-) diff --git a/docs/source/developer-notes.rst b/docs/source/developer-notes.rst index ef975cb0a..de37e53f3 100644 --- a/docs/source/developer-notes.rst +++ b/docs/source/developer-notes.rst @@ -2,6 +2,30 @@ Developer Notes ================================ ++++++++++++++++++++++++++++++++++++++++++++++ +PDC Logging ++++++++++++++++++++++++++++++++++++++++++++++ + +The following macros are defined in the header file `src/commons/logging/include/pdc_logger.h` and should be used instead of `printf` for logging. + +The available macros, which follow a similar usage to `printf`, are: + +.. code-block:: C + LOG_ERROR + LOG_WARNING + LOG_INFO + LOG_DEBUG + LOG_JUST_PRINT + +Each of these macros automatically prepends a timestamp and log level prefix to the output: + +.. code-block:: C + [year-month-day hour:minute:second] [ERROR] + [year-month-day hour:minute:second] [WARNING] + [year-month-day hour:minute:second] [INFO] + [year-month-day hour:minute:second] [DEBUG] + +`LOG_JUST_PRINT` does not print a prefix and outputs the message as-is. This macro is useful when you need to print raw messages without log metadata. +++++++++++++++++++++++++++++++++++++++++++++ PDC Server Metadata Management diff --git a/examples/bdcats.c b/examples/bdcats.c index b2f585658..cd1f1e95f 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n ./bdcats #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./bdcats #particles\n"); } int diff --git a/examples/bdcats_old.c b/examples/bdcats_old.c index 34e125a0b..77c45a8f1 100644 --- a/examples/bdcats_old.c +++ b/examples/bdcats_old.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int diff --git a/examples/haccio.c b/examples/haccio.c index 4c78d4da9..c1db05b6b 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -43,7 +43,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n #procs ./haccio #particles (in 10e6)\n"); + LOG_JUST_PRINT("Usage: srun -n #procs ./haccio #particles (in 10e6)\n"); } void diff --git a/examples/haccio_v2.c b/examples/haccio_v2.c index 4ad503d74..43061e75a 100644 --- a/examples/haccio_v2.c +++ b/examples/haccio_v2.c @@ -43,7 +43,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n #procs ./haccio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n #procs ./haccio #particles\n"); } void diff --git a/examples/tileio.c b/examples/tileio.c index 7cb691ddf..8f7e6fa7e 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -24,9 +24,9 @@ int g_x_ept, g_y_ept; void print_usage() { - LOG_INFO("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " + LOG_JUST_PRINT("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " "#num_elements_x #num_elements_y\n"); - LOG_INFO("\tnote: #procs should equal to x_tiles*y_tiles\n"); + LOG_JUST_PRINT("\tnote: #procs should equal to x_tiles*y_tiles\n"); } pdcid_t diff --git a/examples/tileio_v2.c b/examples/tileio_v2.c index 0bcb3f1dd..05b0964de 100644 --- a/examples/tileio_v2.c +++ b/examples/tileio_v2.c @@ -24,9 +24,9 @@ int g_x_ept, g_y_ept; void print_usage() { - LOG_INFO("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " + LOG_JUST_PRINT("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " "#num_elements_x #num_elements_y\n"); - LOG_INFO("\tnote: #procs should equal to x_tiles*y_tiles\n"); + LOG_JUST_PRINT("\tnote: #procs should equal to x_tiles*y_tiles\n"); } pdcid_t diff --git a/examples/vpicio.c b/examples/vpicio.c index d8a4f2428..b55603924 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index fc358e8d6..693d91bf0 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -45,7 +45,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n ./vpicio sleep_time timestamps #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio sleep_time timestamps #particles\n"); } int diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index b514c33c5..30c7e2316 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -44,7 +44,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n ./vpicio #particles\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles\n"); } int diff --git a/src/commons/logging/include/pdc_logger.h b/src/commons/logging/include/pdc_logger.h index c15412fda..8d7ac720b 100644 --- a/src/commons/logging/include/pdc_logger.h +++ b/src/commons/logging/include/pdc_logger.h @@ -28,9 +28,6 @@ void setLogLevel(PDC_LogLevel level); void log_message(bool just_print, PDC_LogLevel level, const char *file, const char *func, int line_number, const char *format, ...); -void log_message_nlf(PDC_LogLevel level, const char *file, const char *func, int line_number, - const char *format, ...); - #define LOG_ERROR(format, ...) \ log_message(false, LOG_LEVEL_ERROR, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) #define LOG_WARNING(format, ...) \ @@ -42,13 +39,4 @@ void log_message_nlf(PDC_LogLevel level, const char *file, const char *func, int #define LOG_JUST_PRINT(format, ...) \ log_message(true, LOG_LEVEL_INFO, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) -#define NLF_LOG_ERROR(format, ...) \ - log_message_nlf(LOG_LEVEL_ERROR, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) -#define NLF_LOG_WARNING(format, ...) \ - log_message_nlf(LOG_LEVEL_WARNING, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) -#define NLF_LOG_INFO(format, ...) \ - log_message_nlf(LOG_LEVEL_INFO, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) -#define NLF_LOG_DEBUG(format, ...) \ - log_message_nlf(LOG_LEVEL_DEBUG, __FILE__, __func__, __LINE__, format, ##__VA_ARGS__) - #endif // PDC_LOGGER_H \ No newline at end of file diff --git a/src/commons/logging/pdc_logger.c b/src/commons/logging/pdc_logger.c index 215f72707..2e827f233 100644 --- a/src/commons/logging/pdc_logger.c +++ b/src/commons/logging/pdc_logger.c @@ -73,65 +73,64 @@ get_cur_log_file(PDC_LogLevel level) } void -_log_message(int lf, PDC_LogLevel level, const char *file, const char *func, int line_number, - const char *format, va_list args) +_log_message(PDC_LogLevel level, const char *file, const char *func, int line_number, + const char *format, va_list args, bool just_print) { if (level > logLevel) { return; } - char prefix[16]; - switch (level) { - case LOG_LEVEL_ERROR: - strcpy(prefix, "ERROR"); - break; - case LOG_LEVEL_WARNING: - strcpy(prefix, "WARNING"); - break; - case LOG_LEVEL_INFO: - strcpy(prefix, "INFO"); - break; - case LOG_LEVEL_DEBUG: - strcpy(prefix, "DEBUG"); - break; - } + FILE *logFile = get_cur_log_file(level); + if(!just_print) { + char prefix[16]; + switch (level) { + case LOG_LEVEL_ERROR: + strcpy(prefix, "ERROR"); + break; + case LOG_LEVEL_WARNING: + strcpy(prefix, "WARNING"); + break; + case LOG_LEVEL_INFO: + strcpy(prefix, "INFO"); + break; + case LOG_LEVEL_DEBUG: + strcpy(prefix, "DEBUG"); + break; + } - // Extract only the filename (stem) from the full path - const char *filename = strrchr(file, '/'); - if (filename) { - filename++; - } - else { - filename = file; - } + // Extract only the filename (stem) from the full path + const char *filename = strrchr(file, '/'); + if (filename) { + filename++; + } + else { + filename = file; + } - // Properly format timestamp - struct timeval tv; - gettimeofday(&tv, NULL); - struct tm timeinfo; - localtime_r(&tv.tv_sec, &timeinfo); + // Properly format timestamp + struct timeval tv; + gettimeofday(&tv, NULL); + struct tm timeinfo; + localtime_r(&tv.tv_sec, &timeinfo); - char timestr[30]; - strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", &timeinfo); + char timestr[30]; + strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", &timeinfo); - const char *log_format = "[%s.%06ld] [%s] [%s:%s:%d] %s"; + const char *log_format = "[%s.%06ld] [%s] [%s:%s:%d] %s"; - char message[MAX_LOG_MSG_LENGTH + 1]; - vsnprintf(message, MAX_LOG_MSG_LENGTH, format, args); + char message[MAX_LOG_MSG_LENGTH + 1]; + vsnprintf(message, MAX_LOG_MSG_LENGTH, format, args); + + fprintf(logFile, log_format, timestr, tv.tv_usec, prefix, filename, func, line_number, message); + } else { + const char *log_format = "%s"; + char message[MAX_LOG_MSG_LENGTH + 1]; + vsnprintf(message, MAX_LOG_MSG_LENGTH, format, args); - FILE *logFile = get_cur_log_file(level); - fprintf(logFile, log_format, timestr, tv.tv_usec, prefix, filename, func, line_number, message); - fflush(logFile); -} + fprintf(logFile, log_format, message); + } -void -log_message_nlf(PDC_LogLevel level, const char *file, const char *func, int line_number, const char *format, - ...) -{ - va_list args; - va_start(args, format); - _log_message(0, level, file, func, line_number, format, args); - va_end(args); + fflush(logFile); } void @@ -141,12 +140,6 @@ log_message(bool just_print, PDC_LogLevel level, const char *file, const char *f va_list args; va_start(args, format); - if (just_print) { - FILE *logFile = get_cur_log_file(level); - fprintf(logFile, file, func, line_number, format, args); - } - else { - _log_message(1, level, file, func, line_number, format, args); - } + _log_message(level, file, func, line_number, format, args, just_print); va_end(args); } \ No newline at end of file diff --git a/src/server/pdc_server_metadata_index_test.c b/src/server/pdc_server_metadata_index_test.c index 9e6813bc2..d7b2bfb08 100644 --- a/src/server/pdc_server_metadata_index_test.c +++ b/src/server/pdc_server_metadata_index_test.c @@ -152,7 +152,7 @@ query_result_from_kvtag(char *key_value_query, int8_t op_type) input->op_type = op_type; input->attr_key = key_value_query; assert(PDC_Server_dart_perform_one_server(input, output, &n_obj_ids, &buf_ptr) == SUCCEED); - NLF_LOG_INFO("Query %s Successful! %d Results: ", key_value_query, n_obj_ids); + LOG_JUST_PRINT("Query %s Successful! %d Results: ", key_value_query, n_obj_ids); for (int i = 0; i < n_obj_ids; i++) { LOG_JUST_PRINT("%llu, ", buf_ptr[i]); } diff --git a/src/tests/delete_obj.c b/src/tests/delete_obj.c index dea7727a6..235b44bf1 100644 --- a/src/tests/delete_obj.c +++ b/src/tests/delete_obj.c @@ -52,7 +52,7 @@ rand_string(char *str, size_t size) void print_usage() { - LOG_INFO("Usage: srun -n ./delete_obj -r total_objects_to_create_delete\n"); + LOG_JUST_PRINT("Usage: srun -n ./delete_obj -r total_objects_to_create_delete\n"); } int diff --git a/src/tests/read_obj.c b/src/tests/read_obj.c index e7de07c99..73f6198f2 100644 --- a/src/tests/read_obj.c +++ b/src/tests/read_obj.c @@ -13,7 +13,7 @@ void print_usage() { - LOG_INFO("Usage: srun -n ./write_obj obj_name size_MB type\n"); + LOG_JUST_PRINT("Usage: srun -n ./write_obj obj_name size_MB type\n"); } int diff --git a/src/tests/read_obj_shared.c b/src/tests/read_obj_shared.c index 5b3427326..f75eb6c51 100644 --- a/src/tests/read_obj_shared.c +++ b/src/tests/read_obj_shared.c @@ -12,7 +12,7 @@ void print_usage() { - LOG_INFO("Usage: srun -n ./write_obj obj_name size_MB type\n"); + LOG_JUST_PRINT("Usage: srun -n ./write_obj obj_name size_MB type\n"); } int diff --git a/src/tests/stat_obj.c b/src/tests/stat_obj.c index 514a32296..fe13ac434 100644 --- a/src/tests/stat_obj.c +++ b/src/tests/stat_obj.c @@ -35,7 +35,7 @@ void print_usage() { - LOG_INFO("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./creat_obj -r num_of_obj_per_rank\n"); } int diff --git a/src/tests/update_obj.c b/src/tests/update_obj.c index 758cbbdce..fc68f1177 100644 --- a/src/tests/update_obj.c +++ b/src/tests/update_obj.c @@ -35,7 +35,7 @@ void print_usage() { - LOG_INFO("Usage: srun -n ./update_obj -r num_of_obj_per_rank\n"); + LOG_JUST_PRINT("Usage: srun -n ./update_obj -r num_of_obj_per_rank\n"); } int diff --git a/src/tests/vpicio_mts.c b/src/tests/vpicio_mts.c index 5bbc9791b..4f5a8705e 100644 --- a/src/tests/vpicio_mts.c +++ b/src/tests/vpicio_mts.c @@ -45,7 +45,7 @@ uniform_random_number() void print_usage() { - LOG_INFO("Usage: srun -n ./vpicio #particles #steps sleep_time(s)\n"); + LOG_JUST_PRINT("Usage: srun -n ./vpicio #particles #steps sleep_time(s)\n"); } int diff --git a/src/tools/pdc_import.c b/src/tools/pdc_import.c index 29ee531b0..0fb670df6 100644 --- a/src/tools/pdc_import.c +++ b/src/tools/pdc_import.c @@ -71,7 +71,7 @@ void do_plist(hid_t); void print_usage() { - LOG_INFO("Usage: srun -n 2443 ./h5boss_v2_import h5boss_filenames\n"); + LOG_JUST_PRINT("Usage: srun -n 2443 ./h5boss_v2_import h5boss_filenames\n"); } int rank = 0, size = 1; From b87edf1c212728bd5dac591793e8721ed1c202c1 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 26 Mar 2025 15:05:07 -0700 Subject: [PATCH 7/7] update clang formatting --- examples/bdcats_batch.c | 96 +++++++++---------- examples/haccio.c | 2 +- examples/haccio_v2.c | 4 +- examples/llsm/llsm_aux/parallelReadTiff.c | 6 +- examples/llsm/llsm_importer.c | 4 +- examples/tileio.c | 4 +- examples/tileio_v2.c | 6 +- examples/vpicio_batch.c | 4 +- .../index/idioms/idioms_local_index_test.c | 12 +-- src/commons/logging/pdc_logger.c | 13 +-- 10 files changed, 76 insertions(+), 75 deletions(-) diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index 877f41080..e69aef296 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -46,7 +46,7 @@ void print_usage() { LOG_DEBUG("Usage: srun -n bdcats_batch sleep_time timestep #particles test_method(0:old API, 1:wait, " - "default 2:wait all)\n"); + "default 2:wait all)\n"); } int @@ -112,7 +112,7 @@ main(int argc, char **argv) } if (!rank) { LOG_INFO("sleep time = %u, timestep = %" PRIu64 ", numparticles = %" PRIu64 ", test_method = %d\n", - sleep_time, timestep, numparticles, test_method); + sleep_time, timestep, numparticles, test_method); } x = (float *)malloc(numparticles * sizeof(float)); @@ -180,7 +180,7 @@ main(int argc, char **argv) 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"); + 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); @@ -190,7 +190,7 @@ main(int argc, char **argv) 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"); + 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); @@ -200,7 +200,7 @@ main(int argc, char **argv) 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"); + 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); @@ -210,7 +210,7 @@ main(int argc, char **argv) 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"); + 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); @@ -220,7 +220,7 @@ main(int argc, char **argv) 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"); + 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); @@ -230,7 +230,7 @@ main(int argc, char **argv) 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"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz"); exit(-1); } sprintf(obj_name, "id11 %" PRIu64 "", i); @@ -240,7 +240,7 @@ main(int argc, char **argv) obj_id11[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_id11[i] == 0) { - LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11"); exit(-1); } sprintf(obj_name, "id22 %" PRIu64 "", i); @@ -250,7 +250,7 @@ main(int argc, char **argv) obj_id22[i] = PDCobj_open(obj_name, pdc_id); #endif if (obj_id22[i] == 0) { - LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); + LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); } } @@ -396,22 +396,22 @@ main(int argc, char **argv) LOG_ERROR("Failed to obtain lock for region_yy\n"); ret = PDCreg_obtain_lock(obj_zz[i], region_zz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_ERROR("failed to obtain lock for region_zz\n"); + LOG_ERROR("failed to obtain lock for region_zz\n"); ret = PDCreg_obtain_lock(obj_pxx[i], region_pxx, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_ERROR("failed to obtain lock for region_pxx\n"); + LOG_ERROR("failed to obtain lock for region_pxx\n"); ret = PDCreg_obtain_lock(obj_pyy[i], region_pyy, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_ERROR("failed to obtain lock for region_pyy\n"); + LOG_ERROR("failed to obtain lock for region_pyy\n"); ret = PDCreg_obtain_lock(obj_pzz[i], region_pzz, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_ERROR("failed to obtain lock for region_pzz\n"); + LOG_ERROR("failed to obtain lock for region_pzz\n"); ret = PDCreg_obtain_lock(obj_id11[i], region_id11, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_ERROR("failed to obtain lock for region_id11\n"); + LOG_ERROR("failed to obtain lock for region_id11\n"); ret = PDCreg_obtain_lock(obj_id22[i], region_id22, PDC_READ, PDC_NOBLOCK); if (ret != SUCCEED) - LOG_ERROR("failed to obtain lock for region_id22\n"); + LOG_ERROR("failed to obtain lock for region_id22\n"); } #ifdef ENABLE_MPI transfer_start += MPI_Wtime() - start; @@ -425,7 +425,7 @@ main(int argc, char **argv) if (test_method == 2) { ret = PDCregion_transfer_wait_all(temp_requests, 8); if (ret != SUCCEED) { - LOG_ERROR("failed to start transfer for all regions\n"); + LOG_ERROR("failed to start transfer for all regions\n"); return 1; } } @@ -437,28 +437,28 @@ main(int argc, char **argv) else { ret = PDCreg_release_lock(obj_xx[i], region_xx, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_xx\n"); + LOG_ERROR("failed to release lock for region_xx\n"); ret = PDCreg_release_lock(obj_yy[i], region_yy, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_yy\n"); + LOG_ERROR("failed to release lock for region_yy\n"); ret = PDCreg_release_lock(obj_zz[i], region_zz, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_zz\n"); + LOG_ERROR("failed to release lock for region_zz\n"); ret = PDCreg_release_lock(obj_pxx[i], region_pxx, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_pxx\n"); + LOG_ERROR("failed to release lock for region_pxx\n"); ret = PDCreg_release_lock(obj_pyy[i], region_pyy, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_pyy\n"); + LOG_ERROR("failed to release lock for region_pyy\n"); ret = PDCreg_release_lock(obj_pzz[i], region_pzz, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_pzz\n"); + LOG_ERROR("failed to release lock for region_pzz\n"); ret = PDCreg_release_lock(obj_id11[i], region_id11, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_id11\n"); + LOG_ERROR("failed to release lock for region_id11\n"); ret = PDCreg_release_lock(obj_id22[i], region_id22, PDC_READ); if (ret != SUCCEED) - LOG_ERROR("failed to release lock for region_id22\n"); + LOG_ERROR("failed to release lock for region_id22\n"); } #ifdef ENABLE_MPI end = MPI_Wtime(); @@ -543,7 +543,7 @@ main(int argc, char **argv) transfer_close += MPI_Wtime() - start; #endif if (PDCregion_close(region_xx) < 0) { - LOG_ERROR("Failed to close region region_xx\n"); + LOG_ERROR("Failed to close region region_xx\n"); return 1; } if (PDCregion_close(region_yy) < 0) { @@ -552,7 +552,7 @@ main(int argc, char **argv) } if (PDCregion_close(region_zz) < 0) { - LOG_ERROR("Failed to close region region_zz\n"); + LOG_ERROR("Failed to close region region_zz\n"); return 1; } if (PDCregion_close(region_pxx) < 0) { @@ -560,19 +560,19 @@ main(int argc, char **argv) return 1; } if (PDCregion_close(region_pyy) < 0) { - LOG_ERROR("Failed to close region region_pyy\n"); + LOG_ERROR("Failed to close region region_pyy\n"); return 1; } if (PDCregion_close(region_pzz) < 0) { - LOG_ERROR("Failed to close region region_pzz\n"); + LOG_ERROR("Failed to close region region_pzz\n"); return 1; } if (PDCobj_close(region_id11) < 0) { - LOG_ERROR("Failed to close region region_id11\n"); + LOG_ERROR("Failed to close region region_id11\n"); return 1; } if (PDCobj_close(region_id22) < 0) { - LOG_ERROR("Failed to close region region_id22\n"); + LOG_ERROR("Failed to close region region_id22\n"); return 1; } } @@ -584,35 +584,35 @@ main(int argc, char **argv) for (i = 0; i < timestep; ++i) { if (PDCobj_close(obj_xx[i]) < 0) { - LOG_ERROR("Failed to close obj_xx\n"); + LOG_ERROR("Failed to close obj_xx\n"); return 1; } if (PDCobj_close(obj_yy[i]) < 0) { - LOG_ERROR("Failed to close object obj_yy\n"); + LOG_ERROR("Failed to close object obj_yy\n"); return 1; } if (PDCobj_close(obj_zz[i]) < 0) { - LOG_ERROR("Failed to close object obj_zz\n"); + LOG_ERROR("Failed to close object obj_zz\n"); return 1; } if (PDCobj_close(obj_pxx[i]) < 0) { - LOG_ERROR("Failed to close object obj_pxx\n"); + LOG_ERROR("Failed to close object obj_pxx\n"); return 1; } if (PDCobj_close(obj_pyy[i]) < 0) { - LOG_ERROR("Failed to close object obj_pyy\n"); + LOG_ERROR("Failed to close object obj_pyy\n"); return 1; } if (PDCobj_close(obj_pzz[i]) < 0) { - LOG_ERROR("Failed to close object obj_pzz\n"); + LOG_ERROR("Failed to close object obj_pzz\n"); return 1; } if (PDCobj_close(obj_id11[i]) < 0) { - LOG_ERROR("Failed to close object obj_id11\n"); + LOG_ERROR("Failed to close object obj_id11\n"); return 1; } if (PDCobj_close(obj_id22[i]) < 0) { - LOG_ERROR("Failed to close object obj_id22\n"); + LOG_ERROR("Failed to close object obj_id22\n"); return 1; } } @@ -663,40 +663,40 @@ main(int argc, char **argv) free(obj_id22); if (PDCregion_close(region_x) < 0) { - LOG_ERROR("Failed to close region region_x\n"); + LOG_ERROR("Failed to close region region_x\n"); return 1; } if (PDCregion_close(region_y) < 0) { - LOG_ERROR("Failed to close region region_y\n"); + LOG_ERROR("Failed to close region region_y\n"); return 1; } if (PDCregion_close(region_z) < 0) { - LOG_ERROR("Failed to close region region_z\n"); + LOG_ERROR("Failed to close region region_z\n"); return 1; } if (PDCregion_close(region_px) < 0) { - LOG_ERROR("Failed to close region region_px\n"); + LOG_ERROR("Failed to close region region_px\n"); return 1; } if (PDCregion_close(region_py) < 0) { - LOG_ERROR("Failed to close region region_py\n"); + LOG_ERROR("Failed to close region region_py\n"); return 1; } if (PDCobj_close(region_pz) < 0) { - LOG_ERROR("Failed to close region region_pz\n"); + LOG_ERROR("Failed to close region region_pz\n"); return 1; } if (PDCobj_close(region_id1) < 0) { - LOG_ERROR("Failed to close region region_id1\n"); + LOG_ERROR("Failed to close region region_id1\n"); return 1; } if (PDCobj_close(region_id2) < 0) { - LOG_ERROR("Failed to close region region_id2\n"); + LOG_ERROR("Failed to close region region_id2\n"); return 1; } if (PDCclose(pdc_id) < 0) { - LOG_ERROR("Failed to close PDC\n"); + LOG_ERROR("Failed to close PDC\n"); return 1; } free(offset); diff --git a/examples/haccio.c b/examples/haccio.c index c1db05b6b..81d06271a 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -211,7 +211,7 @@ main(int argc, char **argv) double per_particle = sizeof(float) * 7 + sizeof(int64_t) + sizeof(int16_t); double bandwidth = per_particle * NUM_PARTICLES / 1024.0 / 1024.0 / time_total * mpi_size; LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, lock: %.4f, io: %.4f, release: %.4f\n", bandwidth, - time_total, time_lock, time_io, time_release); + time_total, time_lock, time_io, time_release); } MPI_Finalize(); diff --git a/examples/haccio_v2.c b/examples/haccio_v2.c index 43061e75a..2c444aba0 100644 --- a/examples/haccio_v2.c +++ b/examples/haccio_v2.c @@ -186,8 +186,8 @@ main(int argc, char **argv) double per_particle = sizeof(float) * 7 + sizeof(int64_t) + sizeof(int16_t); double bandwidth = per_particle * NUM_PARTICLES / 1024.0 / 1024.0 / time_total * mpi_size; LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, create transfer: %.4f, start transfer: %.4f, wait " - "transfer: %.4f\n", - bandwidth, time_total, time_create, time_start, time_wait); + "transfer: %.4f\n", + bandwidth, time_total, time_create, time_start, time_wait); } MPI_Finalize(); diff --git a/examples/llsm/llsm_aux/parallelReadTiff.c b/examples/llsm/llsm_aux/parallelReadTiff.c index 9bce41c33..95d704aa6 100644 --- a/examples/llsm/llsm_aux/parallelReadTiff.c +++ b/examples/llsm/llsm_aux/parallelReadTiff.c @@ -53,7 +53,7 @@ readTiffParallelBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, vo int counter = 0; while (!TIFFSetDirectory(tif, (uint64_t)dir) && counter < 3) { LOG_ERROR("Thread %d: File \"%s\" Directory \"%" PRId64 "\" failed to open. Try %d\n", w, - fileName, dir, counter + 1); + fileName, dir, counter + 1); counter++; } @@ -347,7 +347,7 @@ readTiffParallel2DBak(uint64_t x, uint64_t y, uint64_t z, const char *fileName, int counter = 0; while (!TIFFSetDirectory(tif, (uint64_t)0) && counter < 3) { LOG_ERROR("Thread %d: File \"%s\" Directory \"%" PRId64 "\" failed to open. Try %d\n", w, - fileName, dir, counter + 1); + fileName, dir, counter + 1); counter++; } @@ -440,7 +440,7 @@ readTiffParallel2D(uint64_t x, uint64_t y, uint64_t z, const char *fileName, voi uint8_t counter = 0; while (!TIFFSetDirectory(tif, 0) && counter < 3) { LOG_ERROR("Thread %d: File \"%s\" Directory \"%d\" failed to open. Try %d\n", w, fileName, 0, - counter + 1); + counter + 1); counter++; if (counter == 3) { #ifdef ENABLE_OPENMP diff --git a/examples/llsm/llsm_importer.c b/examples/llsm/llsm_importer.c index 0564049b7..545219a58 100644 --- a/examples/llsm/llsm_importer.c +++ b/examples/llsm/llsm_importer.c @@ -126,7 +126,7 @@ import_to_pdc(image_info_t *image_info, csv_cell_t *fileName_cell) duration = getDoubleTimestamp() - start; // end timing the operation and calculate duration in nanoseconds LOG_INFO("[Rank %4d] Region_Transfer %s_[%ld_Bytes] Done! Time taken: %.4f seconds\n", rank, - fileName_cell->field_value, image_info->tiff_size, duration); + fileName_cell->field_value, image_info->tiff_size, duration); // add metadata tags based on the csv row csv_cell_t *cell = fileName_cell; @@ -169,7 +169,7 @@ import_to_pdc(image_info_t *image_info, csv_cell_t *fileName_cell) duration = getDoubleTimestamp() - start; // end timing the operation calculate duration in nanoseconds LOG_INFO("[Rank %4d] Create_object %s Done! Time taken: %.4f seconds\n", rank, fileName_cell->field_value, - duration); + duration); // free memory // free(offsets); diff --git a/examples/tileio.c b/examples/tileio.c index 8f7e6fa7e..c73695390 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -25,7 +25,7 @@ void print_usage() { LOG_JUST_PRINT("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " - "#num_elements_x #num_elements_y\n"); + "#num_elements_x #num_elements_y\n"); LOG_JUST_PRINT("\tnote: #procs should equal to x_tiles*y_tiles\n"); } @@ -186,7 +186,7 @@ main(int argc, char **argv) double bandwidth = g_x_tiles * g_y_tiles * g_x_ept * g_y_ept / 1024.0 / 1024.0 * sizeof(double) / time_total; LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, lock: %.4f, io: %.4f, release: %.4f\n", bandwidth, - time_total, time_acquire_lock, time_io, time_release_lock); + time_total, time_acquire_lock, time_io, time_release_lock); } MPI_Comm_free(&g_mpi_comm); diff --git a/examples/tileio_v2.c b/examples/tileio_v2.c index 05b0964de..eef86d332 100644 --- a/examples/tileio_v2.c +++ b/examples/tileio_v2.c @@ -25,7 +25,7 @@ void print_usage() { LOG_JUST_PRINT("Usage: srun -N #nodes -n #procs ./tilio #x_tils #y_tiles " - "#num_elements_x #num_elements_y\n"); + "#num_elements_x #num_elements_y\n"); LOG_JUST_PRINT("\tnote: #procs should equal to x_tiles*y_tiles\n"); } @@ -165,8 +165,8 @@ main(int argc, char **argv) double bandwidth = g_x_ept * g_y_ept / 1024.0 / 1024.0 * g_x_tiles * g_y_tiles * sizeof(double) / time_total; LOG_INFO("Bandwidth: %.2fMB/s, total time: %.4f, transfer create: %.4f, transfer start: %.4f, " - "transfert wait: %.4f\n", - bandwidth, time_total, time_create, time_start, time_wait); + "transfert wait: %.4f\n", + bandwidth, time_total, time_create, time_start, time_wait); } MPI_Comm_free(&g_mpi_comm); diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index 693d91bf0..216627791 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -123,8 +123,8 @@ main(int argc, char **argv) if (!rank) { LOG_INFO("sleep time = %u, timestamps = %" PRIu64 ", numparticles = %" PRIu64 - ", test_method = %d, region_ partition = %d\n", - sleep_time, timestamps, numparticles, test_method, (int)region_partition); + ", test_method = %d, region_ partition = %d\n", + sleep_time, timestamps, numparticles, test_method, (int)region_partition); } dims[0] = numparticles * size; diff --git a/src/commons/index/dart/index/idioms/idioms_local_index_test.c b/src/commons/index/dart/index/idioms/idioms_local_index_test.c index e934b4060..3a4922bb5 100644 --- a/src/commons/index/dart/index/idioms/idioms_local_index_test.c +++ b/src/commons/index/dart/index/idioms/idioms_local_index_test.c @@ -512,8 +512,9 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) break; case 3: if (nres != 20) { - LOG_ERROR("Failed to query kvtag [%s] with rank %d. Expected 20 results, but got %d results\n", - "*09*=*09*", world_rank, nres); + LOG_ERROR( + "Failed to query kvtag [%s] with rank %d. Expected 20 results, but got %d results\n", + "*09*=*09*", world_rank, nres); step_failed = 3; } // the result is not in order, so we need to sort the result first @@ -538,10 +539,9 @@ validate_query_result(int world_rank, int nres, uint64_t *pdc_ids) step_failed = 4; } if (pdc_ids[0] != 109) { - LOG_ERROR( - "Failed to query kvtag [%s] with rank %d. Expected 1 result which is 109, but got %" PRIu64 - "\n", - "intkey=109", world_rank, pdc_ids[0]); + LOG_ERROR("Failed to query kvtag [%s] with rank %d. Expected 1 result which is 109, but got " + "%" PRIu64 "\n", + "intkey=109", world_rank, pdc_ids[0]); step_failed = 4; } break; diff --git a/src/commons/logging/pdc_logger.c b/src/commons/logging/pdc_logger.c index 2e827f233..86618222b 100644 --- a/src/commons/logging/pdc_logger.c +++ b/src/commons/logging/pdc_logger.c @@ -73,15 +73,15 @@ get_cur_log_file(PDC_LogLevel level) } void -_log_message(PDC_LogLevel level, const char *file, const char *func, int line_number, - const char *format, va_list args, bool just_print) +_log_message(PDC_LogLevel level, const char *file, const char *func, int line_number, const char *format, + va_list args, bool just_print) { if (level > logLevel) { return; } FILE *logFile = get_cur_log_file(level); - if(!just_print) { + if (!just_print) { char prefix[16]; switch (level) { case LOG_LEVEL_ERROR: @@ -120,11 +120,12 @@ _log_message(PDC_LogLevel level, const char *file, const char *func, int line_nu char message[MAX_LOG_MSG_LENGTH + 1]; vsnprintf(message, MAX_LOG_MSG_LENGTH, format, args); - + fprintf(logFile, log_format, timestr, tv.tv_usec, prefix, filename, func, line_number, message); - } else { + } + else { const char *log_format = "%s"; - char message[MAX_LOG_MSG_LENGTH + 1]; + char message[MAX_LOG_MSG_LENGTH + 1]; vsnprintf(message, MAX_LOG_MSG_LENGTH, format, args); fprintf(logFile, log_format, message);