diff options
| -rw-r--r-- | src/H5FDcore.c | 48 | ||||
| -rw-r--r-- | test/earray.c | 88 |
2 files changed, 69 insertions, 67 deletions
diff --git a/src/H5FDcore.c b/src/H5FDcore.c index cda7308..d2608d0 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -137,7 +137,7 @@ static const H5FD_class_t H5FD_core_g = { H5FD_FLMAP_SINGLE /*fl_map */ }; - + /*-------------------------------------------------------------------------- NAME H5FD_core_init_interface -- Initialize interface-specific information @@ -159,7 +159,7 @@ H5FD_core_init_interface(void) FUNC_LEAVE_NOAPI(H5FD_core_init()) } /* H5FD_core_init_interface() */ - + /*------------------------------------------------------------------------- * Function: H5FD_core_init * @@ -194,7 +194,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*--------------------------------------------------------------------------- * Function: H5FD_core_term * @@ -220,7 +220,7 @@ H5FD_core_term(void) FUNC_LEAVE_NOAPI_VOID } /* end H5FD_core_term() */ - + /*------------------------------------------------------------------------- * Function: H5Pset_fapl_core * @@ -267,7 +267,7 @@ done: FUNC_LEAVE_API(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5Pget_fapl_core * @@ -317,7 +317,7 @@ done: FUNC_LEAVE_API(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_fapl_get * @@ -356,7 +356,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_open * @@ -378,6 +378,9 @@ done: * Raymond Lu, 2006-11-30 * Enabled the driver to read an existing file depending on * the setting of the backing_store and file open flags. + * + * Allen Byrne, 2008-1-23 + * changed if of fapl_id to assert *------------------------------------------------------------------------- */ static H5FD_t * @@ -401,11 +404,10 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr") if(ADDR_OVERFLOW(maxaddr)) HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "maxaddr overflow") - if(H5P_DEFAULT != fapl_id) { - if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list") - fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist); - } /* end if */ + assert(H5P_DEFAULT != fapl_id); + if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list") + fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist); /* Build the open flags */ o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY; @@ -469,7 +471,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_close * @@ -510,7 +512,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_cmp * @@ -559,7 +561,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_query * @@ -595,7 +597,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5FD_core_query() */ - + /*------------------------------------------------------------------------- * Function: H5FD_core_get_eoa * @@ -633,7 +635,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_set_eoa * @@ -672,7 +674,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5FD_core_set_eoa() */ - + /*------------------------------------------------------------------------- * Function: H5FD_core_get_eof * @@ -709,7 +711,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_get_handle * @@ -742,7 +744,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_read * @@ -810,7 +812,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_write * @@ -882,7 +884,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5FD_core_write() */ - + /*------------------------------------------------------------------------- * Function: H5FD_core_flush * @@ -938,7 +940,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } - + /*------------------------------------------------------------------------- * Function: H5FD_core_truncate * diff --git a/test/earray.c b/test/earray.c index c80352d..2b51fe2 100644 --- a/test/earray.c +++ b/test/earray.c @@ -111,7 +111,7 @@ typedef struct earray_iter_t { void *(*init)(const H5EA_create_t *cparam, const earray_test_param_t *tparam, hsize_t cnt); /* Initialize/allocate iterator private info */ hssize_t (*next)(void *info); /* Get the next element to test */ - hssize_t (*max)(const void *info); /* Get the max. element set */ + hssize_t (*max_elem)(const void *info); /* Get the max. element set */ int (*state)(void *_eiter, const H5EA_create_t *cparam, const earray_test_param_t *tparam, earray_state_t *state, hsize_t idx); /* Get the state of the extensible array */ herr_t (*term)(void *info); /* Shutdown/free iterator private info */ @@ -143,7 +143,7 @@ h5_stat_size_t empty_size_g; /* Local prototypes */ - + /*------------------------------------------------------------------------- * Function: init_cparam * @@ -175,7 +175,7 @@ init_cparam(H5EA_create_t *cparam) return(0); } /* init_cparam() */ - + /*------------------------------------------------------------------------- * Function: init_tparam * @@ -225,7 +225,7 @@ init_tparam(earray_test_param_t *tparam, const H5EA_create_t *cparam) return(0); } /* init_tparam() */ - + /*------------------------------------------------------------------------- * Function: finish_tparam * @@ -249,7 +249,7 @@ finish_tparam(earray_test_param_t *tparam) return(0); } /* finish_tparam() */ - + /*------------------------------------------------------------------------- * Function: create_file * @@ -281,7 +281,7 @@ error: return(-1); } /* create_file() */ - + /*------------------------------------------------------------------------- * Function: check_stats * @@ -329,7 +329,7 @@ error: return(-1); } /* check_stats() */ - + /*------------------------------------------------------------------------- * Function: reopen_file * @@ -386,7 +386,7 @@ error: return(-1); } /* reopen_file() */ - + /*------------------------------------------------------------------------- * Function: create_array * @@ -432,7 +432,7 @@ error: return(-1); } /* create_array() */ - + /*------------------------------------------------------------------------- * Function: verify_cparam * @@ -467,7 +467,7 @@ error: return(-1); } /* verify_cparam() */ - + /*------------------------------------------------------------------------- * Function: finish * @@ -521,7 +521,7 @@ error: return(-1); } /* finish() */ - + /*------------------------------------------------------------------------- * Function: test_create * @@ -743,7 +743,7 @@ error: return 1; } /* end test_create() */ - + /*------------------------------------------------------------------------- * Function: test_reopen * @@ -813,7 +813,7 @@ error: return 1; } /* test_reopen() */ - + /*------------------------------------------------------------------------- * Function: test_open_twice * @@ -920,7 +920,7 @@ error: return 1; } /* test_open_twice() */ - + /*------------------------------------------------------------------------- * Function: test_delete_open * @@ -1044,7 +1044,7 @@ typedef struct eiter_fw_t { unsigned base_sblk_idx; /* Starting index for actual superblocks */ } eiter_fw_t; - + /*------------------------------------------------------------------------- * Function: eiter_fw_init * @@ -1059,7 +1059,7 @@ typedef struct eiter_fw_t { *------------------------------------------------------------------------- */ static void * -eiter_fw_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, +eiter_fw_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, hsize_t UNUSED cnt) { eiter_fw_t *eiter; /* Forward element iteration object */ @@ -1076,7 +1076,7 @@ eiter_fw_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUS return(eiter); } /* end eiter_fw_init() */ - + /*------------------------------------------------------------------------- * Function: eiter_fw_next * @@ -1105,7 +1105,7 @@ eiter_fw_next(void *_eiter) return(ret_val); } /* end eiter_fw_next() */ - + /*------------------------------------------------------------------------- * Function: eiter_fw_max * @@ -1131,7 +1131,7 @@ eiter_fw_max(const void *_eiter) return((hssize_t)(eiter->idx - 1)); } /* end eiter_fw_max() */ - + /*------------------------------------------------------------------------- * Function: eiter_fw_state * @@ -1201,7 +1201,7 @@ HDfprintf(stderr, "state->nsuper_blks = %Hu\n", state->nsuper_blks); return(0); } /* end eiter_fw_state() */ - + /*------------------------------------------------------------------------- * Function: eiter_fw_term * @@ -1246,7 +1246,7 @@ typedef struct eiter_rv_t { hsize_t idx_blk_nsblks; /* Number of superblocks directly pointed to in the index block */ } eiter_rv_t; - + /*------------------------------------------------------------------------- * Function: eiter_rv_init * @@ -1261,7 +1261,7 @@ typedef struct eiter_rv_t { *------------------------------------------------------------------------- */ static void * -eiter_rv_init(const H5EA_create_t *cparam, const earray_test_param_t *tparam, +eiter_rv_init(const H5EA_create_t *cparam, const earray_test_param_t *tparam, hsize_t cnt) { eiter_rv_t *eiter; /* Reverse element iteration object */ @@ -1290,7 +1290,7 @@ eiter_rv_init(const H5EA_create_t *cparam, const earray_test_param_t *tparam, return(eiter); } /* end eiter_rv_init() */ - + /*------------------------------------------------------------------------- * Function: eiter_rv_next * @@ -1319,7 +1319,7 @@ eiter_rv_next(void *_eiter) return(ret_val); } /* end eiter_rv_next() */ - + /*------------------------------------------------------------------------- * Function: eiter_rv_max * @@ -1345,7 +1345,7 @@ eiter_rv_max(const void *_eiter) return((hssize_t)eiter->max); } /* end eiter_rv_max() */ - + /*------------------------------------------------------------------------- * Function: eiter_rv_state * @@ -1440,7 +1440,7 @@ HDfprintf(stderr, "eiter->idx_blk_nsblks = %Hu, state->nsuper_blks = %Hu\n", eit return(0); } /* end eiter_rv_state() */ - + /*------------------------------------------------------------------------- * Function: eiter_rv_term * @@ -1482,7 +1482,7 @@ typedef struct eiter_rnd_t { hsize_t *idx; /* Array of shuffled indices */ } eiter_rnd_t; - + /*------------------------------------------------------------------------- * Function: eiter_rnd_init * @@ -1497,7 +1497,7 @@ typedef struct eiter_rnd_t { *------------------------------------------------------------------------- */ static void * -eiter_rnd_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, +eiter_rnd_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, hsize_t cnt) { eiter_rnd_t *eiter; /* Random element iteration object */ @@ -1534,7 +1534,7 @@ eiter_rnd_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNU return(eiter); } /* end eiter_rnd_init() */ - + /*------------------------------------------------------------------------- * Function: eiter_rnd_next * @@ -1568,7 +1568,7 @@ eiter_rnd_next(void *_eiter) return(ret_val); } /* end eiter_rnd_next() */ - + /*------------------------------------------------------------------------- * Function: eiter_rnd_max * @@ -1594,7 +1594,7 @@ eiter_rnd_max(const void *_eiter) return((hssize_t)eiter->max); } /* end eiter_rnd_max() */ - + /*------------------------------------------------------------------------- * Function: eiter_rnd_term * @@ -1635,7 +1635,7 @@ static const earray_iter_t ea_iter_rnd = { eiter_rnd_term /* Iterator term */ }; - + /*------------------------------------------------------------------------- * Function: eiter_rnd2_init * @@ -1650,7 +1650,7 @@ static const earray_iter_t ea_iter_rnd = { *------------------------------------------------------------------------- */ static void * -eiter_rnd2_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, +eiter_rnd2_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, hsize_t cnt) { eiter_rnd_t *eiter; /* Random element iteration object */ @@ -1719,7 +1719,7 @@ typedef struct eiter_cyc_t { hsize_t cyc; /* Cycle of elements to choose from */ } eiter_cyc_t; - + /*------------------------------------------------------------------------- * Function: eiter_cyc_init * @@ -1734,7 +1734,7 @@ typedef struct eiter_cyc_t { *------------------------------------------------------------------------- */ static void * -eiter_cyc_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, +eiter_cyc_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam, hsize_t cnt) { eiter_cyc_t *eiter; /* Cyclic element iteration object */ @@ -1753,7 +1753,7 @@ eiter_cyc_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNU return(eiter); } /* end eiter_cyc_init() */ - + /*------------------------------------------------------------------------- * Function: eiter_cyc_next * @@ -1789,7 +1789,7 @@ eiter_cyc_next(void *_eiter) return(ret_val); } /* end eiter_cyc_next() */ - + /*------------------------------------------------------------------------- * Function: eiter_cyc_max * @@ -1815,7 +1815,7 @@ eiter_cyc_max(const void *_eiter) return((hssize_t)eiter->max); } /* end eiter_cyc_max() */ - + /*------------------------------------------------------------------------- * Function: eiter_cyc_term * @@ -1852,7 +1852,7 @@ static const earray_iter_t ea_iter_cyc = { eiter_cyc_term /* Iterator term */ }; - + /*------------------------------------------------------------------------- * Function: test_set_elmts * @@ -1974,7 +1974,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, FAIL_STACK_ERROR /* Get the max. array index */ - if((smax = tparam->eiter->max(eiter_info)) < 0) + if((smax = tparam->eiter->max_elem(eiter_info)) < 0) TEST_ERROR max = (hsize_t)smax; @@ -2029,7 +2029,7 @@ error: return 1; } /* test_set_elmts() */ - + /*------------------------------------------------------------------------- * Function: test_skip_elmts * @@ -2182,7 +2182,7 @@ error: return 1; } /* test_skip_elmts() */ - + /*------------------------------------------------------------------------- * Function: main * @@ -2328,14 +2328,14 @@ main(void) for(sblk = 0; sblk < 9; sblk++) { for(dblk = 0; dblk < tparam.sblk_info[sblk].ndblks; dblk ++) { /* Test first element in data block */ - nelmts = (hsize_t)(1 + cparam.idx_blk_elmts + + nelmts = (hsize_t)(1 + cparam.idx_blk_elmts + tparam.sblk_info[sblk].start_idx + (tparam.sblk_info[sblk].dblk_nelmts * dblk)); sprintf(test_str, "setting first element of array's data block #%llu", (unsigned long_long)ndblks); nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str); /* Test all elements in data block */ - nelmts = (hsize_t)(cparam.idx_blk_elmts + + nelmts = (hsize_t)(cparam.idx_blk_elmts + tparam.sblk_info[sblk].start_idx + (tparam.sblk_info[sblk].dblk_nelmts * (dblk + 1))); sprintf(test_str, "setting all elements of array's data block #%llu", (unsigned long_long)ndblks); |