Commit Graph

20 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
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
0
ef9b8189dc If we can't open blocks, dont try to deref it.
2001-10-30    <NotZed@Ximian.com>

        * ibex_block.c (ibex_reset): If we can't open blocks, dont try to
        deref it.

svn path=/trunk/; revision=14423
2001-10-30 04:33:44 +00:00
9
fa9505a288 Always rename file even if mv failed.
2001-10-29    <NotZed@Ximian.com>

        * ibex_block.c (ibex_move): Always rename file even if mv failed.

svn path=/trunk/; revision=14326
2001-10-29 08:23:32 +00:00
8
cf90bb5d33 New api entry to move an ibex file in an atomic way.
2001-10-28    <NotZed@Ximian.com>

        * ibex_block.c (ibex_move): New api entry to move an ibex file in
        an atomic way.

svn path=/trunk/; revision=14293
2001-10-28 13:04:54 +00:00
2
fa32b99837 Added environmental variable IBEX_OPEN_THRESHOLD which limits the maximum
2001-10-12    <NotZed@Ximian.com>

        * ibex_block.c (ibex_use): Added environmental variable
        IBEX_OPEN_THRESHOLD which limits the maximum number of open ibex's
        that can be active at any time.  The smallest this can be set to
        is the default of 5.

svn path=/trunk/; revision=13642
2001-10-12 23:08:32 +00:00
0
ed68662d87 Turn off the o(x) debug set, & include alloca.h & config.h.
2001-09-20    <NotZed@Ximian.com>

	* ibex_block.c: Turn off the o(x) debug set, & include alloca.h &
	config.h.

svn path=/trunk/; revision=13033
2001-09-21 00:15:58 +00:00
0
b854297a3a Turn off the o(x) debug set.
2001-09-20    <NotZed@Ximian.com>

        * ibex_block.c: Turn off the o(x) debug set.

svn path=/trunk/; revision=13032
2001-09-21 00:14:07 +00:00
95cad50c05 Use a next pointer so we keep the list intact as we scan it.
2001-08-16  Not Zed  <NotZed@Ximian.com>

        * ibex_block.c (ibex_use): Use a next pointer so we keep the list
        intact as we scan it.

svn path=/trunk/; revision=12049
2001-08-15 14:41:57 +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
678e848710 Add GAL_LIBS for gunicode stuff (until glib 2.0) (INCLUDES): Use
* Makefile.am (libibex_la_LIBADD): Add GAL_LIBS for gunicode stuff
	(until glib 2.0)
	(INCLUDES): Use EXTRA_GNOME_CFLAGS
	(dumpindex_LDADD, testindex_LDADD): fix
	Remove references to mkindex and lookup.

	* ibex_block.c (ibex_normalise_word, utf8_category): Convert to
	gunicode interfaces

	* ibex_db.c, lookup.c, mkindex.c: Unused, remove.

svn path=/trunk/; revision=9584
2001-04-26 18:18:49 +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
8bee19374d Added some casts to get rid of warnings. (tail_dump): #if 0ed this out to
2000-12-13  Christopher James Lahey  <clahey@helixcode.com>

	* disktail.c (tail_compress):
	(tail_get): Added some casts to get rid of warnings.
	(tail_dump): #if 0ed this out to get rid of a warning.
	(ibex_diskarray_dump): Added a prototype.

	* ibex_block.c (ibex_index_buffer): Assigned cat the value 0 to
	start off with to avoid a warning.

svn path=/trunk/; revision=6993
2000-12-14 04:14:56 +00:00
ce4905721c Turn off index stats by default.
2000-11-28  Not Zed  <NotZed@HelixCode.com>

        * index.h: Turn off index stats by default.

        * ibex_block.c (ibex_save): And here.
        (ibex_close): Debug out printfs.

        * wordindexmem.c (ibex_create_word_index_mem): And here.
        (num): Made buf static.

        * block.c (ibex_block_cache_open): Debug out some printfs.
        (ibex_block_read): And here.

svn path=/trunk/; revision=6691
2000-11-28 13:05:01 +00:00
5
88e568eae3 No longer include <db.h>
2000-10-25    <jpr@helixcode.com>

	* ibex_block.c: No longer include <db.h>

2000-10-25    <jpr@helixcode.com>

	* e-shortcuts-view-model.c (load_group_into_model): Set folder to NULL to
	kill warning

svn path=/trunk/; revision=6180
2000-10-25 22:21:34 +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
f38165f933 Include errno.h
svn path=/trunk/; revision=5537
2000-09-21 11:10: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