diff options
| -rw-r--r-- | src/H5VLiod.c | 130 | ||||
| -rw-r--r-- | src/H5VLiod_attr.c | 34 | ||||
| -rw-r--r-- | src/H5VLiod_client.c | 2 | ||||
| -rw-r--r-- | src/H5VLiod_common.h | 2 | ||||
| -rw-r--r-- | src/H5VLiod_dset.c | 52 | ||||
| -rw-r--r-- | src/H5VLiod_dtype.c | 16 | ||||
| -rw-r--r-- | src/H5VLiod_file.c | 22 | ||||
| -rw-r--r-- | src/H5VLiod_group.c | 14 | ||||
| -rw-r--r-- | src/H5VLiod_index.c | 12 | ||||
| -rw-r--r-- | src/H5VLiod_link.c | 28 | ||||
| -rw-r--r-- | src/H5VLiod_map.c | 42 | ||||
| -rw-r--r-- | src/H5VLiod_obj.c | 32 | ||||
| -rw-r--r-- | src/H5VLiod_trans.c | 44 | ||||
| -rw-r--r-- | src/H5VLiod_util.c | 22 | ||||
| -rw-r--r-- | src/H5VLiod_view.c | 2 |
15 files changed, 227 insertions, 227 deletions
diff --git a/src/H5VLiod.c b/src/H5VLiod.c index 3cbf8a8..dbd635b 100644 --- a/src/H5VLiod.c +++ b/src/H5VLiod.c @@ -527,7 +527,7 @@ H5VL__iod_create_and_forward(hg_id_t op_id, H5RQ_type_t op_type, H5VL__iod_request_add_to_axe_list(request); axe_info->count = axe_list.last_released_task - axe_info->start_range + 1; -#if 0//H5VL_IOD_DEBUG +#if 0//H5_EFF_DEBUG printf("Operation %"PRIu64" Dependencies: ", request->axe_id); for(u=0 ; u<num_parents ; u++) printf("%"PRIu64" ", axe_info->parent_axe_ids[u]); @@ -644,7 +644,7 @@ EFF_init(MPI_Comm comm, MPI_Info UNUSED info) fscanf(config, "%d\n", &num_ions); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Found %d servers\n", num_ions); #endif @@ -676,7 +676,7 @@ EFF_init(MPI_Comm comm, MPI_Info UNUSED info) 0, tag, comm, MPI_STATUS_IGNORE); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("CN %d Connecting to ION %s\n", my_rank, addr_name); #endif @@ -1719,7 +1719,7 @@ H5VL_iod_analysis_execute(const char *file_name, const char *obj_name, input.split_script = split_script; input.combine_script = combine_script; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Analysis Execute on file %s Object %s\n", input.file_name, input.obj_name); #endif @@ -1852,7 +1852,7 @@ H5VL_iod_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl file->common.obj_name[1] = '\0'; file->common.file = file; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("File Create %s IOD ROOT ID %"PRIu64", axe id %"PRIu64"\n", name, input.root_id, g_axe_id); #endif @@ -1996,7 +1996,7 @@ H5VL_iod_file_open(const char *name, unsigned flags, hid_t fapl_id, file->common.obj_name[1] = '\0'; file->common.file = file; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("File Open %s axe id %"PRIu64"\n", name, g_axe_id); #endif @@ -2337,7 +2337,7 @@ H5VL_iod_file_close(void *_file, hid_t UNUSED dxpl_id, void **req) } } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("File Close Root ID %"PRIu64" axe id %"PRIu64"\n", input.root_id, g_axe_id); #endif @@ -2489,7 +2489,7 @@ H5VL_iod_group_create(void *_obj, H5VL_loc_params_t UNUSED loc_params, const cha grp->common.file = obj->file; grp->common.file->nopen_objs ++; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Group Create %s, IOD ID %"PRIu64", axe id %"PRIu64"\n", name, input.grp_id, g_axe_id); #endif @@ -2611,7 +2611,7 @@ H5VL_iod_group_open(void *_obj, H5VL_loc_params_t UNUSED loc_params, const char input.rcxt_num = rc->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Group Open %s LOC ID %"PRIu64", axe id %"PRIu64"\n", name, input.loc_id, g_axe_id); #endif @@ -2774,7 +2774,7 @@ H5VL_iod_group_close(void *_grp, hid_t UNUSED dxpl_id, void **req) /* allocate an integer to receive the return value if the group close succeeded or not */ status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Group Close IOD ID %"PRIu64", axe id %"PRIu64"\n", input.iod_id, g_axe_id); #endif @@ -2965,7 +2965,7 @@ H5VL_iod_dataset_create(void *_obj, H5VL_loc_params_t UNUSED loc_params, dset->common.file = obj->file; dset->common.file->nopen_objs ++; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG if(name) printf("Dataset Create %s IOD ID %"PRIu64", axe id %"PRIu64"\n", name, input.dset_id, g_axe_id); @@ -3123,7 +3123,7 @@ H5VL_iod_dataset_open(void *_obj, H5VL_loc_params_t UNUSED loc_params, const cha dset->common.file = obj->file; dset->common.file->nopen_objs ++; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Dataset Open %s LOC ID %"PRIu64", axe id %"PRIu64"\n", name, input.loc_id, g_axe_id); #endif @@ -3411,7 +3411,7 @@ H5VL_iod_dataset_read(void *_dset, hid_t mem_type_id, hid_t mem_space_id, info->read_id = H5VL_DSET_READ_ID; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG if(!type_info->vls) printf("Dataset Read, axe id %"PRIu64"\n", g_axe_id); else @@ -3588,7 +3588,7 @@ H5VL_iod_dataset_write(void *_dset, hid_t mem_type_id, hid_t mem_space_id, HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't generate write parameters"); } else { -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("NO DATA INTEGRITY CHECKS ON RAW DATA WRITTEN\n"); #endif /* compute checksum and create bulk handle */ @@ -3640,7 +3640,7 @@ H5VL_iod_dataset_write(void *_dset, hid_t mem_type_id, hid_t mem_space_id, status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Dataset Write, axe id %"PRIu64"\n", g_axe_id); #endif @@ -3742,7 +3742,7 @@ H5VL_iod_dataset_set_extent(void *_dset, const hsize_t size[], input.rcxt_num = tr->c_version; input.cs_scope = dset->common.file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Dataset Set Extent, axe id %"PRIu64"\n", g_axe_id); #endif @@ -3917,7 +3917,7 @@ H5VL_iod_dataset_close(void *_dset, hid_t UNUSED dxpl_id, void **req) status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Dataset Close IOD ID %"PRIu64", axe id %"PRIu64"\n", input.iod_id, g_axe_id); #endif @@ -4042,7 +4042,7 @@ H5VL_iod_datatype_commit(void *_obj, H5VL_loc_params_t UNUSED loc_params, const input.rcxt_num = tr->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Datatype Commit %s IOD ID %"PRIu64", axe id %"PRIu64"\n", name, input.dtype_id, g_axe_id); #endif @@ -4194,7 +4194,7 @@ H5VL_iod_datatype_open(void *_obj, H5VL_loc_params_t UNUSED loc_params, const ch input.rcxt_num = rc->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Datatype Open %s LOC ID %"PRIu64", axe id %"PRIu64"\n", name, input.loc_id, g_axe_id); #endif @@ -4389,7 +4389,7 @@ H5VL_iod_datatype_close(void *obj, hid_t UNUSED dxpl_id, void **req) input.iod_oh = dtype->remote_dtype.iod_oh; input.iod_id = dtype->remote_dtype.iod_id; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Datatype Close IOD ID %"PRIu64", axe id %"PRIu64"\n", input.iod_id, g_axe_id); #endif @@ -4548,7 +4548,7 @@ H5VL_iod_attribute_create(void *_obj, H5VL_loc_params_t loc_params, const char * /* store the name of the attribute locally */ attr->common.obj_name = strdup(attr_name); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Create %s IOD ID %"PRIu64", axe id %"PRIu64"\n", attr_name, input.attr_id, g_axe_id); #endif @@ -4697,7 +4697,7 @@ H5VL_iod_attribute_open(void *_obj, H5VL_loc_params_t loc_params, const char *at input.rcxt_num = rc->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Open %s LOC ID %"PRIu64", axe id %"PRIu64"\n", attr_name, input.loc_id, g_axe_id); #endif @@ -4884,7 +4884,7 @@ H5VL_iod_attribute_read(void *_attr, hid_t type_id, void *buf, hid_t dxpl_id, vo info->status = status; info->bulk_handle = bulk_handle; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Read IOD ID %"PRIu64", axe id %"PRIu64"\n", input.iod_id, g_axe_id); #endif @@ -5015,7 +5015,7 @@ H5VL_iod_attribute_write(void *_attr, hid_t type_id, const void *buf, hid_t dxpl info->status = status; info->bulk_handle = bulk_handle; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Write IOD ID %"PRIu64", axe id %"PRIu64"\n", input.iod_id, g_axe_id); #endif @@ -5115,7 +5115,7 @@ H5VL_iod_attribute_remove(void *_obj, H5VL_loc_params_t loc_params, const char * status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Remove loc %s name %s, axe id %"PRIu64"\n", loc_name, attr_name, g_axe_id); #endif @@ -5302,7 +5302,7 @@ H5VL_iod_attribute_get(void *_obj, H5VL_attr_get_t get_type, hid_t dxpl_id, input.cs_scope = obj->file->md_integrity_scope; input.trans_num = 0; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Exists loc %s name %s, axe id %"PRIu64"\n", loc_name, attr_name, g_axe_id); #endif @@ -5413,7 +5413,7 @@ H5VL_iod_attribute_close(void *_attr, hid_t UNUSED dxpl_id, void **req) input.iod_oh = attr->remote_attr.iod_oh; input.iod_id = attr->remote_attr.iod_id; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Close IOD ID %"PRIu64", axe id %"PRIu64"\n", input.iod_id, g_axe_id); #endif @@ -5569,7 +5569,7 @@ H5VL_iod_link_create(H5VL_link_create_type_t create_type, void *_obj, H5VL_loc_p link_value = strdup("\0"); input.link_value = link_value; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Link Create Hard axe id %"PRIu64"\n", g_axe_id); #endif break; @@ -5654,7 +5654,7 @@ H5VL_iod_link_create(H5VL_link_create_type_t create_type, void *_obj, H5VL_loc_p input.lapl_id = lapl_id; input.link_value = link_value; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Link Create Soft axe id %"PRIu64"\n", g_axe_id); #endif break; @@ -5963,7 +5963,7 @@ H5VL_iod_link_get(void *_obj, H5VL_loc_params_t loc_params, H5VL_link_get_t get_ input.trans_num = 0; input.path = loc_name; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Link Exists axe %"PRIu64": %s ID %"PRIu64"\n", g_axe_id, loc_name, input.loc_id); #endif @@ -5997,7 +5997,7 @@ H5VL_iod_link_get(void *_obj, H5VL_loc_params_t loc_params, H5VL_link_get_t get_ input.trans_num = 0; input.path = loc_name; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Link get info axe %"PRIu64": %s ID %"PRIu64"\n", g_axe_id, loc_name, input.loc_id); #endif @@ -6042,7 +6042,7 @@ H5VL_iod_link_get(void *_obj, H5VL_loc_params_t loc_params, H5VL_link_get_t get_ result->value.val_size = input.length; result->value.val = buf; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Link get val axe %"PRIu64": %s ID %"PRIu64"\n", g_axe_id, loc_name, input.loc_id); #endif @@ -6147,7 +6147,7 @@ H5VL_iod_link_remove(void *_obj, H5VL_loc_params_t loc_params, hid_t dxpl_id, vo input.rcxt_num = tr->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Link Remove axe %"PRIu64": %s ID %"PRIu64"\n", g_axe_id, loc_name, input.loc_id); #endif @@ -6270,7 +6270,7 @@ H5VL_iod_obj_open_token(const void *token, H5TR_t *tr, H5I_type_t *opened_type, dset->common.file->nopen_objs ++; dset->common.obj_name = NULL; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Dataset open by token %"PRIu64": ID %"PRIu64"\n", g_axe_id, input.iod_id); #endif @@ -6336,7 +6336,7 @@ H5VL_iod_obj_open_token(const void *token, H5TR_t *tr, H5I_type_t *opened_type, dtype->common.file->nopen_objs ++; dtype->common.obj_name = NULL; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Named Datatype open by token %"PRIu64": ID %"PRIu64"\n", g_axe_id, input.iod_id); #endif @@ -6386,7 +6386,7 @@ H5VL_iod_obj_open_token(const void *token, H5TR_t *tr, H5I_type_t *opened_type, grp->common.file->nopen_objs ++; grp->common.obj_name = NULL; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Group open by token %"PRIu64": ID %"PRIu64"\n", g_axe_id, input.iod_id); #endif @@ -6467,7 +6467,7 @@ H5VL_iod_obj_open_token(const void *token, H5TR_t *tr, H5I_type_t *opened_type, map->common.file->nopen_objs ++; map->common.obj_name = NULL; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Map open by token %"PRIu64": ID %"PRIu64"\n", g_axe_id, input.iod_id); #endif @@ -7790,7 +7790,7 @@ H5VL_iod_object_misc(void *_obj, H5VL_loc_params_t loc_params, H5VL_object_misc_ input.rcxt_num = tr->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Attribute Rename %s to %s LOC ID %"PRIu64", axe id %"PRIu64"\n", old_name, new_name, input.loc_id, g_axe_id); #endif @@ -7958,7 +7958,7 @@ H5VL_iod_object_get(void *_obj, H5VL_loc_params_t loc_params, H5VL_object_get_t input.cs_scope = obj->file->md_integrity_scope; input.loc_name = loc_name; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Object Exists axe %"PRIu64": %s ID %"PRIu64"\n", g_axe_id, input.loc_name, input.loc_id); #endif @@ -8026,7 +8026,7 @@ H5VL_iod_object_get(void *_obj, H5VL_loc_params_t loc_params, H5VL_object_get_t result->name.value_size = ret; result->name.value = comment; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Object Get Comment axe %"PRIu64": %s ID %"PRIu64"\n", g_axe_id, loc_name, input.loc_id); #endif @@ -8061,7 +8061,7 @@ H5VL_iod_object_get(void *_obj, H5VL_loc_params_t loc_params, H5VL_object_get_t input.cs_scope = obj->file->md_integrity_scope; input.loc_name = loc_name; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Object get_info axe %"PRIu64": %s ID %"PRIu64"\n", g_axe_id, input.loc_name, input.loc_id); #endif @@ -8196,7 +8196,7 @@ H5VL_iod_map_create(void *_obj, H5VL_loc_params_t UNUSED loc_params, const char input.rcxt_num = tr->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Map Create %s, IOD ID %"PRIu64", axe id %"PRIu64"\n", name, input.map_id, g_axe_id); #endif @@ -8326,7 +8326,7 @@ H5VL_iod_map_open(void *_obj, H5VL_loc_params_t UNUSED loc_params, const char *n input.rcxt_num = rc->c_version; input.cs_scope = obj->file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Map Open %s LOC ID %"PRIu64", axe id %"PRIu64"\n", name, input.loc_id, g_axe_id); #endif @@ -8499,7 +8499,7 @@ H5VL_iod_map_set(void *_map, hid_t key_mem_type_id, const void *key, status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("MAP set, value size %zu, axe id %"PRIu64"\n", val_size, g_axe_id); #endif @@ -8614,7 +8614,7 @@ H5VL_iod_map_get(void *_map, hid_t key_mem_type_id, const void *key, } input.cs_scope = map->common.file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("MAP Get, axe id %"PRIu64"\n", g_axe_id); #endif @@ -8739,7 +8739,7 @@ H5VL_iod_map_get_count(void *_map, hsize_t *count, hid_t rcxt_id, void **req) input.rcxt_num = rc->c_version; input.cs_scope = map->common.file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("MAP Get count, axe id %"PRIu64"\n", g_axe_id); #endif @@ -8797,7 +8797,7 @@ H5VL_iod_map_exists(void *_map, hid_t key_mem_type_id, const void *key, input.cs_scope = map->common.file->md_integrity_scope; input.trans_num = 0; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("MAP EXISTS, axe id %"PRIu64"\n", g_axe_id); #endif @@ -8874,7 +8874,7 @@ H5VL_iod_map_delete(void *_map, hid_t key_mem_type_id, const void *key, input.rcxt_num = tr->c_version; input.cs_scope = map->common.file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("MAP DELETE, axe id %"PRIu64"\n", g_axe_id); #endif @@ -8930,7 +8930,7 @@ herr_t H5VL_iod_map_close(void *_map, void **req) input.iod_oh = map->remote_map.iod_oh; input.iod_id = map->remote_map.iod_id; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Map Close IOD ID %"PRIu64", axe id %"PRIu64"\n", input.iod_id, g_axe_id); #endif @@ -8982,7 +8982,7 @@ H5VL_iod_rc_acquire(H5VL_iod_file_t *file, H5RC_t *rc, uint64_t *c_version, rc_info->read_cxt = rc; rc_info->c_version_ptr = c_version; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Read Context Acquire, version %"PRIu64", axe id %"PRIu64"\n", input.c_version, g_axe_id); #endif @@ -9102,7 +9102,7 @@ H5VL_iod_rc_release(H5RC_t *rc, void **req) status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Read Context Release, version %"PRIu64", axe id %"PRIu64"\n", input.c_version, g_axe_id); #endif @@ -9153,7 +9153,7 @@ H5VL_iod_rc_persist(H5RC_t *rc, void **req) status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Read Context Persist, version %"PRIu64", axe id %"PRIu64"\n", input.c_version, g_axe_id); #endif @@ -9197,7 +9197,7 @@ H5VL_iod_rc_snapshot(H5RC_t *rc, const char *snapshot_name, void **req) status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Read Context Snapshot, version %"PRIu64", axe id %"PRIu64"\n", input.c_version, g_axe_id); #endif @@ -9239,7 +9239,7 @@ H5VL_iod_tr_start(H5TR_t *tr, hid_t trspl_id, void **req) input.trans_num = tr->trans_num; input.trspl_id = trspl_id; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Transaction start, number %"PRIu64", axe id %"PRIu64"\n", input.trans_num, g_axe_id); #endif @@ -9373,7 +9373,7 @@ H5VL_iod_tr_finish(H5TR_t *tr, hbool_t acquire, hid_t trfpl_id, void **req) status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Transaction Finish, %"PRIu64", axe id %"PRIu64"\n", input.trans_num, g_axe_id); #endif @@ -9430,7 +9430,7 @@ H5VL_iod_tr_set_dependency(H5TR_t *tr, uint64_t trans_num, void **req) input.child_trans_num = tr->trans_num; input.parent_trans_num = trans_num; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Transaction Set Dependency, %"PRIu64" on %"PRIu64" axe id %"PRIu64"\n", input.child_trans_num, input.parent_trans_num, g_axe_id); #endif @@ -9475,7 +9475,7 @@ H5VL_iod_tr_skip(H5VL_iod_file_t *file, uint64_t start_trans_num, uint64_t count input.start_trans_num = start_trans_num; input.count = count; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Transaction Skip, tr %"PRIu64" count %"PRIu64",, axe id %"PRIu64"\n", input.start_trans_num, input.count, g_axe_id); #endif @@ -9575,7 +9575,7 @@ H5VL_iod_tr_abort(H5TR_t *tr, void **req) status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Transaction Abort, tr %"PRIu64", axe id %"PRIu64"\n", input.trans_num, g_axe_id); #endif @@ -9695,7 +9695,7 @@ H5VL_iod_prefetch(void *_obj, hid_t rcxt_id, hrpl_t *replica_id, hid_t apl_id, v HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "not a valid object to prefetch"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Prefetch object %"PRIx64" at tr %"PRIu64" axe id %"PRIu64"\n", input.iod_id, input.rcxt_num, g_axe_id); #endif @@ -9816,7 +9816,7 @@ H5VL_iod_evict(void *_obj, uint64_t c_version, hid_t apl_id, void **req) status = (int *)malloc(sizeof(int)); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Evict object %"PRIx64" at tr %"PRIu64" axe id %"PRIu64"\n", input.iod_id, input.rcxt_num, g_axe_id); #endif @@ -10128,7 +10128,7 @@ H5VL_iod_view_create(void *_obj, hid_t query_id, hid_t dataspace_id, if((view->vcpl_id = H5Pcopy(vcpl_id)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "failed to copy vcpl"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("View Create at IOD ID %"PRIu64", axe id %"PRIu64"\n", iod_id, g_axe_id); #endif @@ -10261,7 +10261,7 @@ H5VL_iod_dataset_set_index(void *dset, void *idx_handle) HDassert(dset); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Index handle set to dataset\n"); #endif @@ -10406,7 +10406,7 @@ H5VL_iod_dataset_set_index_info(void *_dset, unsigned plugin_id, input.idx_metadata.buf = metadata; input.idx_metadata.buf_size = metadata_size; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Set index info, axe id %"PRIu64"\n", g_axe_id); #endif @@ -10488,7 +10488,7 @@ H5VL_iod_dataset_get_index_info(void *_dset, size_t *count, info->metadata = metadata; info->output = output; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Get index info, axe id %"PRIu64"\n", g_axe_id); #endif @@ -10553,7 +10553,7 @@ H5VL_iod_dataset_remove_index_info(void *_dset, hid_t trans_id, void **req) input.trans_num = tr->trans_num; input.cs_scope = dset->common.file->md_integrity_scope; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Remove index info, axe id %"PRIu64"\n", g_axe_id); #endif diff --git a/src/H5VLiod_attr.c b/src/H5VLiod_attr.c index f53fca0..4def209 100644 --- a/src/H5VLiod_attr.c +++ b/src/H5VLiod_attr.c @@ -72,7 +72,7 @@ H5VL_iod_server_attr_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start attribute create %s at %"PRIu64" with ID %"PRIx64" %"PRIx64"\n", attr_name, loc_handle.wr_oh.cookie, attr_id, loc_attrkv_id); #endif @@ -201,7 +201,7 @@ H5VL_iod_server_attr_create_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = attr_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = attr_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr create, sending response to client\n"); #endif @@ -300,7 +300,7 @@ H5VL_iod_server_attr_open_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start attribute open %s at %s (OH %"PRIu64" ID %"PRIx64")\n", attr_name, loc_name, loc_handle.rd_oh.cookie, loc_id); #endif @@ -310,7 +310,7 @@ H5VL_iod_server_attr_open_cb(AXE_engine_t UNUSED axe_engine, rtid, cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Attribute is on object (OH %"PRIu64" ID %"PRIx64")\n", obj_oh.rd_oh.cookie, obj_id); #endif @@ -398,7 +398,7 @@ H5VL_iod_server_attr_open_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = attr_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = attr_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr open, sending response to client\n"); #endif @@ -476,7 +476,7 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, opened_locally = TRUE; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Attribute Read on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.cookie, iod_id); #endif @@ -576,7 +576,7 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "Failed to wait on Mercury Bulk data write"); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr read, sending response to client\n"); #endif @@ -663,7 +663,7 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, opened_locally = TRUE; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Attribute Write on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.cookie, iod_id); #endif @@ -755,7 +755,7 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, } done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr write, sending %d response to client\n", ret_value); #endif @@ -823,7 +823,7 @@ H5VL_iod_server_attr_exists_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start attribute Exists %s/%s on CV %d\n", loc_name, attr_name, (int)rtid); #endif @@ -877,7 +877,7 @@ H5VL_iod_server_attr_exists_cb(AXE_engine_t UNUSED axe_engine, iod_obj_close(attr_kv_oh, NULL, NULL); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr exists, sending %d to client\n", ret); #endif @@ -934,7 +934,7 @@ H5VL_iod_server_attr_rename_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start attribute Rename %s to %s\n", old_name, new_name); #endif @@ -1008,7 +1008,7 @@ H5VL_iod_server_attr_rename_cb(AXE_engine_t UNUSED axe_engine, done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr rename, sending response to client\n"); #endif @@ -1066,7 +1066,7 @@ H5VL_iod_server_attr_remove_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start attribute Remove %s\n", attr_name); #endif @@ -1164,7 +1164,7 @@ H5VL_iod_server_attr_remove_cb(AXE_engine_t UNUSED axe_engine, } done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr remove, sending response to client\n"); #endif @@ -1222,7 +1222,7 @@ H5VL_iod_server_attr_close_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start attribute Close %"PRIu64" %"PRIu64"\n", iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie); #endif @@ -1233,7 +1233,7 @@ H5VL_iod_server_attr_close_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with attr close, sending response to client\n"); #endif diff --git a/src/H5VLiod_client.c b/src/H5VLiod_client.c index b9c2974..8df44c8 100644 --- a/src/H5VLiod_client.c +++ b/src/H5VLiod_client.c @@ -3005,7 +3005,7 @@ H5VL_iod_get_parent_info(H5VL_iod_object_t *obj, H5VL_loc_params_t loc_params, } } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG printf("Found %s Locally\n", comp); #endif diff --git a/src/H5VLiod_common.h b/src/H5VLiod_common.h index 16b2ea5..647a8f4 100644 --- a/src/H5VLiod_common.h +++ b/src/H5VLiod_common.h @@ -30,7 +30,7 @@ #define IOD_OH_UNDEFINED ((uint64_t)0)//(pow(2.0,64.0) - 1) #define IOD_ID_UNDEFINED ((uint64_t)(-1))//(pow(2.0,64.0) - 1) #define IOD_COUNT_UNDEFINED ((uint64_t)(-1))//(pow(2.0,64.0) - 1) -#define H5VL_IOD_DEBUG 1 +#define H5_EFF_DEBUG 1 /* Structure for a span of fixed-length data in a type */ typedef struct H5VL_iod_fl_span_t { diff --git a/src/H5VLiod_dset.c b/src/H5VLiod_dset.c index a249955..507a079 100644 --- a/src/H5VLiod_dset.c +++ b/src/H5VLiod_dset.c @@ -146,7 +146,7 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG if(name) fprintf(stderr, "Start dataset create %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie); else @@ -176,7 +176,7 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine, cur_id = loc_id; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Creating Dataset ID %"PRIx64" (CV %"PRIu64", TR %"PRIu64") ", dset_id, rtid, wtid); fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); @@ -227,7 +227,7 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine, /* MSC - Add chunking support */ array.chunk_dims = NULL; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "now creating the dataset with cellsize %d num dimensions %d\n", array.cell_size, array.num_dims); #endif @@ -325,7 +325,7 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = dset_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = dset_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dset create, sending response to client\n"); #endif @@ -410,7 +410,7 @@ H5VL_iod_server_dset_open_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset open %s at (OH %"PRIu64" ID %"PRIx64")\n", name, loc_handle.rd_oh.cookie, loc_id); #endif @@ -463,7 +463,7 @@ H5VL_iod_server_dset_open_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = dset_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = dset_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dset open, sending response to client\n"); #endif @@ -551,7 +551,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine, opened_locally = TRUE; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset Read on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.rd_oh.cookie, iod_id); #endif @@ -618,7 +618,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine, /* calculate a checksum for the data to be sent */ cs = H5_checksum_crc64(buf, size); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG else { fprintf(stderr, "NO TRANSFER DATA INTEGRITY CHECKS ON RAW DATA\n"); } @@ -653,7 +653,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine, if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dset read, checksum %016lX, sending response to client\n", cs); #endif done: @@ -775,7 +775,7 @@ H5VL_iod_server_dset_get_vl_size_cb(AXE_engine_t UNUSED axe_engine, /* copy just the size of each VL element into the temp buffer */ for(u=0 ; u<nelmts ; u++) { -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Element %u with BLOB ID %"PRIx64" size %zu\n", u, *((iod_obj_id_t *)buf_ptr),*((size_t *)(buf_ptr+sizeof(iod_obj_id_t)))); #endif @@ -829,7 +829,7 @@ done: if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output)) HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dset get vl size (%zu), sending response to client\n", buf_size); #endif @@ -901,7 +901,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, opened_locally = TRUE; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset Write on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.wr_oh.cookie, iod_id); #endif @@ -1079,7 +1079,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, goto done; } } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG else { fprintf(stderr, "NO TRANSFER DATA INTEGRITY CHECKS ON RAW DATA\n"); } @@ -1118,13 +1118,13 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't write to array object"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dset write, sending %d response to client \n", ret_value); #endif done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG if(ret_value != SUCCEED) fprintf(stderr, "FAILED dset write, sending %d response to client \n", ret_value); #endif @@ -1184,7 +1184,7 @@ H5VL_iod_server_dset_set_extent_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset Set Extent first dim to %zu\n", (iod_size_t)input->dims.size[0]); #endif @@ -1234,7 +1234,7 @@ H5VL_iod_server_dset_set_extent_cb(AXE_engine_t UNUSED axe_engine, } done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dset set_extent, sending response to client\n"); #endif @@ -1280,7 +1280,7 @@ H5VL_iod_server_dset_close_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset Close %"PRIu64" %"PRIu64"\n", iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie); #endif @@ -1291,7 +1291,7 @@ H5VL_iod_server_dset_close_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Write Array object"); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dset close, sending response to client\n"); #endif @@ -1391,7 +1391,7 @@ H5VL__iod_server_final_io(iod_handle_t iod_oh, hid_t space_id, size_t elmt_size, (sizeof(iod_checksum_t), (size_t)num_descriptors))) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate checksum array"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG else { fprintf(stderr, "NO IOD DATA INTEGRITY CHECKS ON RAW DATA\n"); } @@ -1417,7 +1417,7 @@ H5VL__iod_server_final_io(iod_handle_t iod_oh, hid_t space_id, size_t elmt_size, if(write_op && (cs_scope & H5_CHECKSUM_IOD)) cs_list[n] = H5_checksum_crc64(buf_ptr, (size_t)num_bytes); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG for(i=0 ; i<ndims ; i++) { fprintf(stderr, "Dim %d: start %zu stride %zu block %zu count %zu\n", i, (size_t)file_desc->start[i], (size_t)file_desc->stride[i], @@ -1459,7 +1459,7 @@ H5VL__iod_server_final_io(iod_handle_t iod_oh, hid_t space_id, size_t elmt_size, num_bytes = num_elems * elmt_size; checksum = H5_checksum_crc64(buf_ptr, (size_t)num_bytes); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "IOD checksum = %016lX Checksum Computed = %016lX\n", cs_list[n], checksum); #endif @@ -1572,7 +1572,7 @@ H5VL__iod_server_vl_data_read(iod_handle_t coh, AXE_engine_t axe_engine, AXE_tas blob_size = *((size_t *)(vlen_buf_ptr+sizeof(iod_obj_id_t))); vlen_buf_ptr += elmt_size; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Element %zu with BLOB ID %"PRIx64" size %zu\n", u, blob_id, blob_size); #endif @@ -1681,7 +1681,7 @@ H5VL__iod_server_vl_data_write(iod_handle_t coh, iod_obj_id_t iod_id, iod_handle /* Print VL length DATA */ for(u = 0; u < num_segments; u++) { -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Element %zu size %zu \n", u, segments[u].size); #endif buf_size += segments[u].size; @@ -1779,7 +1779,7 @@ H5VL__iod_server_vl_data_write_cb(void UNUSED *elem, hid_t type_id, unsigned ndi hslab.block = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); hslab.count = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Writing VL element # %zu\n", udata->cur_seg); #endif @@ -1802,7 +1802,7 @@ H5VL__iod_server_vl_data_write_cb(void UNUSED *elem, hid_t type_id, unsigned ndi /* if the BLOB exists now, try to open it again */ if(0 == ret || -EEXIST == ret) { if(0 == ret) { -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "created BLOB with ID %"PRIx64"\n", blob_id); #endif created = TRUE; diff --git a/src/H5VLiod_dtype.c b/src/H5VLiod_dtype.c index 1b4398e..c41eec6 100644 --- a/src/H5VLiod_dtype.c +++ b/src/H5VLiod_dtype.c @@ -74,7 +74,7 @@ H5VL_iod_server_dtype_commit_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start datatype commit %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie); #endif @@ -99,7 +99,7 @@ H5VL_iod_server_dtype_commit_cb(AXE_engine_t UNUSED axe_engine, cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Creating Datatype ID %"PRIx64" (CV %"PRIu64", TR %"PRIu64") ", dtype_id, rtid, wtid); fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); @@ -249,7 +249,7 @@ H5VL_iod_server_dtype_commit_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = dtype_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = dtype_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dtype commit, sending response to client\n"); #endif @@ -339,7 +339,7 @@ H5VL_iod_server_dtype_open_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start datatype open %s at (OH %"PRIu64" ID %"PRIx64")\n", name, loc_handle.rd_oh.cookie, loc_id); #endif @@ -416,7 +416,7 @@ H5VL_iod_server_dtype_open_cb(AXE_engine_t UNUSED axe_engine, /* calculate a checksum for the datatype */ dt_cs = H5_checksum_crc64(buf, buf_size); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "IOD BLOB checksum = %016lX Checksum Computed = %016lX\n", blob_cs, dt_cs); #endif @@ -439,7 +439,7 @@ H5VL_iod_server_dtype_open_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = dtype_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = dtype_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dtype open, sending response to client\n"); #endif @@ -499,7 +499,7 @@ H5VL_iod_server_dtype_close_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start datatype Close\n"); #endif @@ -513,7 +513,7 @@ H5VL_iod_server_dtype_close_cb(AXE_engine_t UNUSED axe_engine, if((iod_obj_close(iod_oh.wr_oh, NULL, NULL)) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Write OH"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dtype close, sending response to client\n"); #endif done: diff --git a/src/H5VLiod_file.c b/src/H5VLiod_file.c index ce1b900..113a21d 100644 --- a/src/H5VLiod_file.c +++ b/src/H5VLiod_file.c @@ -67,7 +67,7 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start file create %s ", input->name); fprintf(stderr, "with MDKV %"PRIx64" ", mdkv_id), fprintf(stderr, "with attrKV %"PRIx64"\n", attrkv_id), @@ -264,7 +264,7 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine, output.root_oh.rd_oh = root_oh.rd_oh; output.root_oh.wr_oh = root_oh.wr_oh; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with file create coh: %"PRIu64" root rd: %"PRIu64" wr: %"PRIu64"\n", coh.cookie, root_oh.rd_oh.cookie, root_oh.wr_oh.cookie); #endif @@ -333,7 +333,7 @@ H5VL_iod_server_file_open_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start file open %s %d %d\n", input->name, input->flags, input->fapl_id); #endif @@ -532,7 +532,7 @@ H5VL_iod_server_file_open_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTSET, FAIL, "can't finish transaction 0"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with file open coh: %"PRIu64" root rd: %"PRIu64" wr: %"PRIu64" CV: %"PRIu64"\n", coh.cookie, root_oh.rd_oh.cookie, root_oh.wr_oh.cookie, rtid); #endif @@ -593,7 +593,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start file close\n"); #endif @@ -617,7 +617,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine, if(iod_free_cont_trans_stat(coh, tids) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't free container transaction status object"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "File Close starting transaction %"PRIu64" rcxt %"PRIu64"\n", trans_num, rtid); #endif @@ -727,7 +727,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine, if(ret != 0) HGOTO_ERROR_IOD(ret, FAIL, "can't get number of KV entries"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "NUM entries in OID index KV = %d\n", num_entries); #endif @@ -776,7 +776,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTSET, FAIL, "can't finish transaction"); if(TRUE == input->persist_on_close) { -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Persisting Last TID (%"PRIu64") before closing\n", trans_num); #endif /* persist the last transaction */ @@ -787,7 +787,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine, } } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Closing ROOT Group: R: %"PRIu64" W: %"PRIu64"\n", root_oh.rd_oh.cookie, root_oh.wr_oh.cookie); #endif @@ -798,7 +798,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine, if(iod_obj_close(root_oh.wr_oh, NULL, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTDEC, FAIL, "can't close root object handle"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Closing Container: %"PRIu64"\n", coh.cookie); #endif @@ -809,7 +809,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine, } done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with file close, sending response to client\n"); #endif if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value)) diff --git a/src/H5VLiod_group.c b/src/H5VLiod_group.c index 216c52e..b97e933 100644 --- a/src/H5VLiod_group.c +++ b/src/H5VLiod_group.c @@ -71,7 +71,7 @@ H5VL_iod_server_group_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start group create %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie); #endif @@ -96,7 +96,7 @@ H5VL_iod_server_group_create_cb(AXE_engine_t UNUSED axe_engine, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Creating Group ID %"PRIx64" (CV %"PRIu64", TR %"PRIu64") ", grp_id, rtid, wtid); fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); @@ -184,7 +184,7 @@ H5VL_iod_server_group_create_cb(AXE_engine_t UNUSED axe_engine, &grp_id, cs_scope, NULL, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with group create, sending response to client\n"); #endif @@ -276,7 +276,7 @@ H5VL_iod_server_group_open_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start group open %s at (OH %"PRIu64" ID %"PRIx64")\n", name, loc_handle.rd_oh.cookie, loc_id); #endif @@ -330,7 +330,7 @@ H5VL_iod_server_group_open_cb(AXE_engine_t UNUSED axe_engine, output.mdkv_id = sp[0]; output.attrkv_id = sp[1]; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with group open, sending response to client\n"); #endif @@ -388,7 +388,7 @@ H5VL_iod_server_group_close_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start group close\n"); #endif @@ -403,7 +403,7 @@ H5VL_iod_server_group_close_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with group close, sending response to client\n"); #endif diff --git a/src/H5VLiod_index.c b/src/H5VLiod_index.c index 6edebca..b55aaa3 100644 --- a/src/H5VLiod_index.c +++ b/src/H5VLiod_index.c @@ -57,7 +57,7 @@ H5VL_iod_server_dset_set_index_info_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset set_index_info\n"); #endif @@ -101,7 +101,7 @@ H5VL_iod_server_dset_set_index_info_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in parent"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dataset set_index_info, sending response to client\n"); #endif @@ -156,7 +156,7 @@ H5VL_iod_server_dset_get_index_info_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset get_index_info\n"); #endif @@ -232,7 +232,7 @@ H5VL_iod_server_dset_get_index_info_cb(AXE_engine_t UNUSED axe_engine, printf("Index count is: %d\n", output.idx_count); printf("Plugin ID is: %d\n", output.idx_plugin_id); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dataset get_index_info, sending response to client\n"); #endif @@ -294,7 +294,7 @@ H5VL_iod_server_dset_remove_index_info_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start dataset rm_index_info\n"); #endif @@ -318,7 +318,7 @@ H5VL_iod_server_dset_remove_index_info_cb(AXE_engine_t UNUSED axe_engine, if(iod_kv_unlink_keys(mdkv_oh, wtid, NULL, 1, &kvs, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTDEC, FAIL, "Unable to unlink KV pair"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with dataset rm_index_info, sending response to client\n"); #endif diff --git a/src/H5VLiod_link.c b/src/H5VLiod_link.c index 127861b..7f9f8df 100644 --- a/src/H5VLiod_link.c +++ b/src/H5VLiod_link.c @@ -60,7 +60,7 @@ H5VL_iod_server_link_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Link create\n"); #endif @@ -71,7 +71,7 @@ H5VL_iod_server_link_create_cb(AXE_engine_t UNUSED axe_engine, wtid, rtid, FALSE, cs_scope, &src_last_comp, &src_id, &src_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "new link name = %s\n", src_last_comp); #endif @@ -156,7 +156,7 @@ H5VL_iod_server_link_create_cb(AXE_engine_t UNUSED axe_engine, cs_scope, NULL, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Soft link Value = %s\n", input->link_value); #endif } @@ -174,7 +174,7 @@ H5VL_iod_server_link_create_cb(AXE_engine_t UNUSED axe_engine, } done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with link create, sending response %d to client\n", ret_value); #endif @@ -227,7 +227,7 @@ H5VL_iod_server_link_move_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start link move SRC %s DST %s (%"PRIu64", %"PRIu64") to (%"PRIu64", %"PRIu64")\n", input->src_loc_name, input->dst_loc_name, input->src_loc_oh.wr_oh.cookie, input->src_loc_oh.rd_oh.cookie, @@ -355,7 +355,7 @@ H5VL_iod_server_link_move_cb(AXE_engine_t UNUSED axe_engine, } done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with link move, sending response %d to client\n", ret_value); #endif @@ -412,7 +412,7 @@ H5VL_iod_server_link_exists_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start link Exists for %s on CV %d\n", loc_name, (int)rtid); #endif @@ -461,7 +461,7 @@ done: iod_obj_close(cur_oh.wr_oh, NULL, NULL); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with link exists, sending %d to client\n", ret); #endif @@ -517,7 +517,7 @@ H5VL_iod_server_link_get_info_cb(AXE_engine_t UNUSED axe_engine, cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Link Get_Info on link %s\n", last_comp); #endif @@ -543,7 +543,7 @@ H5VL_iod_server_link_get_info_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "unsuppored link type"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with link get_info, sending response to client\n"); #endif @@ -622,7 +622,7 @@ H5VL_iod_server_link_get_val_cb(AXE_engine_t UNUSED axe_engine, cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Link Get_val on link %s\n", last_comp); #endif @@ -648,7 +648,7 @@ H5VL_iod_server_link_get_val_cb(AXE_engine_t UNUSED axe_engine, HG_Handler_start_output(op_data->hg_handle, &output); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with get link_val, sending (%s) response to client\n", (char *)output.value.val); #endif @@ -727,7 +727,7 @@ H5VL_iod_server_link_remove_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start link Remove %s at (%"PRIu64", %"PRIu64")\n", loc_name, loc_oh.wr_oh.cookie, loc_oh.rd_oh.cookie); #endif @@ -844,7 +844,7 @@ done: step --; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with link remove, sending response %d to client\n", ret_value); #endif diff --git a/src/H5VLiod_map.c b/src/H5VLiod_map.c index 1bc1dde..f247bdc 100644 --- a/src/H5VLiod_map.c +++ b/src/H5VLiod_map.c @@ -75,7 +75,7 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start map create %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie); #endif @@ -101,7 +101,7 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine, cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Creating Map ID %"PRIx64" (CV %"PRIu64", TR %"PRIu64") ", map_id, rtid, wtid); fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); @@ -194,7 +194,7 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine, H5L_TYPE_HARD, &map_id, cs_scope, NULL, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map create, sending response to client\n"); #endif @@ -282,7 +282,7 @@ H5VL_iod_server_map_open_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start map open %s at (OH %"PRIu64" ID %"PRIx64")\n", name, loc_handle.rd_oh.cookie, loc_id); #endif @@ -340,7 +340,7 @@ H5VL_iod_server_map_open_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = map_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = map_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map open, sending response to client\n"); #endif @@ -422,7 +422,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Map Set Key %d on OH %"PRIu64" OID %"PRIx64"\n", *((int *)key.buf), iod_oh.cookie, iod_id); #endif @@ -475,7 +475,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine, goto done; } } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG else { fprintf(stderr, "NO TRANSFER DATA INTEGRITY CHECKS ON RAW DATA\n"); } @@ -490,7 +490,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine, val_size, &val_buf, &val_is_vl_data, &new_val_size) < 0) HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG /* fake debugging */ if(val_is_vl_data) { H5T_class_t dt_class; @@ -563,7 +563,7 @@ done: HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map set, sent %d response to client\n", ret_value); #endif @@ -621,7 +621,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Map Get Key %d on OH %"PRIu64" OID %"PRIx64"\n", *((int *)key.buf), iod_oh.cookie, iod_id); #endif @@ -687,7 +687,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, /* set checksum for the data to be sent */ output.val_cs = kv_cs[1]; } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG else { fprintf(stderr, "NO TRANSFER DATA INTEGRITY CHECKS ON RAW DATA\n"); } @@ -745,7 +745,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, /* calculate a checksum for the data to be sent */ output.val_cs = H5_checksum_crc64(val_buf, val_size); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG else { fprintf(stderr, "NO TRANSFER DATA INTEGRITY CHECKS ON RAW DATA\n"); } @@ -769,7 +769,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map get, sending %d response to client\n", ret_value); #endif @@ -835,7 +835,7 @@ H5VL_iod_server_map_get_count_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start map get_count \n"); #endif @@ -851,7 +851,7 @@ H5VL_iod_server_map_get_count_cb(AXE_engine_t UNUSED axe_engine, output = (hsize_t)num; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map get_count, sending %d response to client\n", ret_value); #endif @@ -917,7 +917,7 @@ H5VL_iod_server_map_exists_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start map exists \n"); #endif @@ -941,7 +941,7 @@ H5VL_iod_server_map_exists_cb(AXE_engine_t UNUSED axe_engine, exists = TRUE; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map exists, sending %d response to client\n", ret_value); #endif @@ -1007,7 +1007,7 @@ H5VL_iod_server_map_delete_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start map delete \n"); #endif @@ -1036,7 +1036,7 @@ H5VL_iod_server_map_delete_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTDEC, FAIL, "Unable to unlink KV pair"); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map delete, sending %d response to client\n", ret_value); #endif @@ -1082,7 +1082,7 @@ H5VL_iod_server_map_close_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start map Close %"PRIu64" %"PRIu64"\n", iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie); #endif @@ -1093,7 +1093,7 @@ H5VL_iod_server_map_close_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with map close, sending response to client\n"); #endif diff --git a/src/H5VLiod_obj.c b/src/H5VLiod_obj.c index ad8dee5..10c464f 100644 --- a/src/H5VLiod_obj.c +++ b/src/H5VLiod_obj.c @@ -55,7 +55,7 @@ H5VL_iod_server_object_open_by_token_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Object Open by token = %"PRIx64"\n", obj_id); #endif @@ -64,7 +64,7 @@ H5VL_iod_server_object_open_by_token_cb(AXE_engine_t UNUSED axe_engine, if (iod_obj_open_write(coh, obj_id, tid, NULL /*hints*/, &obj_oh.wr_oh, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with object open by token, sending response to client\n"); #endif @@ -118,7 +118,7 @@ H5VL_iod_server_object_open_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Object Open on %s (OH %"PRIu64" ID %"PRIx64")\n", input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id); #endif @@ -275,7 +275,7 @@ H5VL_iod_server_object_open_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = obj_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = obj_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with object open, sending response to client\n"); #endif @@ -340,7 +340,7 @@ H5VL_iod_server_object_copy_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start object copy\n"); #endif @@ -483,7 +483,7 @@ H5VL_iod_server_object_copy_cb(AXE_engine_t UNUSED axe_engine, #endif done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with object Copy, sending response to client\n"); #endif @@ -532,7 +532,7 @@ H5VL_iod_server_object_exists_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Object Exists on %s (OH %"PRIu64" ID %"PRIx64")\n", input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id); #endif @@ -555,7 +555,7 @@ H5VL_iod_server_object_exists_cb(AXE_engine_t UNUSED axe_engine, done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Object exists, sending response to client\n"); #endif @@ -608,7 +608,7 @@ H5VL_iod_server_object_get_info_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Object Get Info on %s (OH %"PRIu64" ID %"PRIx64")\n", input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id); #endif @@ -693,7 +693,7 @@ H5VL_iod_server_object_get_info_cb(AXE_engine_t UNUSED axe_engine, iod_obj_close(obj_oh.rd_oh, NULL, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Object get_info, sending response to client\n"); #endif @@ -753,7 +753,7 @@ H5VL_iod_server_object_set_comment_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Object Set comment on %s (OH %"PRIu64" ID %"PRIx64")\n", input->path, input->loc_oh.rd_oh.cookie, input->loc_id); #endif @@ -817,7 +817,7 @@ H5VL_iod_server_object_set_comment_cb(AXE_engine_t UNUSED axe_engine, done: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with set comment, sending response to client\n"); #endif @@ -872,7 +872,7 @@ H5VL_iod_server_object_get_comment_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Object Get comment on %s (OH %"PRIu64" ID %"PRIx64")\n", input->path, input->loc_oh.rd_oh.cookie, input->loc_id); #endif @@ -952,7 +952,7 @@ done: output.ret = ret_value; output.name = comment; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with get comment, sending response to client\n"); #endif @@ -1015,7 +1015,7 @@ H5VL_iod_server_object_open_by_addr_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start Object Open By addr on %"PRIx64"\n", obj_id); #endif @@ -1170,7 +1170,7 @@ H5VL_iod_server_object_open_by_addr_cb(AXE_engine_t UNUSED axe_engine, output.iod_oh.rd_oh.cookie = obj_oh.rd_oh.cookie; output.iod_oh.wr_oh.cookie = obj_oh.wr_oh.cookie; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with object open, sending response to client\n"); #endif diff --git a/src/H5VLiod_trans.c b/src/H5VLiod_trans.c index 14abb74..4cab373 100644 --- a/src/H5VLiod_trans.c +++ b/src/H5VLiod_trans.c @@ -74,7 +74,7 @@ H5VL_iod_server_rcxt_acquire_cb(AXE_engine_t UNUSED axe_engine, switch(acquire_req) { case H5RC_EXACT: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Exact Acquire Read Context %"PRIu64"\n", input->c_version); #endif if((ret = iod_trans_start(coh, &c_version, NULL, 0, IOD_TRANS_R, NULL)) < 0) { @@ -84,7 +84,7 @@ H5VL_iod_server_rcxt_acquire_cb(AXE_engine_t UNUSED axe_engine, acquired_version = c_version; break; case H5RC_LAST: -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Acquire LAST Read Context\n"); #endif c_version = IOD_TID_UNKNOWN; @@ -97,7 +97,7 @@ H5VL_iod_server_rcxt_acquire_cb(AXE_engine_t UNUSED axe_engine, iod_cont_trans_stat_t *tids; uint64_t u; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Next Acquire Read Context %"PRIu64"\n", input->c_version); #endif if(iod_query_cont_trans_stat(coh, &tids, NULL) < 0) @@ -126,7 +126,7 @@ H5VL_iod_server_rcxt_acquire_cb(AXE_engine_t UNUSED axe_engine, iod_cont_trans_stat_t *tids; uint64_t u; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Next Acquire Read Context %"PRIu64"\n", input->c_version); #endif if(iod_query_cont_trans_stat(coh, &tids, NULL) < 0) @@ -166,7 +166,7 @@ H5VL_iod_server_rcxt_acquire_cb(AXE_engine_t UNUSED axe_engine, output.c_version = acquired_version; output.ret = ret_value; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Acquire Read Context. Acquired %"PRIu64"\n", output.c_version); #endif @@ -214,7 +214,7 @@ H5VL_iod_server_rcxt_release_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Release Read Context %"PRIu64"\n", input->c_version); #endif @@ -264,7 +264,7 @@ H5VL_iod_server_rcxt_persist_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Persist Read Context %"PRIu64"\n", tid); #endif @@ -370,7 +370,7 @@ H5VL_iod_server_rcxt_snapshot_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Snapshot %s with Read Context %"PRIu64"\n", input->snapshot_name, input->c_version); #endif @@ -418,7 +418,7 @@ H5VL_iod_server_trans_start_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Transaction Start %"PRIu64"\n", input->trans_num); #endif @@ -432,7 +432,7 @@ H5VL_iod_server_trans_start_cb(AXE_engine_t UNUSED axe_engine, if(iod_trans_start(coh, &trans_num, NULL, num_peers, IOD_TRANS_W, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTSET, FAIL, "can't start transaction"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Transaction Start\n"); #endif @@ -484,7 +484,7 @@ H5VL_iod_server_trans_finish_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Transaction Finish %"PRIu64"\n", trans_num); #endif @@ -534,7 +534,7 @@ H5VL_iod_server_trans_finish_cb(AXE_engine_t UNUSED axe_engine, /* if the flag is true, acquire a read context on the finished transaction */ if(TRUE == acquire) { -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Transaction Acquire after Finish %"PRIu64"\n", trans_num); #endif @@ -542,7 +542,7 @@ H5VL_iod_server_trans_finish_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't acquire read context"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Transaction Finish\n"); #endif @@ -588,7 +588,7 @@ H5VL_iod_server_trans_set_dependency_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Transaction Set_Dependency %"PRIu64" on %"PRIu64"\n", input->child_trans_num, input->parent_trans_num); #endif @@ -598,7 +598,7 @@ H5VL_iod_server_trans_set_dependency_cb(AXE_engine_t UNUSED axe_engine, //if(iod_trans_depend(coh, depends, NULL) < 0) //HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set dependency between transactions"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Transaction Set_Dependency\n"); #endif @@ -642,7 +642,7 @@ H5VL_iod_server_trans_skip_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Transaction Skip %"PRIu64" starting at %"PRIu64"\n", count, start_trans_num); #endif @@ -651,7 +651,7 @@ H5VL_iod_server_trans_skip_cb(AXE_engine_t UNUSED axe_engine, //if(iod_trans_skip(coh, skip_ranges, NULL) < 0) //HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't skip transactions"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Transaction Skip\n"); #endif @@ -694,7 +694,7 @@ H5VL_iod_server_trans_abort_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Aborting Transaction %"PRIu64"\n", input->trans_num); #endif @@ -706,7 +706,7 @@ H5VL_iod_server_trans_abort_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTSET, FAIL, "can't abort transaction"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Transaction Abort\n"); #endif @@ -754,7 +754,7 @@ H5VL_iod_server_prefetch_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Prefetch Object (OID %"PRIx64" OH %"PRIu64") at Version %"PRIu64"\n", iod_id, iod_oh.rd_oh.cookie, tid); #endif @@ -765,7 +765,7 @@ H5VL_iod_server_prefetch_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't prefetch object"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Prefetch\n"); #endif @@ -832,7 +832,7 @@ H5VL_iod_server_evict_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't evict object"); } -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Done with Evict\n"); #endif diff --git a/src/H5VLiod_util.c b/src/H5VLiod_util.c index 2930990..35502d8 100644 --- a/src/H5VLiod_util.c +++ b/src/H5VLiod_util.c @@ -500,7 +500,7 @@ H5VL_iod_insert_plist(iod_handle_t oh, iod_trans_id_t tid, hid_t plist_id, cs[0] = H5_checksum_crc64(kv.key, kv.key_len); cs[1] = H5_checksum_crc64(kv.value, kv.value_len); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "PLIST Checksums key = %016lX value = %016lX\n", cs[0], cs[1]); #endif @@ -560,7 +560,7 @@ H5VL_iod_insert_link_count(iod_handle_t oh, iod_trans_id_t tid, uint64_t count, cs[0] = H5_checksum_crc64(kv.key, kv.key_len); cs[1] = H5_checksum_crc64(kv.value, kv.value_len); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Link Count Checksums key = %016lX value = %016lX\n", cs[0], cs[1]); #endif @@ -615,7 +615,7 @@ H5VL_iod_insert_object_type(iod_handle_t oh, iod_trans_id_t tid, H5I_type_t obj_ cs[0] = H5_checksum_crc64(kv.key, kv.key_len); cs[1] = H5_checksum_crc64(kv.value, kv.value_len); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Object Type Checksums key = %016lX value = %016lX\n", cs[0], cs[1]); #endif @@ -682,7 +682,7 @@ H5VL_iod_insert_datatype(iod_handle_t oh, iod_trans_id_t tid, hid_t type_id, cs[0] = H5_checksum_crc64(kv.key, kv.key_len); cs[1] = H5_checksum_crc64(kv.value, kv.value_len); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Datatype Checksums key = %016lX value = %016lX\n", cs[0], cs[1]); #endif @@ -751,7 +751,7 @@ H5VL_iod_insert_datatype_with_key(iod_handle_t oh, iod_trans_id_t tid, hid_t typ cs[0] = H5_checksum_crc64(kv.key, kv.key_len); cs[1] = H5_checksum_crc64(kv.value, kv.value_len); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Map Datatype Checksums key = %016lX value = %016lX\n", cs[0], cs[1]); #endif @@ -819,7 +819,7 @@ H5VL_iod_insert_dataspace(iod_handle_t oh, iod_trans_id_t tid, hid_t space_id, cs[0] = H5_checksum_crc64(kv.key, kv.key_len); cs[1] = H5_checksum_crc64(kv.value, kv.value_len); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Dataspace Checksums key = %016lX value = %016lX\n", cs[0], cs[1]); #endif @@ -912,7 +912,7 @@ H5VL_iod_insert_new_link(iod_handle_t oh, iod_trans_id_t tid, const char *link_n cs[0] = H5_checksum_crc64(kv.key, kv.key_len); cs[1] = H5_checksum_crc64(kv.value, kv.value_len); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Link Type Checksums key = %016lX value = %016lX\n", cs[0], cs[1]); #endif @@ -1084,7 +1084,7 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m cs[0] = H5_checksum_crc64(key, key_size); cs[1] = H5_checksum_crc64(value, val_size); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Key CS iod = %016lX computed = %016lX\n", iod_cs[0], cs[0]); fprintf(stderr, "Value CS iod = %016lX computed = %016lX\n", iod_cs[1], cs[1]); #endif @@ -1164,7 +1164,7 @@ H5VL__iod_server_adjust_buffer(hid_t mem_type_id, hid_t dset_type_id, size_t nel if(NULL == (*buf = realloc(*buf, (size_t)buf_size))) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "Can't adjust buffer for DT conversion"); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Adjusted Buffer size for dt conversion from %zu to %lld\n", size, buf_size); #endif @@ -1234,7 +1234,7 @@ H5VL_iod_verify_kv_pair(void *key, iod_size_t key_size, void *value, iod_size_t cs[0] = H5_checksum_crc64(key, key_size); cs[1] = H5_checksum_crc64(value, val_size); -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Key CS iod = %016lX computed = %016lX\n", iod_cs[0], cs[0]); fprintf(stderr, "Value CS iod = %016lX computed = %016lX\n", iod_cs[1], cs[1]); #endif @@ -1391,7 +1391,7 @@ H5VL_iod_server_iterate(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t rt else oid = value.u.iod_id; -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Iterating into %s OID %"PRIx64"\n", ((char *)kv[i].key), oid); #endif diff --git a/src/H5VLiod_view.c b/src/H5VLiod_view.c index 4383572..58d7e35 100644 --- a/src/H5VLiod_view.c +++ b/src/H5VLiod_view.c @@ -107,7 +107,7 @@ H5VL_iod_server_view_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT -#if H5VL_IOD_DEBUG +#if H5_EFF_DEBUG fprintf(stderr, "Start View create on OID %"PRIx64"\n", loc_id); #endif |