Commit Graph

16 Commits

Author SHA1 Message Date
1
f6f1ce07ce Change to use pthread_mutex directly. (ibex_close): Same.
2001-11-01    <NotZed@Ximian.com>

        * ibex_block.c (ibex_open): Change to use pthread_mutex directly.
        (ibex_close): Same.

        * ibex_internal.h: Changed to use pthread mutexes.  Fixes #14218.

svn path=/trunk/; revision=14565
2001-11-01 21:23:36 +00:00
1
b40eb5b8a4 Added a trylock, used by ibex_use.
2001-10-31    <NotZed@Ximian.com>

        * ibex_internal.h (IBEX_TRYLOCK): Added a trylock, used by ibex_use.

        * ibex_block.c (ibex_use): Do to a trylock on the ibex we're
        checking to close, as it might be locked elsewhere in an obivously
        simple deadlock.

svn path=/trunk/; revision=14547
2001-10-31 19:58:02 +00:00
0
1d08275d79 Bump this to 15, 5 seems a little small. Its still settable using an
2001-10-30    <NotZed@Ximian.com>

        * ibex_internal.h (IBEX_OPEN_THRESHOLD): Bump this to 15, 5 seems
        a little small.  Its still settable using an environmental
        variable though, hopefully with other fd optimisations this will
        not be an excessive number.

svn path=/trunk/; revision=14471
2001-10-30 18:54:19 +00:00
0
6e4ce3ebfb If we can't open blocks, dont try to deref it. (ibex_move): Dont try to
2001-10-30    <NotZed@Ximian.com>

        * ibex_block.c (ibex_reset): If we can't open blocks, dont try to
        deref it.
        (ibex_move): Dont try to rename if we have no file to rename.
        Change all callers to ibex_use to call it inside the lock.
        Otherwise it could change while we're trying to use it ...
        (ibex_use): Dont lock ib here, always assume we have it locked
        already, and dont try to close it if we run across it in the list.

svn path=/trunk/; revision=14430
2001-10-30 05:21:16 +00:00
4ca07463a0 More fixing of the license texts.
svn path=/trunk/; revision=14217
2001-10-27 18:21:05 +00:00
b4c3c0fa9b New function to limit use of fd's. Mark an ibex file in use, re-open if
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.

svn path=/trunk/; revision=12042
2001-08-15 04:57:51 +00:00
ed70b7f141 NOOP if writing to a failed file. (word_index_pre): NOOP if failed file.
2001-08-10  Not Zed  <NotZed@Ximian.com>

        * wordindexmem.c (sync_cache_entry): NOOP if writing to a failed
        file.
        (word_index_pre): NOOP if failed file.
        (ibex_create_word_index_mem): Setup blocks value.

        ** Added internal exception handling to libibex, in the case of
        errors with on-disk data, exceptions are returned.

        * block.c (ibex_block_cache_open): Detect fatal errors below us
        and clean up appropriately.
        (ibex_block_cache_fail): New function to handle the failure, and
        keep track of it.
        (ibex_block_cache_sync): Dont do anything if we've failed on this
        file.

        * disktail.c (tail_compress): Add blocks param so we can assert
        for exceptions.

        * hash.c, block.c disktail.c: g_assert->ibex_block_cache_assert
        where dealing with external data.

        * hash.c (hash_info): Add index param so we can assert for exceptions.

        * ibex_block.c (ibex_index_buffer): Setjmp before calling into
        internal routines.
        (ibex_save): "
        (ibex_unindex): "
        (ibex_find): "
        (ibex_find_name): "
        (ibex_contains_name): "
        (ibex_reset): Function to reset the index file if we have an
        error, call when we have an error.

        * block.h (ibex_block_cache_assert): Create assertion/exception
        macros, and include a setjmp buffer for returning it.

2001-08-09  Not Zed  <NotZed@Ximian.com>

        * Makefile.am (libibex_la_SOURCES): Remove wordindex.c,
        wordindexmem is what's used.

svn path=/trunk/; revision=11864
2001-08-10 01:19:47 +00:00
91cc026904 Update the copyrights, replacing Helix Code with Ximian and
helixcode.com with ximian.com all over the place.

svn path=/trunk/; revision=10440
2001-06-23 08:52:02 +00:00
5674966eeb Merge from camel-mt-branch.
2000-12-24  Not Zed  <NotZed@HelixCode.com>

        * Merge from camel-mt-branch.

svn path=/trunk/; revision=7152
2000-12-24 00:58:02 +00:00
793d323357 Oopps, knew i shoul'dve compiled before committing.
(IBEX_VERSION): moved into block.h

svn path=/trunk/; revision=6193
2000-10-26 02:53:49 +00:00
f0a4126654 Another slight performance improvement, reads the list of words
faster when starting indexing of new data.

2000-10-26  Not Zed  <NotZed@HelixCode.com>

	* block.c (ibex_block_cache_open): Use IBEX_VERSION rather than
	hardcoded version string.

	* ibex_internal.h (IBEX_VERSION): Bumped version again.  This time
	I did change the index format.

	* hash.c (struct _hashroot): Add a linked list of keys to the table.
	(struct _hashblock): Added a next pointer as a block number.
	(hash_insert): Link new key blocks into the key block list.
	(struct _HASHCursor): Renamed block to key and added a block item.
	(hash_cursor_next): Changed to go through the linked list of all
	hash items rather than through each hash chain separately.  >>
	faster.
	(ibex_hash_dump_rec): Remove a warning.

svn path=/trunk/; revision=6192
2000-10-26 02:44:37 +00:00
9aae808cd0 Bugfixes, performance improvemnts. Should scale up much better than
before, and be more bugfree than ever!

2000-10-25  Not Zed  <NotZed@HelixCode.com>

 	* ibex_internal.h (IBEX_VERSION): Bumped to another version.  The
 	file format hasn't changed, but earlier bugs may create invalid
 	files.

 	* block.c (ibex_block_read): Use the root data directly.
 	(ibex_block_cache_open): As well.
 	(ibex_block_get): And here too.
 	(ibex_block_cache_sync): Sync the root block directly here.

 	* block.h: Pad root block out to 1024 bytes.
 	Added root block to struct _memcache.

 	* disktail.c (tail_get): Dirty the root block.
 	(tail_get): Fix for changes to root access.
 	(disk_remove): And here too.

 	* wordindexmem.c (sync_cache_entry): Handle the case of not having
 	any files in the list, which can happen now.
 	(word_index_pre): Make sure we set the wordid on the new cache
 	entry.

 	* ibex_block.c (ibex_save): Sigh.  Pass the right argument to
 	index_post.

	* block.c (ibex_block_cache_open): Create a word_index_mem for
 	indexing the words, rather than a word_index.

 	* ibex_block.c (ibex_index_buffer): If we haven't called index_pre
 	yet, do it before indexing anything.
 	(ibex_save): If wehave called index_pre previously, call
 	index_post.
 	(ibex_close): And same for here.

 	* index.h: Added a cursor class, and cursor retrieval function for
 	iterating through an index's keys.

 	* wordindexmem.c (ibex_create_word_index_mem): New word class,
 	similar to wordindex, but meant to be faster for updates.
 	(word_index_pre): Implement.  We load all keys into memory.
 	(word_index_post): Implement.  We sync and free all keys.
 	(find): Remove lru code, its no longer a cache, but a lookup
 	table.
 	(add_index_cache): Remove lru code here too.
 	(find_name): And here.
 	(word_flush): Flush the hashtable direct.
 	(word_close): Call flush to flush, rather than doing it ourselves.
 	(add_index_cache): If we are in an index state, we can assume a
 	cache miss == a new word.
 	(word_index_post): Maintain whether or not we are in an index
 	state, and the depth of the state.
 	(word_index_pre): Likewise.  Dont reread the index if we have
 	already.
 	(cache_sanity): Fixed for struct changes.

 	* wordindex.h (IBEXWordClass): Added functions to prepare/cleanup
 	for lots of indexing.  i.e. can be used to optimise indexing speed
 	at the cost of extra memory usage during the indexing process.

	* hash.c (hash_cursor_create): Create a new cursor for iterating through a
 	hashtable.
 	(hash_cursor_close): 'close' the cursor. It is upto the
 	application to close any cursors it creates.
 	(hash_cursor_next): Goto the next key id.
 	(hash_cursor_next_key): Goto the next key, reutrn the key.
 	(hash_get_cursor): Return a cursor object.

	* wordindex.c (word_index_post):
 	(word_index_pre): Added (empty) callbacks for pre/post functions.

svn path=/trunk/; revision=6165
2000-10-25 13:59:44 +00:00
c645a2a9e8 Bumped ibex rev.
2000-10-12  Not Zed  <NotZed@HelixCode.com>

	* ibex_internal.h (struct ibex): Bumped ibex rev.

	* block.c (ibex_block_cache_open): Bumped the ibex file revision
	because of the hash table size change.

svn path=/trunk/; revision=5887
2000-10-12 14:04:17 +00:00
288e7bb1fb ** Merged from IBEX_DISK branch to head.
2000-09-19  Not Zed  <NotZed@HelixCode.com>

	** Merged from IBEX_DISK branch to head.

svn path=/trunk/; revision=5500
2000-09-19 12:22:00 +00:00
89fefc5c8c fix license and indent style
svn path=/trunk/; revision=1814
2000-02-17 02:10:05 +00:00
add8821e99 Initial revision
svn path=/trunk/; revision=1768
2000-02-14 02:00:22 +00:00