diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/bucket.c | 17 | ||||
-rw-r--r-- | src/debug.c | 137 | ||||
-rw-r--r-- | src/falloc.c | 18 | ||||
-rw-r--r-- | src/findkey.c | 12 | ||||
-rw-r--r-- | src/gdbmdefs.h | 14 | ||||
-rw-r--r-- | src/gdbmopen.c | 6 | ||||
-rw-r--r-- | src/gdbmstore.c | 10 | ||||
-rw-r--r-- | src/lex.l | 2 | ||||
-rw-r--r-- | src/update.c | 12 |
9 files changed, 25 insertions, 203 deletions
diff --git a/src/bucket.c b/src/bucket.c index c75db42..2289594 100644 --- a/src/bucket.c +++ b/src/bucket.c @@ -114,4 +114,3 @@ _gdbm_get_bucket (GDBM_FILE dbf, int dir_index) /* Position the file pointer */ - file_pos = GDBM_DEBUG_OVERRIDE ("_gdbm_get_bucket:seek-failure", - __lseek (dbf, bucket_adr, SEEK_SET)); + file_pos = __lseek (dbf, bucket_adr, SEEK_SET); if (file_pos != bucket_adr) @@ -133,5 +132,4 @@ _gdbm_get_bucket (GDBM_FILE dbf, int dir_index) /* Read the bucket. */ - rc = GDBM_DEBUG_OVERRIDE ("_gdbm_get_bucket:read-failure", - _gdbm_full_read (dbf, dbf->bucket_cache[lru].ca_bucket, - dbf->header->bucket_size)); + rc = _gdbm_full_read (dbf, dbf->bucket_cache[lru].ca_bucket, + dbf->header->bucket_size); if (rc) @@ -304,4 +302,3 @@ _gdbm_split_bucket (GDBM_FILE dbf, int next_insert) return -1; - new_dir = GDBM_DEBUG_ALLOC ("_gdbm_split_bucket:malloc-failure", - malloc (dir_size)); + new_dir = malloc (dir_size); if (new_dir == NULL) @@ -437,4 +434,3 @@ _gdbm_write_bucket (GDBM_FILE dbf, cache_elem *ca_entry) - file_pos = GDBM_DEBUG_OVERRIDE ("_gdbm_write_bucket:seek-failure", - __lseek (dbf, ca_entry->ca_adr, SEEK_SET)); + file_pos = __lseek (dbf, ca_entry->ca_adr, SEEK_SET); if (file_pos != ca_entry->ca_adr) @@ -445,4 +441,3 @@ _gdbm_write_bucket (GDBM_FILE dbf, cache_elem *ca_entry) } - rc = GDBM_DEBUG_OVERRIDE ("_gdbm_write_bucket:write-failure", - _gdbm_full_write (dbf, ca_entry->ca_bucket, dbf->header->bucket_size)); + rc = _gdbm_full_write (dbf, ca_entry->ca_bucket, dbf->header->bucket_size); if (rc) diff --git a/src/debug.c b/src/debug.c index 00f568c..08957ed 100644 --- a/src/debug.c +++ b/src/debug.c @@ -138,138 +138 @@ gdbm_debug_datum (datum dat, char const *pfx) - -struct hook_list -{ - struct hook_list *next; - struct hook_list *prev; - char *id; - gdbm_debug_hook hook; - void *data; - int retval; -}; - -static struct hook_list *hook_head, *hook_tail; -static struct hook_list *hook_recent; - -static struct hook_list * -hook_lookup_or_install (char const *id, int install) -{ - struct hook_list *p; - - for (p = hook_head; p; p = p->next) - { - int res = strcmp (p->id, id); - if (res == 0) - return p; - if (res > 0) - break; - } - - if (install) - { - struct hook_list *elt = malloc (sizeof *elt); - if (!elt) - return NULL; - elt->id = strdup (id); - if (!elt->id) - { - SAVE_ERRNO (free (elt)); - return NULL; - } - elt->hook = NULL; - elt->next = p; - if (p) - { - if (p->prev) - p->prev->next = elt; - else - hook_head = elt; - elt->prev = p->prev; - } - else - { - elt->prev = hook_tail; - if (hook_tail) - hook_tail->next = elt; - else - hook_head = elt; - hook_tail = elt; - } - return elt; - } - - return NULL; -} - -static struct hook_list * -hook_lookup (char const *id) -{ - if (!(hook_recent && strcmp (hook_recent->id, id) == 0)) - hook_recent = hook_lookup_or_install (id, FALSE); - return hook_recent; -} - -static void -hook_remove (char const *id) -{ - struct hook_list *p; - - p = hook_lookup (id); - if (!p) - return; - - hook_recent = NULL; - - if (p->prev) - p->prev->next = p->next; - else - hook_head = p->next; - - if (p->next) - p->next->prev = p->prev; - else - hook_tail = p->prev; - - free (p->id); - free (p); -} - -static int -default_hook (char const *file, int line, char const *id, void *data) -{ - fprintf (stderr, "%s:%d: hit debug hook %s\n", file, line, id); - return 1; -} - -void -_gdbm_debug_hook_install (char const *id, gdbm_debug_hook hook, void *data) -{ - struct hook_list *p; - - p = hook_lookup_or_install (id, TRUE); - p->hook = hook ? hook : default_hook; - p->data = data; -} - -void -_gdbm_debug_hook_remove (char const *id) -{ - hook_remove (id); -} - -int -_gdbm_debug_hook_check (char const *file, int line, char const *id) -{ - struct hook_list *p = hook_lookup (id); - if (p) - return p->retval = p->hook (file, line, id, p->data); - return 0; -} - -int -_gdbm_debug_hook_val (char const *id) -{ - struct hook_list *p = hook_lookup (id); - if (p) - return p->retval; - return 0; -} diff --git a/src/falloc.c b/src/falloc.c index c3bd145..13ee0ed 100644 --- a/src/falloc.c +++ b/src/falloc.c @@ -184,4 +184,3 @@ pop_avail_block (GDBM_FILE dbf) /* Allocate space for the block. */ - new_blk = GDBM_DEBUG_ALLOC ("pop_avail_block:malloc-failure", - malloc (new_el.av_size)); + new_blk = malloc (new_el.av_size); if (new_blk == NULL) @@ -194,4 +193,3 @@ pop_avail_block (GDBM_FILE dbf) /* Read the block. */ - file_pos = GDBM_DEBUG_OVERRIDE ("pop_avail_block:lseek-failure", - __lseek (dbf, new_el.av_adr, SEEK_SET)); + file_pos = __lseek (dbf, new_el.av_adr, SEEK_SET); if (file_pos != new_el.av_adr) @@ -204,4 +202,3 @@ pop_avail_block (GDBM_FILE dbf) - rc = GDBM_DEBUG_OVERRIDE ("pop_avail_block:read-failure", - _gdbm_full_read (dbf, new_blk, new_el.av_size)); + rc = _gdbm_full_read (dbf, new_blk, new_el.av_size); if (rc) @@ -297,4 +294,3 @@ push_avail_block (GDBM_FILE dbf) /* Split the header block. */ - temp = GDBM_DEBUG_ALLOC ("push_avail_block:malloc-failure", - malloc (av_size)); + temp = malloc (av_size); if (temp == NULL) @@ -327,4 +323,3 @@ push_avail_block (GDBM_FILE dbf) /* Update the disk. */ - file_pos = GDBM_DEBUG_OVERRIDE ("push_avail_block:lseek-failure", - __lseek (dbf, av_adr, SEEK_SET)); + file_pos = __lseek (dbf, av_adr, SEEK_SET); if (file_pos != av_adr) @@ -336,4 +331,3 @@ push_avail_block (GDBM_FILE dbf) - rc = GDBM_DEBUG_OVERRIDE ("push_avail_block:write-failure", - _gdbm_full_write (dbf, temp, av_size)); + rc = _gdbm_full_write (dbf, temp, av_size); if (rc) diff --git a/src/findkey.c b/src/findkey.c index bd9fd83..9bb4553 100644 --- a/src/findkey.c +++ b/src/findkey.c @@ -73,5 +73,3 @@ _gdbm_read_entry (GDBM_FILE dbf, int elem_loc) - if (GDBM_DEBUG_HOOK ("_gdbm_read_entry:malloc-failure")) - data_ca->dptr = NULL; - else if (key_size + data_size == 0) + if (key_size + data_size == 0) data_ca->dptr = (char *) malloc (1); @@ -87,5 +85,4 @@ _gdbm_read_entry (GDBM_FILE dbf, int elem_loc) /* Read into the cache. */ - file_pos = GDBM_DEBUG_OVERRIDE ("_gdbm_read_entry:lseek-failure", - __lseek (dbf, dbf->bucket->h_table[elem_loc].data_pointer, - SEEK_SET)); + file_pos = __lseek (dbf, dbf->bucket->h_table[elem_loc].data_pointer, + SEEK_SET); if (file_pos != dbf->bucket->h_table[elem_loc].data_pointer) @@ -97,4 +94,3 @@ _gdbm_read_entry (GDBM_FILE dbf, int elem_loc) - rc = GDBM_DEBUG_OVERRIDE ("_gdbm_read_entry:read-failure", - _gdbm_full_read (dbf, data_ca->dptr, key_size+data_size)); + rc = _gdbm_full_read (dbf, data_ca->dptr, key_size+data_size); if (rc) diff --git a/src/gdbmdefs.h b/src/gdbmdefs.h index d940c5d..4ae646f 100644 --- a/src/gdbmdefs.h +++ b/src/gdbmdefs.h @@ -327,13 +327,2 @@ struct gdbm_file_info while (0) - -typedef int (*gdbm_debug_hook) (char const *, int, char const *, void *); -extern void _gdbm_debug_hook_install (char const *, gdbm_debug_hook, void *); -extern void _gdbm_debug_hook_remove (char const *); -extern int _gdbm_debug_hook_check (char const *, int, char const *); -extern int _gdbm_debug_hook_val (char const *); -# define GDBM_DEBUG_HOOK(id) _gdbm_debug_hook_check(__FILE__,__LINE__,id) -# define GDBM_DEBUG_OVERRIDE(id, stmt) \ - (GDBM_DEBUG_HOOK(id) ? _gdbm_debug_hook_val(id) : (stmt)) -# define GDBM_DEBUG_ALLOC(id, stmt) \ - (GDBM_DEBUG_HOOK(id) ? NULL : (stmt)) #else @@ -341,5 +330,2 @@ extern int _gdbm_debug_hook_val (char const *); # define GDBM_DEBUG_DATUM(flags, dat, fmt, ...) -# define GDBM_DEBUG_HOOK(id) 0 -# define GDBM_DEBUG_OVERRIDE(id, stmt) (stmt) -# define GDBM_DEBUG_ALLOC(id, stmt) (stmt) # define GDBM_SET_ERRNO2(dbf, ec, fatal, m) gdbm_set_errno (dbf, ec, fatal) diff --git a/src/gdbmopen.c b/src/gdbmopen.c index 9c10d3d..22e7ca6 100644 --- a/src/gdbmopen.c +++ b/src/gdbmopen.c @@ -636,4 +636,3 @@ _gdbm_init_cache (GDBM_FILE dbf, size_t size) { - dbf->bucket_cache = GDBM_DEBUG_ALLOC ("_gdbm_init_cache:malloc-failure", - calloc (size, sizeof(cache_elem))); + dbf->bucket_cache = calloc (size, sizeof(cache_elem)); if (dbf->bucket_cache == NULL) @@ -648,4 +647,3 @@ _gdbm_init_cache (GDBM_FILE dbf, size_t size) (dbf->bucket_cache[index]).ca_bucket = - GDBM_DEBUG_ALLOC ("_gdbm_init_cache:bucket-malloc-failure", - malloc (dbf->header->bucket_size)); + malloc (dbf->header->bucket_size); if ((dbf->bucket_cache[index]).ca_bucket == NULL) diff --git a/src/gdbmstore.c b/src/gdbmstore.c index 2ed1616..6b498b2 100644 --- a/src/gdbmstore.c +++ b/src/gdbmstore.c @@ -162,4 +162,3 @@ gdbm_store (GDBM_FILE dbf, datum key, datum content, int flags) /* Write the data to the file. */ - file_pos = GDBM_DEBUG_OVERRIDE ("gdbm_store:seek-failure", - __lseek (dbf, file_adr, SEEK_SET)); + file_pos = __lseek (dbf, file_adr, SEEK_SET); if (file_pos != file_adr) @@ -173,4 +172,3 @@ gdbm_store (GDBM_FILE dbf, datum key, datum content, int flags) - rc = GDBM_DEBUG_OVERRIDE ("gdbm_store:write-1-failure", - _gdbm_full_write (dbf, key.dptr, key.dsize)); + rc = _gdbm_full_write (dbf, key.dptr, key.dsize); if (rc) @@ -184,5 +182,3 @@ gdbm_store (GDBM_FILE dbf, datum key, datum content, int flags) - rc = GDBM_DEBUG_OVERRIDE ("gdbm_store:write-2-failure", - _gdbm_full_write (dbf, - content.dptr, content.dsize)); + rc = _gdbm_full_write (dbf, content.dptr, content.dsize); if (rc) @@ -123,5 +123,3 @@ lex_trace (int n) { -#if GDBMTOOL_DEBUG yy_flex_debug = n; -#endif } diff --git a/src/update.c b/src/update.c index 63c6c95..f4b8b78 100644 --- a/src/update.c +++ b/src/update.c @@ -32,4 +32,3 @@ write_header (GDBM_FILE dbf) - file_pos = GDBM_DEBUG_OVERRIDE ("write_header:lseek-failure", - __lseek (dbf, 0L, SEEK_SET)); + file_pos = __lseek (dbf, 0L, SEEK_SET); if (file_pos != 0) @@ -41,4 +40,3 @@ write_header (GDBM_FILE dbf) - rc = GDBM_DEBUG_OVERRIDE ("write_header:write-failure", - _gdbm_full_write (dbf, dbf->header, dbf->header->block_size)); + rc = _gdbm_full_write (dbf, dbf->header, dbf->header->block_size); @@ -98,4 +96,3 @@ _gdbm_end_update (GDBM_FILE dbf) { - file_pos = GDBM_DEBUG_OVERRIDE ("_gdbm_end_update:lseek-failure", - __lseek (dbf, dbf->header->dir, SEEK_SET)); + file_pos = __lseek (dbf, dbf->header->dir, SEEK_SET); if (file_pos != dbf->header->dir) @@ -107,4 +104,3 @@ _gdbm_end_update (GDBM_FILE dbf) - rc = GDBM_DEBUG_OVERRIDE ("_gdbm_end_update:write-dir-failure", - _gdbm_full_write (dbf, dbf->dir, dbf->header->dir_size)); + rc = _gdbm_full_write (dbf, dbf->dir, dbf->header->dir_size); if (rc) |