diff options
| -rw-r--r-- | src/H5Dio.c | 2 | ||||
| -rw-r--r-- | src/H5Edefin.h | 7 | ||||
| -rw-r--r-- | src/H5Einit.h | 19 | ||||
| -rw-r--r-- | src/H5Epubgen.h | 10 | ||||
| -rw-r--r-- | src/H5Eterm.h | 7 | ||||
| -rw-r--r-- | src/H5FPserver.c | 8 | ||||
| -rw-r--r-- | src/H5P.c | 18 | ||||
| -rw-r--r-- | src/H5err.txt | 10 |
8 files changed, 36 insertions, 45 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index 62afb22..0875999 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -2419,7 +2419,7 @@ H5D_create_chunk_map(const H5D_t *dataset, const H5T_t *mem_type, const H5S_t *f /* Initialize skip list for chunk selections */ if((fm->fsel=H5SL_create(H5SL_TYPE_HSIZE,0.5,H5D_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_DATASET,H5E_CANTMAKETREE,FAIL,"can't create skip list for chunk selections") + HGOTO_ERROR(H5E_DATASET,H5E_CANTCREATE,FAIL,"can't create skip list for chunk selections") /* Initialize "last chunk" information */ fm->last_index=(hsize_t)-1; diff --git a/src/H5Edefin.h b/src/H5Edefin.h index d911107..e606cb9 100644 --- a/src/H5Edefin.h +++ b/src/H5Edefin.h @@ -37,7 +37,6 @@ hid_t H5E_DATATYPE_g = FAIL; /* Datatype */ hid_t H5E_RS_g = FAIL; /* Reference Counted Strings */ hid_t H5E_HEAP_g = FAIL; /* Heap */ hid_t H5E_OHDR_g = FAIL; /* Object header */ -hid_t H5E_TBBT_g = FAIL; /* Threaded, Balanced, Binary Trees */ hid_t H5E_ATOM_g = FAIL; /* Object atom */ hid_t H5E_ATTR_g = FAIL; /* Attribute */ hid_t H5E_IO_g = FAIL; /* Low-level I/O */ @@ -52,9 +51,6 @@ hid_t H5E_CACHE_g = FAIL; /* Object cache */ /* Minor error IDs */ -/* Threaded, balanced binary tree errors */ -hid_t H5E_CANTMAKETREE_g = FAIL; /* Can't create a binary tree node */ - /* Generic low-level file I/O errors */ hid_t H5E_SEEKERROR_g = FAIL; /* Seek failed */ hid_t H5E_READERROR_g = FAIL; /* Read failed */ @@ -149,6 +145,9 @@ hid_t H5E_CANTUNPROTECT_g = FAIL; /* Unable to unprotect metadata */ hid_t H5E_MPI_g = FAIL; /* Some MPI function failed */ hid_t H5E_MPIERRSTR_g = FAIL; /* MPI Error String */ +/* Block tracker errors */ +hid_t H5E_OVERLAPS_g = FAIL; /* Blocks overlap */ + /* Dataspace errors */ hid_t H5E_CANTCLIP_g = FAIL; /* Can't clip hyperslab region */ hid_t H5E_CANTCOUNT_g = FAIL; /* Can't count elements */ diff --git a/src/H5Einit.h b/src/H5Einit.h index bb8a04d..7471494 100644 --- a/src/H5Einit.h +++ b/src/H5Einit.h @@ -108,11 +108,6 @@ if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -assert(H5E_TBBT_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MAJOR, "Threaded, Balanced, Binary Trees"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_TBBT_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") assert(H5E_ATOM_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") @@ -174,13 +169,6 @@ if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg))<0) /*********************/ -/* Threaded, balanced binary tree errors */ -assert(H5E_CANTMAKETREE_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't create a binary tree node"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_CANTMAKETREE_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") - /* Generic low-level file I/O errors */ assert(H5E_SEEKERROR_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed"))==NULL) @@ -547,6 +535,13 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL) if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +/* Block tracker errors */ +assert(H5E_OVERLAPS_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Blocks overlap"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_OVERLAPS_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") + /* Dataspace errors */ assert(H5E_CANTCLIP_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region"))==NULL) diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h index 773368f..ab39d3e 100644 --- a/src/H5Epubgen.h +++ b/src/H5Epubgen.h @@ -40,7 +40,6 @@ #define H5E_RS (H5OPEN H5E_RS_g) #define H5E_HEAP (H5OPEN H5E_HEAP_g) #define H5E_OHDR (H5OPEN H5E_OHDR_g) -#define H5E_TBBT (H5OPEN H5E_TBBT_g) #define H5E_ATOM (H5OPEN H5E_ATOM_g) #define H5E_ATTR (H5OPEN H5E_ATTR_g) #define H5E_IO (H5OPEN H5E_IO_g) @@ -69,7 +68,6 @@ H5_DLLVAR hid_t H5E_DATATYPE_g; /* Datatype */ H5_DLLVAR hid_t H5E_RS_g; /* Reference Counted Strings */ H5_DLLVAR hid_t H5E_HEAP_g; /* Heap */ H5_DLLVAR hid_t H5E_OHDR_g; /* Object header */ -H5_DLLVAR hid_t H5E_TBBT_g; /* Threaded, Balanced, Binary Trees */ H5_DLLVAR hid_t H5E_ATOM_g; /* Object atom */ H5_DLLVAR hid_t H5E_ATTR_g; /* Attribute */ H5_DLLVAR hid_t H5E_IO_g; /* Low-level I/O */ @@ -86,10 +84,6 @@ H5_DLLVAR hid_t H5E_CACHE_g; /* Object cache */ /* Minor error codes */ /*********************/ -/* Threaded, balanced binary tree errors */ -#define H5E_CANTMAKETREE (H5OPEN H5E_CANTMAKETREE_g) -H5_DLLVAR hid_t H5E_CANTMAKETREE_g; /* Can't create a binary tree node */ - /* Generic low-level file I/O errors */ #define H5E_SEEKERROR (H5OPEN H5E_SEEKERROR_g) #define H5E_READERROR (H5OPEN H5E_READERROR_g) @@ -252,6 +246,10 @@ H5_DLLVAR hid_t H5E_CANTUNPROTECT_g; /* Unable to unprotect metadata */ H5_DLLVAR hid_t H5E_MPI_g; /* Some MPI function failed */ H5_DLLVAR hid_t H5E_MPIERRSTR_g; /* MPI Error String */ +/* Block tracker errors */ +#define H5E_OVERLAPS (H5OPEN H5E_OVERLAPS_g) +H5_DLLVAR hid_t H5E_OVERLAPS_g; /* Blocks overlap */ + /* Dataspace errors */ #define H5E_CANTCLIP (H5OPEN H5E_CANTCLIP_g) #define H5E_CANTCOUNT (H5OPEN H5E_CANTCOUNT_g) diff --git a/src/H5Eterm.h b/src/H5Eterm.h index 6bef264..dad89ab 100644 --- a/src/H5Eterm.h +++ b/src/H5Eterm.h @@ -38,7 +38,6 @@ H5E_DATATYPE_g= H5E_RS_g= H5E_HEAP_g= H5E_OHDR_g= -H5E_TBBT_g= H5E_ATOM_g= H5E_ATTR_g= H5E_IO_g= @@ -54,9 +53,6 @@ H5E_CACHE_g= (-1); /* Reset minor error IDs */ -/* Threaded, balanced binary tree errors */ -H5E_CANTMAKETREE_g= - /* Generic low-level file I/O errors */ H5E_SEEKERROR_g= H5E_READERROR_g= @@ -151,6 +147,9 @@ H5E_CANTUNPROTECT_g= H5E_MPI_g= H5E_MPIERRSTR_g= +/* Block tracker errors */ +H5E_OVERLAPS_g= + /* Dataspace errors */ H5E_CANTCLIP_g= H5E_CANTCOUNT_g= diff --git a/src/H5FPserver.c b/src/H5FPserver.c index 8c12aed..9eee898 100644 --- a/src/H5FPserver.c +++ b/src/H5FPserver.c @@ -194,7 +194,7 @@ H5FP_sap_receive_loop(void) /* Create the file structure tree. */ if ((file_info_list = H5SL_create(H5SL_TYPE_UNSIGNED,0.5,H5FP_DEFAULT_SKIPLIST_HEIGHT)) == NULL) - HGOTO_ERROR(H5E_FPHDF5, H5E_CANTMAKETREE, FAIL, "cannot make skip list") + HGOTO_ERROR(H5E_FPHDF5, H5E_CANTCREATE, FAIL, "cannot make skip list") for (;;) { char *buf = NULL; @@ -969,13 +969,13 @@ H5FP_new_file_info_node(unsigned file_id) if ((ret_value->mod_list = H5SL_create(H5SL_TYPE_HADDR,0.5,H5FP_DEFAULT_SKIPLIST_HEIGHT)) == NULL) { HDfree(ret_value); - HGOTO_ERROR(H5E_FPHDF5, H5E_CANTMAKETREE, NULL, "cannot make skip list") + HGOTO_ERROR(H5E_FPHDF5, H5E_CANTCREATE, NULL, "cannot make skip list") } if ((ret_value->locks = H5SL_create(H5SL_TYPE_HADDR,0.5,H5FP_DEFAULT_SKIPLIST_HEIGHT)) == NULL) { H5SL_close(ret_value->mod_list); HDfree(ret_value); - HGOTO_ERROR(H5E_FPHDF5, H5E_CANTMAKETREE, NULL, "cannot make skip list") + HGOTO_ERROR(H5E_FPHDF5, H5E_CANTCREATE, NULL, "cannot make skip list") } done: @@ -1166,7 +1166,7 @@ H5FP_dump(H5FP_file_info *info, unsigned to, unsigned req_id, unsigned file_id) /* Free up the nodes in the modification list */ if(H5SL_free(info->mod_list, H5FP_free_mod_node_cb, NULL)<0) - HGOTO_ERROR(H5E_FPHDF5, H5E_CANTMAKETREE, FAIL, "cannot make skip list") + HGOTO_ERROR(H5E_FPHDF5, H5E_CANTFREE, FAIL, "cannot free skip list") info->num_mods = 0; @@ -489,11 +489,11 @@ H5P_copy_plist(H5P_genplist_t *old_plist) /* Initialize the skip list to hold the changed properties */ if((new_plist->props=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,FAIL,"can't create skip list for changed properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for changed properties"); /* Create the skip list for deleted properties */ if((new_plist->del=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,FAIL,"can't create skip list for deleted properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for deleted properties"); /* Create the skip list to hold names of properties already seen * (This prevents a property in the class hierarchy from having it's @@ -501,7 +501,7 @@ H5P_copy_plist(H5P_genplist_t *old_plist) * already been seen) */ if((seen=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,FAIL,"can't create skip list for seen properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for seen properties"); nseen=0; /* Cycle through the deleted properties & copy them into the new list's deleted section */ @@ -1363,7 +1363,7 @@ H5P_create_class(H5P_genclass_t *par_class, const char *name, unsigned internal, /* Create the skip list for properties */ if((pclass->props=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,NULL,"can't create skip list for properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,NULL,"can't create skip list for properties"); /* Set callback functions and pass-along data */ pclass->create_func = cls_create; @@ -1527,11 +1527,11 @@ H5P_create(H5P_genclass_t *pclass) /* Create the skip list for changed properties */ if((plist->props=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,NULL,"can't create skip list for changed properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,NULL,"can't create skip list for changed properties"); /* Create the skip list for deleted properties */ if((plist->del=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,NULL,"can't create skip list for deleted properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,NULL,"can't create skip list for deleted properties"); /* Create the skip list to hold names of properties already seen * (This prevents a property in the class hierarchy from having it's @@ -1539,7 +1539,7 @@ H5P_create(H5P_genclass_t *pclass) * already been seen) */ if((seen=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,NULL,"can't create skip list for seen properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,NULL,"can't create skip list for seen properties"); /* * Check if we should copy class properties (up through list of parent classes also), @@ -3954,7 +3954,7 @@ H5P_iterate_plist(hid_t plist_id, int *idx, H5P_iterate_t iter_func, void *iter_ /* Create the skip list to hold names of properties already seen */ if((seen=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,FAIL,"can't create skip list for seen properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for seen properties"); /* Walk through the changed properties in the list */ if(H5SL_count(plist->props)>0) { @@ -5188,7 +5188,7 @@ H5P_close(void *_plist) * already been seen) */ if((seen=H5SL_create(H5SL_TYPE_STR,0.5,H5P_DEFAULT_SKIPLIST_HEIGHT))==NULL) - HGOTO_ERROR(H5E_PLIST,H5E_CANTMAKETREE,FAIL,"can't create skip list for seen properties"); + HGOTO_ERROR(H5E_PLIST,H5E_CANTCREATE,FAIL,"can't create skip list for seen properties"); nseen=0; /* Walk through the changed properties in the list */ diff --git a/src/H5err.txt b/src/H5err.txt index 61bb74c..495bf19 100644 --- a/src/H5err.txt +++ b/src/H5err.txt @@ -66,7 +66,6 @@ MAJOR, H5E_PLINE, Data filters MAJOR, H5E_EFL, External file list MAJOR, H5E_REFERENCE, References MAJOR, H5E_VFL, Virtual File Layer -MAJOR, H5E_TBBT, Threaded, Balanced, Binary Trees MAJOR, H5E_FPHDF5, Flexible Parallel HDF5 MAJOR, H5E_TST, Ternary Search Trees MAJOR, H5E_RS, Reference Counted Strings @@ -90,9 +89,9 @@ SECTION, DSPACE, Dataspace errors SECTION, PLIST, Property list errors SECTION, MPI, Parallel MPI errors SECTION, HEAP, Heap errors -SECTION, TBBT, Threaded, balanced binary tree errors SECTION, FPH5, FPHDF5 errors SECTION, PIPELINE, I/O pipeline errors +SECTION, BLKTRK, Block tracker errors # Minor errors @@ -207,9 +206,6 @@ MINOR, MPI, H5E_MPIERRSTR, MPI Error String # Heap errors MINOR, HEAP, H5E_CANTRESTORE, Can't restore condition -# TBBT errors -MINOR, TBBT, H5E_CANTMAKETREE, Can't create a binary tree node - # FPHDF5 errors MINOR, FPH5, H5E_CANTRECV, Can't receive messages from processes MINOR, FPH5, H5E_CANTSENDMDATA, Can't send metadata message @@ -222,3 +218,7 @@ MINOR, PIPELINE, H5E_CALLBACK, Callback failed MINOR, PIPELINE, H5E_CANAPPLY, Error from filter 'can apply' callback MINOR, PIPELINE, H5E_SETLOCAL, Error from filter 'set local' callback MINOR, PIPELINE, H5E_NOENCODER, Filter present but encoding disabled + +# Block tracker errors +MINOR, BLKTRK, H5E_OVERLAPS, Blocks overlap + |