diff options
| -rw-r--r-- | libibex/ChangeLog | 15 | ||||
| -rw-r--r-- | libibex/ibex_block.c | 199 | ||||
| -rw-r--r-- | libibex/ibex_internal.h | 7 |
3 files changed, 216 insertions, 5 deletions
diff --git a/libibex/ChangeLog b/libibex/ChangeLog index 80340c7af8..7691a94e5c 100644 --- a/libibex/ChangeLog +++ b/libibex/ChangeLog @@ -1,3 +1,18 @@ +2001-08-15 Not Zed <NotZed@Ximian.com> + + * ibex_block.c (ibex_use): New function to limit use of fd's. + Mark an ibex file in use, re-open if necessary, and close off + another (lru) if necessary. + (ibex_unuse): Mark an ibex as not in use. + (ibex_open): Delay opening of the actual block file till later, + and add the ibex to a global list. + (ibex_save): Use/unuse around operations. + (close_backend): Zero out blocks when closed. + (ibex_close): Remove the ibex from the global list before closing + it down. + (ibex_index_buffer, ibex_find, ibex_unindex, ibex_find_name): + Use/unuse around ops. + 2001-08-10 Not Zed <NotZed@Ximian.com> * wordindexmem.c (sync_cache_entry): NOOP if writing to a failed diff --git a/libibex/ibex_block.c b/libibex/ibex_block.c index bbd13f2308..ea326949ae 100644 --- a/libibex/ibex_block.c +++ b/libibex/ibex_block.c @@ -10,8 +10,89 @@ #include "ibex_internal.h" #define d(x) +#define o(x) x static void ibex_reset(ibex *ib); +static int close_backend(ibex *ib); + +static struct _list ibex_list = { (struct _listnode *)&ibex_list.tail, 0, (struct _listnode *)&ibex_list.head }; + +#ifdef ENABLE_THREADS +#include <pthread.h> +static pthread_mutex_t ibex_list_lock = PTHREAD_MUTEX_INITIALIZER; +int ibex_opened; /* count of actually opened ibexe's */ +#define IBEX_LIST_LOCK(ib) (pthread_mutex_lock(&ibex_list_lock)) +#define IBEX_LIST_UNLOCK(ib) (pthread_mutex_unlock(&ibex_list_lock)) +#else +#define IBEX_LIST_LOCK(ib) +#define IBEX_LIST_UNLOCK(ib) +#endif + +/* check we are open properly */ + +/* TODO: return errors? */ +static void ibex_use(ibex *ib) +{ + ibex *wb; + + /* always lock list then ibex */ + IBEX_LIST_LOCK(ib); + IBEX_LOCK(ib); + + if (ib->blocks == NULL) { + o(printf("Delayed opening ibex '%s', total = %d\n", ib->name, ibex_opened+1)); + + ib->blocks = ibex_block_cache_open(ib->name, ib->flags, ib->mode); + if (ib->blocks) { + /* FIXME: the blockcache or the wordindex needs to manage the other one */ + ib->words = ib->blocks->words; + } else { + ib->words = NULL; + g_warning("ibex_use:open(): Error occured?: %s\n", strerror(errno)); + } + if (ib->blocks != NULL) + ibex_opened++; + } + + ib->usecount++; + + /* this makes an 'lru' cache of used files */ + ibex_list_remove((struct _listnode *)ib); + ibex_list_addtail(&ibex_list, (struct _listnode *)ib); + + IBEX_UNLOCK(ib); + + /* check for other ibex's we can close now to not over-use fd's. + we can't do this first for locking issues */ + if (ibex_opened > IBEX_OPEN_THRESHOLD) { + wb = (ibex *)ibex_list.head; + while (wb->next) { + wb = wb->next; + IBEX_LOCK(wb); + if (wb->usecount == 0 && wb->blocks != NULL) { + o(printf("Forcing close of obex '%s', total = %d\n", wb->name, ibex_opened-1)); + close_backend(wb); + IBEX_UNLOCK(wb); + /* optimise the next scan? */ + /*ibex_list_remove((struct _listnode *)wb); + ibex_list_addtail(&ibex_list, (struct _listnode *)wb);*/ + ibex_opened--; + break; + } + IBEX_UNLOCK(wb); + } + } + + IBEX_LIST_UNLOCK(ib); +} + +static void ibex_unuse(ibex *ib) +{ + IBEX_LOCK(ib); + ib->usecount--; + IBEX_UNLOCK(ib); +} + static signed char utf8_trans[] = { 'A', 'A', 'A', 'A', 'A', 'A', -1, 'C', 'E', 'E', 'E', 'E', 'I', 'I', @@ -193,6 +274,7 @@ done: g_free(word); word = NULL; + ibex_use(ib); IBEX_LOCK(ib); if (ibex_block_cache_setjmp(ib->blocks) != 0) { @@ -212,6 +294,7 @@ done: } IBEX_UNLOCK(ib); + ibex_unuse(ib); error: for (i=0;i<wordlist->len;i++) @@ -223,37 +306,63 @@ error: } +/** + * ibex_open: + * @file: + * @flags: + * @mode: + * + * Open a new ibex file. file, flags, and mode as for open(2) + * + * Return value: A new ibex, or NULL on failure. + **/ ibex *ibex_open (char *file, int flags, int mode) { ibex *ib; ib = g_malloc0(sizeof(*ib)); + ib->blocks = NULL; + ib->usecount = 0; +#if 0 ib->blocks = ibex_block_cache_open(file, flags, mode); if (ib->blocks == 0) { g_warning("create: Error occured?: %s\n", strerror(errno)); g_free(ib); return NULL; } - + /* FIXME: the blockcache or the wordindex needs to manage the other one */ + ib->words = ib->blocks->words; +#endif ib->name = g_strdup(file); ib->flags = flags; ib->mode = mode; - /* FIXME: the blockcache or the wordindex needs to manage the other one */ - ib->words = ib->blocks->words; - #ifdef ENABLE_THREADS ib->lock = g_mutex_new(); #endif + + IBEX_LIST_LOCK(ib); + ibex_list_addtail(&ibex_list, (struct _listnode *)ib); + IBEX_LIST_UNLOCK(ib); + return ib; } +/** + * ibex_save: + * @ib: + * + * Save (sync) an ibex file to disk. + * + * Return value: -1 on failure. + **/ int ibex_save (ibex *ib) { int ret; d(printf("syncing database\n")); + ibex_use(ib); IBEX_LOCK(ib); if (ibex_block_cache_setjmp(ib->blocks) != 0) { @@ -272,6 +381,7 @@ int ibex_save (ibex *ib) } IBEX_UNLOCK(ib); + ibex_unuse(ib); return ret; } @@ -281,6 +391,9 @@ close_backend(ibex *ib) { int ret; + if (ib->blocks == 0) + return 0; + if (ibex_block_cache_setjmp(ib->blocks) != 0) { printf("Error closing!\n"); ret = -1; @@ -293,6 +406,7 @@ close_backend(ibex *ib) ib->words->klass->close(ib->words); /* FIXME: return */ ibex_block_cache_close(ib->blocks); + ib->blocks = NULL; ret = 0; } @@ -315,13 +429,31 @@ ibex_reset(ibex *ib) ib->words = ib->blocks->words; } +/** + * ibex_close: + * @ib: + * + * Close (and save) an ibex file, restoring all resources used. + * + * Return value: -1 on error. In either case, ibex is no longer + * defined afterwards. + **/ int ibex_close (ibex *ib) { int ret; d(printf("closing database\n")); - ret = close_backend(ib); + g_assert(ib->usecount == 0); + + IBEX_LIST_LOCK(ib); + ibex_list_remove((struct _listnode *)ib); + IBEX_LIST_UNLOCK(ib); + + if (ib->blocks != NULL) + ret = close_backend(ib); + else + ret = 0; g_free(ib->name); @@ -333,20 +465,40 @@ int ibex_close (ibex *ib) return ret; } +/** + * ibex_unindex: + * @ib: + * @name: + * + * Remove a name from the index. + **/ void ibex_unindex (ibex *ib, char *name) { d(printf("trying to unindex '%s'\n", name)); + ibex_use(ib); IBEX_LOCK(ib); + if (ibex_block_cache_setjmp(ib->blocks) != 0) { printf("Error unindexing!\n"); ibex_reset(ib); } else { ib->words->klass->unindex_name(ib->words, name); } + IBEX_UNLOCK(ib); + ibex_unuse(ib); } +/** + * ibex_find: + * @ib: + * @word: + * + * Find all names containing @word. + * + * Return value: + **/ GPtrArray *ibex_find (ibex *ib, char *word) { char *normal; @@ -356,17 +508,33 @@ GPtrArray *ibex_find (ibex *ib, char *word) len = strlen(word); normal = alloca(len+1); ibex_normalise_word(word, word+len, normal); + + ibex_use(ib); IBEX_LOCK(ib); + if (ibex_block_cache_setjmp(ib->blocks) != 0) { ibex_reset(ib); ret = NULL; } else { ret = ib->words->klass->find(ib->words, normal); } + IBEX_UNLOCK(ib); + ibex_unuse(ib); + return ret; } +/** + * ibex_find_name: + * @ib: + * @name: + * @word: + * + * Return #TRUE if the specific @word is contained in @name. + * + * Return value: + **/ gboolean ibex_find_name (ibex *ib, char *name, char *word) { char *normal; @@ -376,28 +544,49 @@ gboolean ibex_find_name (ibex *ib, char *name, char *word) len = strlen(word); normal = alloca(len+1); ibex_normalise_word(word, word+len, normal); + + ibex_use(ib); IBEX_LOCK(ib); + if (ibex_block_cache_setjmp(ib->blocks) != 0) { ibex_reset(ib); ret = FALSE; } else { ret = ib->words->klass->find_name(ib->words, name, normal); } + IBEX_UNLOCK(ib); + ibex_unuse(ib); + return ret; } +/** + * ibex_contains_name: + * @ib: + * @name: + * + * Returns true if the name @name is somewhere in the database. + * + * Return value: + **/ gboolean ibex_contains_name(ibex *ib, char *name) { gboolean ret; + ibex_use(ib); IBEX_LOCK(ib); + if (ibex_block_cache_setjmp(ib->blocks) != 0) { ibex_reset(ib); ret = FALSE; } else { ret = ib->words->klass->contains_name(ib->words, name); } + IBEX_UNLOCK(ib); + ibex_unuse(ib); + return ret; } + diff --git a/libibex/ibex_internal.h b/libibex/ibex_internal.h index d8e5e28296..bb15ebc1f7 100644 --- a/libibex/ibex_internal.h +++ b/libibex/ibex_internal.h @@ -27,6 +27,11 @@ #include "wordindex.h" struct ibex { + struct ibex *next; /* for list of open ibex's */ + struct ibex *prev; + + int usecount; + char *name; int flags; int mode; @@ -41,6 +46,8 @@ struct ibex { }; +#define IBEX_OPEN_THRESHOLD (5) + #ifdef ENABLE_THREADS /*#define IBEX_LOCK(ib) (printf(__FILE__ "%d: %s: locking ibex\n", __LINE__, __FUNCTION__), g_mutex_lock(ib->lock)) #define IBEX_UNLOCK(ib) (printf(__FILE__ "%d: %s: unlocking ibex\n", __LINE__, __FUNCTION__), g_mutex_unlock(ib->lock))*/ |