include:
Allow the user to specify functions for allocating memory for splay tree roots and nodes. * splay-tree.h (splay_tree_allocate_fn, splay_tree_deallocate_fn): New types. (splay_tree): New fields: `allocate', `deallocate', and `allocate_data'. (splay_tree_new_with_allocator): New function declaration. libiberty: * splay-tree.c (splay_tree_xmalloc_allocate, splay_tree_xmalloc_deallocate): New functions. (splay_tree_new): Call splay_tree_new_with_allocator, passing the above functions and a dummy data pointer. (splay_tree_new_with_allocator): New function. (splay_tree_delete_helper, splay_tree_delete, splay_tree_insert, splay_tree_remove): Use the splay tree's allocation and deallocation functions.
This commit is contained in:
parent
2dd68dc2ff
commit
76135eab62
|
@ -1,3 +1,13 @@
|
||||||
|
2002-02-21 Jim Blandy <jimb@redhat.com>
|
||||||
|
|
||||||
|
Allow the user to specify functions for allocating memory for
|
||||||
|
splay tree roots and nodes.
|
||||||
|
* splay-tree.h (splay_tree_allocate_fn, splay_tree_deallocate_fn):
|
||||||
|
New types.
|
||||||
|
(splay_tree): New fields: `allocate', `deallocate', and
|
||||||
|
`allocate_data'.
|
||||||
|
(splay_tree_new_with_allocator): New function declaration.
|
||||||
|
|
||||||
2002-02-15 Alan Modra <amodra@bigpond.net.au>
|
2002-02-15 Alan Modra <amodra@bigpond.net.au>
|
||||||
|
|
||||||
Support arbitrary length fill patterns.
|
Support arbitrary length fill patterns.
|
||||||
|
|
|
@ -61,6 +61,18 @@ typedef void (*splay_tree_delete_value_fn) PARAMS((splay_tree_value));
|
||||||
/* The type of a function used to iterate over the tree. */
|
/* The type of a function used to iterate over the tree. */
|
||||||
typedef int (*splay_tree_foreach_fn) PARAMS((splay_tree_node, void*));
|
typedef int (*splay_tree_foreach_fn) PARAMS((splay_tree_node, void*));
|
||||||
|
|
||||||
|
/* The type of a function used to allocate memory for tree root and
|
||||||
|
node structures. The first argument is the number of bytes needed;
|
||||||
|
the second is a data pointer the splay tree functions pass through
|
||||||
|
to the allocator. This function must never return zero. */
|
||||||
|
typedef void *(*splay_tree_allocate_fn) PARAMS((int, void *));
|
||||||
|
|
||||||
|
/* The type of a function used to free memory allocated using the
|
||||||
|
corresponding splay_tree_allocate_fn. The first argument is the
|
||||||
|
memory to be freed; the latter is a data pointer the splay tree
|
||||||
|
functions pass through to the freer. */
|
||||||
|
typedef void (*splay_tree_deallocate_fn) PARAMS((void *, void *));
|
||||||
|
|
||||||
/* The nodes in the splay tree. */
|
/* The nodes in the splay tree. */
|
||||||
struct splay_tree_node_s
|
struct splay_tree_node_s
|
||||||
{
|
{
|
||||||
|
@ -89,11 +101,24 @@ typedef struct splay_tree_s
|
||||||
|
|
||||||
/* The deallocate-value function. NULL if no cleanup is necessary. */
|
/* The deallocate-value function. NULL if no cleanup is necessary. */
|
||||||
splay_tree_delete_value_fn delete_value;
|
splay_tree_delete_value_fn delete_value;
|
||||||
|
|
||||||
|
/* Allocate/free functions, and a data pointer to pass to them. */
|
||||||
|
splay_tree_allocate_fn allocate;
|
||||||
|
splay_tree_deallocate_fn deallocate;
|
||||||
|
void *allocate_data;
|
||||||
|
|
||||||
} *splay_tree;
|
} *splay_tree;
|
||||||
|
|
||||||
extern splay_tree splay_tree_new PARAMS((splay_tree_compare_fn,
|
extern splay_tree splay_tree_new PARAMS((splay_tree_compare_fn,
|
||||||
splay_tree_delete_key_fn,
|
splay_tree_delete_key_fn,
|
||||||
splay_tree_delete_value_fn));
|
splay_tree_delete_value_fn));
|
||||||
|
extern splay_tree splay_tree_new_with_allocator
|
||||||
|
PARAMS((splay_tree_compare_fn,
|
||||||
|
splay_tree_delete_key_fn,
|
||||||
|
splay_tree_delete_value_fn,
|
||||||
|
splay_tree_allocate_fn,
|
||||||
|
splay_tree_deallocate_fn,
|
||||||
|
void *));
|
||||||
extern void splay_tree_delete PARAMS((splay_tree));
|
extern void splay_tree_delete PARAMS((splay_tree));
|
||||||
extern splay_tree_node splay_tree_insert
|
extern splay_tree_node splay_tree_insert
|
||||||
PARAMS((splay_tree,
|
PARAMS((splay_tree,
|
||||||
|
|
Loading…
Reference in New Issue