mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-19 16:50:46 +08:00
[svn-r9764] Purpose:
New feature
Description:
Add some additional features to the skip list code that was needed to
fully support all the features that the threaded, balanced binary tree code
has.
Also, updated the property list code to take advantage of a few of the
new features.
Platforms tested:
FreeBSD 4.10 (sleipnir)
Too minor to require h5committest
This commit is contained in:
Quincey Koziol
parent
4357fccbd3
commit
e9109df3f2
83
src/H5P.c
83
src/H5P.c
@ -1086,11 +1086,11 @@ H5P_free_prop(H5P_genprop_t *prop)
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5P_free_all_prop_cb
|
||||
H5P_free_prop_cb
|
||||
PURPOSE
|
||||
Internal routine to remove all properties from a property skip list
|
||||
Internal routine to properties from a property skip list
|
||||
USAGE
|
||||
herr_t H5P_free_all_prop_cb(item, key, op_data)
|
||||
herr_t H5P_free_prop_cb(item, key, op_data)
|
||||
void *item; IN/OUT: Pointer to property
|
||||
void *key; IN/OUT: Pointer to property key
|
||||
void *_make_cb; IN: Whether to make property callbacks or not
|
||||
@ -1105,12 +1105,12 @@ H5P_free_prop(H5P_genprop_t *prop)
|
||||
REVISION LOG
|
||||
--------------------------------------------------------------------------*/
|
||||
static herr_t
|
||||
H5P_free_all_prop_cb(void *item, void UNUSED *key, void *op_data)
|
||||
H5P_free_prop_cb(void *item, void UNUSED *key, void *op_data)
|
||||
{
|
||||
H5P_genprop_t *tprop=(H5P_genprop_t *)item; /* Temporary pointer to property */
|
||||
unsigned make_cb=*(unsigned *)op_data; /* Whether to make property 'close' callback */
|
||||
|
||||
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_all_prop_cb);
|
||||
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_prop_cb);
|
||||
|
||||
assert(tprop);
|
||||
|
||||
@ -1122,44 +1122,42 @@ H5P_free_all_prop_cb(void *item, void UNUSED *key, void *op_data)
|
||||
H5P_free_prop(tprop);
|
||||
|
||||
FUNC_LEAVE_NOAPI(0);
|
||||
} /* H5P_free_all_prop_cb() */
|
||||
} /* H5P_free_prop_cb() */
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5P_free_all_prop
|
||||
H5P_free_del_name_cb
|
||||
PURPOSE
|
||||
Internal routine to remove all properties from a property skip list
|
||||
Internal routine to free 'deleted' property name
|
||||
USAGE
|
||||
herr_t H5P_free_all_prop(slist, make_cb)
|
||||
H5SL_t *slist; IN/OUT: Pointer to property skip list
|
||||
unsigned make_cb; IN: Whether to make property callbacks or not
|
||||
herr_t H5P_free_del_name_cb(item, key, op_data)
|
||||
void *item; IN/OUT: Pointer to deleted name
|
||||
void *key; IN/OUT: Pointer to key
|
||||
void *op_data; IN: Operator callback data (unused)
|
||||
RETURNS
|
||||
Returns non-negative on success, negative on failure.
|
||||
Returns zero on success, negative on failure.
|
||||
DESCRIPTION
|
||||
Remove all the properties from a property list. Calls the property
|
||||
'close' callback for each property removed.
|
||||
Frees the deleted property name
|
||||
GLOBAL VARIABLES
|
||||
COMMENTS, BUGS, ASSUMPTIONS
|
||||
EXAMPLES
|
||||
REVISION LOG
|
||||
--------------------------------------------------------------------------*/
|
||||
static herr_t
|
||||
H5P_free_all_prop(H5SL_t *slist,unsigned make_cb)
|
||||
H5P_free_del_name_cb(void *item, void UNUSED *key, void UNUSED *op_data)
|
||||
{
|
||||
herr_t ret_value=SUCCEED; /* Return value */
|
||||
char *del_name=(char *)item; /* Temporary pointer to deleted name */
|
||||
|
||||
FUNC_ENTER_NOAPI_NOINIT(H5P_free_all_prop);
|
||||
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_del_name_cb);
|
||||
|
||||
assert(slist);
|
||||
assert(del_name);
|
||||
|
||||
/* Work through all the properties... */
|
||||
if(H5SL_iterate(slist,H5P_free_all_prop_cb,&make_cb)<0)
|
||||
HGOTO_ERROR(H5E_PLIST,H5E_CANTNEXT,FAIL,"can't iterate over properties");
|
||||
/* Free the name */
|
||||
H5MM_xfree(del_name);
|
||||
|
||||
done:
|
||||
FUNC_LEAVE_NOAPI(ret_value);
|
||||
} /* H5P_free_all_prop() */
|
||||
FUNC_LEAVE_NOAPI(0);
|
||||
} /* H5P_free_del_name_cb() */
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
@ -1237,11 +1235,11 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
|
||||
H5MM_xfree(pclass->name);
|
||||
|
||||
/* Free the class properties without making callbacks */
|
||||
if(pclass->nprops>0)
|
||||
H5P_free_all_prop(pclass->props,0);
|
||||
if(pclass->props) {
|
||||
unsigned make_cb=0;
|
||||
|
||||
/* Free the property skip list itself */
|
||||
H5SL_close(pclass->props);
|
||||
H5SL_destroy(pclass->props,H5P_free_prop_cb,&make_cb);
|
||||
} /* end if */
|
||||
|
||||
H5FL_FREE(H5P_genclass_t,pclass);
|
||||
|
||||
@ -1604,11 +1602,12 @@ done:
|
||||
if(plist!=NULL) {
|
||||
/* Close & free any changed properties */
|
||||
if(plist->props) {
|
||||
H5P_free_all_prop(plist->props,1);
|
||||
H5SL_close(plist->props);
|
||||
unsigned make_cb=1;
|
||||
|
||||
H5SL_destroy(plist->props,H5P_free_prop_cb,&make_cb);
|
||||
} /* end if */
|
||||
|
||||
/* Release the deleted property skip list */
|
||||
/* Close the deleted property skip list */
|
||||
if(plist->del)
|
||||
H5SL_close(plist->del);
|
||||
|
||||
@ -5173,6 +5172,7 @@ H5P_close(void *_plist)
|
||||
ssize_t ndel; /* Number of items deleted */
|
||||
H5SL_node_t *curr_node; /* Current node in skip list */
|
||||
H5P_genprop_t *tmp; /* Temporary pointer to properties */
|
||||
unsigned make_cb=0; /* Operator data for property free callback */
|
||||
herr_t ret_value=SUCCEED; /* return value */
|
||||
|
||||
FUNC_ENTER_NOAPI_NOINIT(H5P_close);
|
||||
@ -5282,27 +5282,10 @@ H5P_close(void *_plist)
|
||||
seen=NULL;
|
||||
|
||||
/* Free the list of deleted property names */
|
||||
curr_node=H5SL_first(plist->del);
|
||||
while(curr_node!=NULL) {
|
||||
char *del_name; /* Pointer to deleted name */
|
||||
|
||||
/* Get pointer to name to free */
|
||||
del_name=H5SL_item(curr_node);
|
||||
|
||||
/* Free deleted property name */
|
||||
H5MM_xfree(del_name);
|
||||
|
||||
/* Go to next deleted property */
|
||||
curr_node=H5SL_next(curr_node);
|
||||
} /* end while */
|
||||
H5SL_close(plist->del);
|
||||
H5SL_destroy(plist->del,H5P_free_del_name_cb,NULL);
|
||||
|
||||
/* Free the properties */
|
||||
if(plist->nprops>0)
|
||||
H5P_free_all_prop(plist->props,0);
|
||||
|
||||
/* Free the property skip list itself */
|
||||
H5SL_close(plist->props);
|
||||
H5SL_destroy(plist->props,H5P_free_prop_cb,&make_cb);
|
||||
|
||||
/* Destroy property list object */
|
||||
H5FL_FREE(H5P_genplist_t,plist);
|
||||
|
||||
853
src/H5SL.c
853
src/H5SL.c
File diff suppressed because it is too large
Load Diff
@ -43,7 +43,8 @@ typedef enum {
|
||||
H5SL_TYPE_INT, /* Skip list keys are 'int's */
|
||||
H5SL_TYPE_HADDR, /* Skip list keys are 'haddr_t's */
|
||||
H5SL_TYPE_STR, /* Skip list keys are 'char *'s (ie. strings) */
|
||||
H5SL_TYPE_HSIZE /* Skip list keys are 'hsize_t's */
|
||||
H5SL_TYPE_HSIZE, /* Skip list keys are 'hsize_t's */
|
||||
H5SL_TYPE_UNSIGNED /* Skip list keys are 'unsigned's */
|
||||
} H5SL_type_t;
|
||||
|
||||
/**********/
|
||||
@ -61,14 +62,21 @@ typedef herr_t (*H5SL_operator_t)(void *item, void *key,
|
||||
H5_DLL H5SL_t *H5SL_create(H5SL_type_t type, double p, size_t max_level);
|
||||
H5_DLL size_t H5SL_count(H5SL_t *slist);
|
||||
H5_DLL herr_t H5SL_insert(H5SL_t *slist, void *item, const void *key);
|
||||
H5_DLL H5SL_node_t *H5SL_add(H5SL_t *slist, void *item, const void *key);
|
||||
H5_DLL void *H5SL_remove(H5SL_t *slist, const void *key);
|
||||
H5_DLL void *H5SL_search(H5SL_t *slist, const void *key);
|
||||
H5_DLL void *H5SL_less(H5SL_t *slist, const void *key);
|
||||
H5_DLL H5SL_node_t *H5SL_find(H5SL_t *slist, const void *key);
|
||||
H5_DLL H5SL_node_t *H5SL_first(H5SL_t *slist);
|
||||
H5_DLL H5SL_node_t *H5SL_next(H5SL_node_t *slist_node);
|
||||
H5_DLL H5SL_node_t *H5SL_prev(H5SL_node_t *slist_node);
|
||||
H5_DLL H5SL_node_t *H5SL_last(H5SL_t *slist);
|
||||
H5_DLL void *H5SL_item(H5SL_node_t *slist_node);
|
||||
H5_DLL herr_t H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data);
|
||||
H5_DLL herr_t H5SL_release(H5SL_t *slist);
|
||||
H5_DLL herr_t H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data);
|
||||
H5_DLL herr_t H5SL_close(H5SL_t *slist);
|
||||
H5_DLL herr_t H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data);
|
||||
|
||||
#endif /* _H5SLprivate_H */
|
||||
|
||||
|
||||
418
test/tskiplist.c
418
test/tskiplist.c
@ -461,7 +461,7 @@ test_skiplist_firstnext(void)
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Iterating Over Skip List\n"));
|
||||
MESSAGE(7, ("Testing Iterating Over Skip List With First/Next\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
|
||||
@ -471,6 +471,10 @@ test_skiplist_firstnext(void)
|
||||
num=H5SL_count(slist);
|
||||
VERIFY(num, 0, "H5SL_count");
|
||||
|
||||
/* Check that the list appears empty */
|
||||
node=H5SL_first(slist);
|
||||
VERIFY(node, NULL, "H5SL_first");
|
||||
|
||||
/* Insert many objects into the skip list */
|
||||
for(u=0; u<NUM_ELEMS; u++) {
|
||||
ret=H5SL_insert(slist,&rand_num[u],&rand_num[u]);
|
||||
@ -483,6 +487,7 @@ test_skiplist_firstnext(void)
|
||||
|
||||
/* Iterate over all the nodes in the skip list */
|
||||
node=H5SL_first(slist);
|
||||
CHECK(node, NULL, "H5SL_first");
|
||||
u=0;
|
||||
while(node!=NULL) {
|
||||
found_item=H5SL_item(node);
|
||||
@ -491,6 +496,14 @@ test_skiplist_firstnext(void)
|
||||
node=H5SL_next(node);
|
||||
} /* end while */
|
||||
|
||||
/* Release all the items from the list */
|
||||
ret=H5SL_release(slist);
|
||||
CHECK(ret, FAIL, "H5SL_release");
|
||||
|
||||
/* Check that the list appears empty again */
|
||||
node=H5SL_first(slist);
|
||||
VERIFY(node, NULL, "H5SL_first");
|
||||
|
||||
/* Close the skip list */
|
||||
ret=H5SL_close(slist);
|
||||
CHECK(ret, FAIL, "H5SL_close");
|
||||
@ -688,6 +701,402 @@ test_skiplist_hsize(void)
|
||||
|
||||
} /* end test_skiplist_hsize() */
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist_unsigned(): Test H5SL (skip list) code.
|
||||
** Tests using unsigned for keys in skip lists.
|
||||
**
|
||||
****************************************************************/
|
||||
static void
|
||||
test_skiplist_unsigned(void)
|
||||
{
|
||||
H5SL_t *slist; /* Skip list created */
|
||||
H5SL_node_t *node; /* Skip list node */
|
||||
size_t num; /* Number of elements in skip list */
|
||||
size_t u; /* Local index variable */
|
||||
unsigned data[10]={ 10, 20, 15, 5, 50, 30, 31, 32, 80, 90};
|
||||
unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90};
|
||||
unsigned *found_item; /* Item found in skip list */
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Skip List With unsigned Keys\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
|
||||
CHECK(slist, NULL, "H5SL_create");
|
||||
|
||||
/* Check that the skip list has no elements */
|
||||
num=H5SL_count(slist);
|
||||
VERIFY(num, 0, "H5SL_count");
|
||||
|
||||
/* Insert objects into the skip list */
|
||||
for(u=0; u<10; u++) {
|
||||
ret=H5SL_insert(slist,&data[u],&data[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Check that the skip list has correct # of elements */
|
||||
num=H5SL_count(slist);
|
||||
VERIFY(num, 10, "H5SL_count");
|
||||
|
||||
/* Iterate over all the nodes in the skip list */
|
||||
node=H5SL_first(slist);
|
||||
u=0;
|
||||
while(node!=NULL) {
|
||||
found_item=H5SL_item(node);
|
||||
VERIFY(*found_item,sorted_data[u],"H5SL_next");
|
||||
u++;
|
||||
node=H5SL_next(node);
|
||||
} /* end while */
|
||||
|
||||
/* Close the skip list */
|
||||
ret=H5SL_close(slist);
|
||||
CHECK(ret, FAIL, "H5SL_close");
|
||||
|
||||
} /* end test_skiplist_unsigned() */
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist_lastprev(): Test H5SL (skip list) code.
|
||||
** Tests iterating over nodes in skip list with last/prev calls.
|
||||
**
|
||||
****************************************************************/
|
||||
static void
|
||||
test_skiplist_lastprev(void)
|
||||
{
|
||||
H5SL_t *slist; /* Skip list created */
|
||||
H5SL_node_t *node; /* Skip list node */
|
||||
size_t num; /* Number of elements in skip list */
|
||||
size_t u; /* Local index variable */
|
||||
int *found_item; /* Item found in skip list */
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Iterating Over Skip List With Last/Prev\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
|
||||
CHECK(slist, NULL, "H5SL_create");
|
||||
|
||||
/* Check that the skip list has no elements */
|
||||
num=H5SL_count(slist);
|
||||
VERIFY(num, 0, "H5SL_count");
|
||||
|
||||
/* Check that the list appears empty */
|
||||
node=H5SL_last(slist);
|
||||
VERIFY(node, NULL, "H5SL_last");
|
||||
|
||||
/* Insert many objects into the skip list */
|
||||
for(u=0; u<NUM_ELEMS; u++) {
|
||||
ret=H5SL_insert(slist,&rand_num[u],&rand_num[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Check that the skip list has correct # of elements */
|
||||
num=H5SL_count(slist);
|
||||
VERIFY(num, NUM_ELEMS, "H5SL_count");
|
||||
|
||||
/* Iterate over all the nodes in the skip list */
|
||||
node=H5SL_last(slist);
|
||||
CHECK(node, NULL, "H5SL_last");
|
||||
u=NUM_ELEMS-1;
|
||||
while(node!=NULL) {
|
||||
found_item=H5SL_item(node);
|
||||
VERIFY(*found_item,sort_rand_num[u],"H5SL_prev");
|
||||
u--;
|
||||
node=H5SL_prev(node);
|
||||
} /* end while */
|
||||
|
||||
/* Release all the items from the list */
|
||||
ret=H5SL_release(slist);
|
||||
CHECK(ret, FAIL, "H5SL_release");
|
||||
|
||||
/* Check that the list appears empty again */
|
||||
node=H5SL_last(slist);
|
||||
VERIFY(node, NULL, "H5SL_last");
|
||||
|
||||
/* Close the skip list */
|
||||
ret=H5SL_close(slist);
|
||||
CHECK(ret, FAIL, "H5SL_close");
|
||||
|
||||
} /* end test_skiplist_lastprev() */
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist_find(): Test H5SL (skip list) code.
|
||||
** Tests 'find' operation in skip lists.
|
||||
**
|
||||
****************************************************************/
|
||||
static void
|
||||
test_skiplist_find(void)
|
||||
{
|
||||
H5SL_t *slist; /* Skip list created */
|
||||
H5SL_node_t *node; /* Skip list node */
|
||||
size_t u; /* Local index variable */
|
||||
unsigned data[10]={ 10, 20, 15, 5, 50, 30, 31, 32, 80, 90};
|
||||
unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90};
|
||||
unsigned *found_item; /* Item found in skip list */
|
||||
unsigned find_item; /* Item to find in skip list */
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Skip List 'Find' Operation\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
|
||||
CHECK(slist, NULL, "H5SL_create");
|
||||
|
||||
/* Insert objects into the skip list */
|
||||
for(u=0; u<10; u++) {
|
||||
ret=H5SL_insert(slist,&data[u],&data[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Find the element with key==30 in the skip list */
|
||||
find_item=30;
|
||||
node=H5SL_find(slist,&find_item);
|
||||
CHECK(node, NULL, "H5SL_find");
|
||||
|
||||
/* Iterate over the rest of the nodes in the skip list */
|
||||
u=4;
|
||||
while(node!=NULL) {
|
||||
found_item=H5SL_item(node);
|
||||
VERIFY(*found_item,sorted_data[u],"H5SL_next");
|
||||
u++;
|
||||
node=H5SL_next(node);
|
||||
} /* end while */
|
||||
|
||||
/* Check for trying to locate non-existent item */
|
||||
find_item=81;
|
||||
node=H5SL_find(slist,&find_item);
|
||||
VERIFY(node, NULL, "H5SL_find");
|
||||
|
||||
/* Close the skip list */
|
||||
ret=H5SL_close(slist);
|
||||
CHECK(ret, FAIL, "H5SL_close");
|
||||
|
||||
} /* end test_skiplist_find() */
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist_add(): Test H5SL (skip list) code.
|
||||
** Tests 'add' operation in skip lists.
|
||||
**
|
||||
****************************************************************/
|
||||
static void
|
||||
test_skiplist_add(void)
|
||||
{
|
||||
H5SL_t *slist; /* Skip list created */
|
||||
H5SL_node_t *node; /* Skip list node */
|
||||
size_t u; /* Local index variable */
|
||||
unsigned data[10]={ 10, 20, 15, 5, 50, 30, 31, 32, 80, 90};
|
||||
unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90};
|
||||
unsigned *found_item; /* Item found in skip list */
|
||||
unsigned new_item; /* Item to add to skip list */
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Skip List 'Add' Operation\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
|
||||
CHECK(slist, NULL, "H5SL_create");
|
||||
|
||||
/* Insert objects into the skip list */
|
||||
for(u=0; u<10; u++) {
|
||||
ret=H5SL_insert(slist,&data[u],&data[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Add the element with key==12 in the skip list */
|
||||
new_item=12;
|
||||
node=H5SL_add(slist,&new_item,&new_item);
|
||||
CHECK(node, NULL, "H5SL_add");
|
||||
|
||||
/* Advance to next node in list */
|
||||
node=H5SL_next(node);
|
||||
CHECK(node, NULL, "H5SL_next");
|
||||
|
||||
/* Iterate over the rest of the nodes in the skip list */
|
||||
u=2;
|
||||
while(node!=NULL) {
|
||||
found_item=H5SL_item(node);
|
||||
VERIFY(*found_item,sorted_data[u],"H5SL_item");
|
||||
u++;
|
||||
node=H5SL_next(node);
|
||||
} /* end while */
|
||||
|
||||
/* Close the skip list */
|
||||
ret=H5SL_close(slist);
|
||||
CHECK(ret, FAIL, "H5SL_close");
|
||||
|
||||
} /* end test_skiplist_add() */
|
||||
|
||||
static herr_t
|
||||
test_skiplist_destroy_free(void *item, void UNUSED *key, void *op_data)
|
||||
{
|
||||
unsigned *free_count=(unsigned *)op_data;
|
||||
|
||||
VERIFY(*(int *)item,sort_rand_num[*free_count],"H5SL_destroy");
|
||||
(*free_count)++;
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist_destroy(): Test H5SL (skip list) code.
|
||||
** Tests 'destroy' operation in skip lists.
|
||||
**
|
||||
****************************************************************/
|
||||
static void
|
||||
test_skiplist_destroy(void)
|
||||
{
|
||||
H5SL_t *slist; /* Skip list created */
|
||||
size_t u; /* Local index variable */
|
||||
unsigned free_count; /* Number of items freed */
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Skip List 'Destroy' Operation\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
|
||||
CHECK(slist, NULL, "H5SL_create");
|
||||
|
||||
/* Insert objects into the skip list */
|
||||
for(u=0; u<NUM_ELEMS; u++) {
|
||||
ret=H5SL_insert(slist,&rand_num[u],&rand_num[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Destroy the skip list */
|
||||
free_count=0;
|
||||
ret=H5SL_destroy(slist,test_skiplist_destroy_free,&free_count);
|
||||
CHECK(ret, FAIL, "H5SL_destroy");
|
||||
VERIFY(free_count, NUM_ELEMS, "H5SL_destroy");
|
||||
|
||||
} /* end test_skiplist_destroy() */
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist_free(): Test H5SL (skip list) code.
|
||||
** Tests 'free' operation in skip lists.
|
||||
**
|
||||
****************************************************************/
|
||||
static void
|
||||
test_skiplist_free(void)
|
||||
{
|
||||
H5SL_t *slist; /* Skip list created */
|
||||
size_t num; /* Number of elements in skip list */
|
||||
size_t u; /* Local index variable */
|
||||
unsigned free_count; /* Number of items freed */
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Skip List 'Free' Operation\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
|
||||
CHECK(slist, NULL, "H5SL_create");
|
||||
|
||||
/* Insert objects into the skip list */
|
||||
for(u=0; u<NUM_ELEMS; u++) {
|
||||
ret=H5SL_insert(slist,&rand_num[u],&rand_num[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Destroy the skip list */
|
||||
free_count=0;
|
||||
ret=H5SL_free(slist,test_skiplist_destroy_free,&free_count);
|
||||
CHECK(ret, FAIL, "H5SL_destroy");
|
||||
VERIFY(free_count, NUM_ELEMS, "H5SL_free");
|
||||
|
||||
/* Check that the skip list has correct # of elements */
|
||||
num=H5SL_count(slist);
|
||||
VERIFY(num, 0, "H5SL_count");
|
||||
|
||||
/* Insert objects into the skip list again */
|
||||
for(u=0; u<NUM_ELEMS; u++) {
|
||||
ret=H5SL_insert(slist,&rand_num[u],&rand_num[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Check that the skip list has correct # of elements */
|
||||
num=H5SL_count(slist);
|
||||
VERIFY(num, NUM_ELEMS, "H5SL_count");
|
||||
|
||||
/* Close the skip list */
|
||||
ret=H5SL_close(slist);
|
||||
CHECK(ret, FAIL, "H5SL_close");
|
||||
|
||||
} /* end test_skiplist_free() */
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist_less(): Test H5SL (skip list) code.
|
||||
** Tests 'less' operation in skip lists.
|
||||
**
|
||||
****************************************************************/
|
||||
static void
|
||||
test_skiplist_less(void)
|
||||
{
|
||||
H5SL_t *slist; /* Skip list created */
|
||||
size_t u; /* Local index variable */
|
||||
unsigned data[10]={ 10, 20, 15, 5, 50, 30, 31, 32, 80, 90};
|
||||
/* unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; */
|
||||
unsigned *found_item; /* Item found in skip list */
|
||||
unsigned find_item; /* Item to add to skip list */
|
||||
herr_t ret; /* Generic return value */
|
||||
|
||||
/* Output message about test being performed */
|
||||
MESSAGE(7, ("Testing Skip List 'Less' Operation\n"));
|
||||
|
||||
/* Create a skip list */
|
||||
slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
|
||||
CHECK(slist, NULL, "H5SL_create");
|
||||
|
||||
/* Insert objects into the skip list */
|
||||
for(u=0; u<10; u++) {
|
||||
ret=H5SL_insert(slist,&data[u],&data[u]);
|
||||
CHECK(ret, FAIL, "H5SL_insert");
|
||||
} /* end for */
|
||||
|
||||
/* Check for exact match of items in various positions */
|
||||
find_item=20;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(*found_item,find_item,"H5SL_less");
|
||||
find_item=90;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(*found_item,find_item,"H5SL_less");
|
||||
find_item=5;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(*found_item,find_item,"H5SL_less");
|
||||
|
||||
/* Find item less than a missing key, in various positions */
|
||||
find_item=19;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(*found_item,15,"H5SL_less");
|
||||
find_item=89;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(*found_item,80,"H5SL_less");
|
||||
find_item=100;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(*found_item,90,"H5SL_less");
|
||||
find_item=9;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(*found_item,5,"H5SL_less");
|
||||
find_item=4;
|
||||
found_item=H5SL_less(slist,&find_item);
|
||||
VERIFY(found_item,NULL,"H5SL_less");
|
||||
|
||||
/* Close the skip list */
|
||||
ret=H5SL_close(slist);
|
||||
CHECK(ret, FAIL, "H5SL_close");
|
||||
|
||||
} /* end test_skiplist_less() */
|
||||
|
||||
/****************************************************************
|
||||
**
|
||||
** test_skiplist(): Main H5SL testing routine.
|
||||
@ -712,6 +1121,13 @@ test_skiplist(void)
|
||||
test_skiplist_string(); /* Test skip list string keys */
|
||||
test_skiplist_iterate(); /* Test iteration over skip list nodes with callback */
|
||||
test_skiplist_hsize(); /* Test skip list hsize_t keys */
|
||||
test_skiplist_unsigned(); /* Test skip list unsigned keys */
|
||||
test_skiplist_lastprev(); /* Test iteration over skip list nodes with last/prev */
|
||||
test_skiplist_find(); /* Test 'find' operation */
|
||||
test_skiplist_add(); /* Test 'add' operation */
|
||||
test_skiplist_destroy(); /* Test 'destroy' operation */
|
||||
test_skiplist_free(); /* Test 'free' operation */
|
||||
test_skiplist_less(); /* Test 'less' operation */
|
||||
|
||||
} /* end test_skiplist() */
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user