diff options
| -rw-r--r-- | src/H5BT.c | 48 | ||||
| -rw-r--r-- | src/H5BTprivate.h | 1 | ||||
| -rw-r--r-- | test/blocktrack.c | 134 |
3 files changed, 183 insertions, 0 deletions
@@ -645,3 +645,51 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5BT_remove() */ + +/*------------------------------------------------------------------------- + * Function: H5BT_delete + * + * Purpose: Delete a block tracker from a file + * + * Return: Non-negative on success, negative on failure + * + * Programmer: Quincey Koziol + * koziol@ncsa.uiuc.edu + * Mar 14 2005 + * + *------------------------------------------------------------------------- + */ +herr_t +H5BT_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr) +{ + H5BT_t *bt = NULL; /* The new B-tree header information */ + herr_t ret_value=SUCCEED; + + FUNC_ENTER_NOAPI(H5BT_delete, FAIL) + + /* + * Check arguments. + */ + HDassert(f); + HDassert(H5F_addr_defined(addr)); + + /* Look up the block tracker header */ + if (NULL == (bt = H5AC_protect(f, dxpl_id, H5AC_BLTR, addr, NULL, NULL, H5AC_WRITE))) + HGOTO_ERROR(H5E_BLKTRK, H5E_CANTPROTECT, FAIL, "unable to load block tracker info") + + /* Delete B-tree */ + if (H5B2_delete(f, dxpl_id, H5B2_BLKTRK, bt->bt2_addr) < 0) + HGOTO_ERROR(H5E_BLKTRK, H5E_CANTDELETE, FAIL, "Couldn't delete underlying B-tree") + + /* Release space for block tracker info on disk */ + if (H5MF_xfree(f, H5FD_MEM_BLKTRK, dxpl_id, addr, (hsize_t)H5BT_SIZE(f))<0) + HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free block tracker info") + +done: + /* Release the block tracker info */ + if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BLTR, addr, bt, H5AC__DELETED_FLAG) < 0) + HDONE_ERROR(H5E_BLKTRK, H5E_CANTUNPROTECT, FAIL, "unable to release block tracker info") + + FUNC_LEAVE_NOAPI(ret_value) +} /* end H5BT_remove() */ + diff --git a/src/H5BTprivate.h b/src/H5BTprivate.h index 48d5384..b98aac1 100644 --- a/src/H5BTprivate.h +++ b/src/H5BTprivate.h @@ -52,6 +52,7 @@ H5_DLL herr_t H5BT_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, haddr_t offset, hsize_t length); H5_DLL herr_t H5BT_get_total_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *tot_size); +H5_DLL herr_t H5BT_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr); #endif /* _H5BTprivate_H */ diff --git a/test/blocktrack.c b/test/blocktrack.c index 04f80d9..99586b0 100644 --- a/test/blocktrack.c +++ b/test/blocktrack.c @@ -1430,6 +1430,137 @@ error: /*------------------------------------------------------------------------- + * Function: test_delete + * + * Purpose: Basic tests for the block tracker code + * + * Return: Success: 0 + * + * Failure: 1 + * + * Programmer: Quincey Koziol + * Monday, March 14, 2005 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +static int +test_delete(hid_t fapl) +{ + hid_t file=-1; + char filename[1024]; + H5F_t *f=NULL; + off_t empty_size; /* Size of an empty file */ + off_t file_size; /* Size of each file created */ + haddr_t bt_addr; /* Address of block tracker created */ + unsigned u; /* Local index variable */ + + h5_fixname(FILENAME[0], fapl, filename, sizeof filename); + +/* Create empty file for size comparisons later */ + + /* Create the file to work on */ + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + + /* Close file */ + if(H5Fclose(file)<0) TEST_ERROR; + + /* Get the size of an empty file */ + if((empty_size=h5_get_file_size(filename))==0) TEST_ERROR; + + TESTING("delete: delete empty block tracker"); + + /* Create the file to work on */ + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + + /* Get a pointer to the internal file object */ + if (NULL==(f=H5I_object(file))) { + H5Eprint_stack(H5E_DEFAULT, stdout); + TEST_ERROR; + } /* end if */ + + if (H5BT_create(f, H5P_DATASET_XFER_DEFAULT, &bt_addr/*out*/)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + /* + * Delete block tracker + */ + if (H5BT_delete(f, H5P_DATASET_XFER_DEFAULT, bt_addr)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5Fclose(file)<0) TEST_ERROR; + + /* Get the size of the file */ + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + + /* Verify the file is correct size */ + if(file_size!=empty_size) TEST_ERROR; + + PASSED(); + + TESTING("delete: delete block tracker with many blocks"); + + /* Create the file to work on */ + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + + /* Get a pointer to the internal file object */ + if (NULL==(f=H5I_object(file))) { + H5Eprint_stack(H5E_DEFAULT, stdout); + TEST_ERROR; + } /* end if */ + + if (H5BT_create(f, H5P_DATASET_XFER_DEFAULT, &bt_addr/*out*/)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + /* Insert many blocks */ + for(u = 0; u < INSERT_MANY; u++) { + if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)(u*50), (hsize_t)20)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + } /* end for */ + + /* + * Delete block tracker + */ + if (H5BT_delete(f, H5P_DATASET_XFER_DEFAULT, bt_addr)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5Fclose(file)<0) TEST_ERROR; + + /* Get the size of the file */ + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + + /* Verify the file is correct size */ + if(file_size!=empty_size) TEST_ERROR; + + PASSED(); + + return 0; + +error: + H5E_BEGIN_TRY { + H5Fclose(file); + } H5E_END_TRY; + return 1; +} /* test_delete() */ + + +/*------------------------------------------------------------------------- * Function: main * * Purpose: Test the block tracker code @@ -1469,6 +1600,9 @@ main(void) nerrors += test_remove_whole(fapl); nerrors += test_remove_partial_begin(fapl); + /* Test block tracker deletion */ + nerrors += test_delete(fapl); + if (nerrors) goto error; puts("All block tracker tests passed."); #ifndef QAK |