X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=ce6972d8f23acb0a5fea0d3bd65ae0ac4858ae7b;hb=eb2b742588ce07fb4516bbca22c93b938b13e433;hp=bf73dc3a39f0506687f4c19c457ee7b3f5804a81;hpb=d75b9accf5a28bd5d8ffd70bbb33b3e8e009d079;p=idzebra-moved-to-github.git diff --git a/bfile/bfile.c b/bfile/bfile.c index bf73dc3..ce6972d 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,10 +1,73 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.12 1995-11-30 08:33:10 adam + * Revision 1.32 2000-03-15 15:00:30 adam + * First work on threaded version. + * + * Revision 1.31 1999/12/08 15:03:11 adam + * Implemented bf_reset. + * + * Revision 1.30 1999/10/14 14:33:49 adam + * Added truncation 5=106. + * + * Revision 1.29 1999/05/26 07:49:12 adam + * C++ compilation. + * + * Revision 1.28 1999/05/12 13:08:05 adam + * First version of ISAMS. + * + * Revision 1.27 1999/02/02 14:50:01 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.26 1998/02/17 10:32:52 adam + * Fixed bug: binary files weren't opened with flag b on NT. + * + * Revision 1.25 1997/10/27 14:25:38 adam + * Fixed memory leaks. + * + * Revision 1.24 1997/09/18 08:59:16 adam + * Extra generic handle for the character mapping routines. + * + * Revision 1.23 1997/09/17 12:19:06 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.22 1997/09/09 13:37:52 adam + * Partial port to WIN95/NT. + * + * Revision 1.21 1996/10/29 13:56:13 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.20 1996/03/26 15:59:04 adam + * The directory of the shadow table file can be specified by the new + * bf_lockDir call. + * + * Revision 1.19 1996/02/05 12:28:58 adam + * Removed a LOG_LOG message. + * + * Revision 1.18 1996/01/02 08:59:06 quinn + * Changed "commit" setting to "shadow". + * + * Revision 1.17 1995/12/11 09:03:51 adam + * New function: cf_unlink. + * New member of commit file head: state (0) deleted, (1) hash file. + * + * Revision 1.16 1995/12/08 16:21:13 adam + * Work on commit/update. + * + * Revision 1.15 1995/12/01 16:24:28 adam + * Commit files use separate meta file area. + * + * Revision 1.14 1995/12/01 11:37:21 adam + * Cached/commit files implemented as meta-files. + * + * Revision 1.13 1995/11/30 17:00:49 adam + * Several bug fixes. Commit system runs now. + * + * Revision 1.12 1995/11/30 08:33:10 adam * Started work on commit facility. * * Revision 1.11 1995/09/04 12:33:21 adam @@ -40,24 +103,96 @@ */ #include -#include -#include -#include #include +#include +#include +#ifdef WIN32 +#include +#else +#include +#endif -#include +#include #include #include "cfile.h" -static const char *cache_name = NULL; +struct BFiles_struct { + MFile_area commit_area; + MFile_area_struct *register_area; + char *lockDir; +}; + +BFiles bfs_create (const char *spec) +{ + BFiles bfs = (BFiles) xmalloc (sizeof(*bfs)); + bfs->commit_area = NULL; + bfs->register_area = mf_init("register", spec); + bfs->lockDir = NULL; + if (!bfs->register_area) + { + bfs_destroy(bfs); + return 0; + } + return bfs; +} + +void bfs_destroy (BFiles bfs) +{ + xfree (bfs->lockDir); + mf_destroy (bfs->commit_area); + mf_destroy (bfs->register_area); + xfree (bfs); +} + +static FILE *open_cache (BFiles bfs, const char *flags) +{ + char cacheFilename[1024]; + FILE *file; + + sprintf (cacheFilename, "%scache", + bfs->lockDir ? bfs->lockDir : ""); + file = fopen (cacheFilename, flags); + return file; +} + +static void unlink_cache (BFiles bfs) +{ + char cacheFilename[1024]; + + sprintf (cacheFilename, "%scache", + bfs->lockDir ? bfs->lockDir : ""); + unlink (cacheFilename); +} + +void bf_lockDir (BFiles bfs, const char *lockDir) +{ + size_t len; + + xfree (bfs->lockDir); + if (lockDir == NULL) + lockDir = ""; + len = strlen(lockDir); + bfs->lockDir = (char *) xmalloc (len+2); + strcpy (bfs->lockDir, lockDir); + + if (len > 0 && bfs->lockDir[len-1] != '/') + strcpy (bfs->lockDir + len, "/"); +} -void bf_cache (const char *name) +void bf_cache (BFiles bfs, const char *spec) { - cache_name = name; + if (spec) + { + if (!bfs->commit_area) + bfs->commit_area = mf_init ("shadow", spec); + } + else + bfs->commit_area = NULL; } int bf_close (BFile bf) { + zebra_lock_rdwr_destroy (&bf->rdwr_lock); if (bf->cf) cf_close (bf->cf); mf_close (bf->mf); @@ -65,30 +200,35 @@ int bf_close (BFile bf) return 0; } -BFile bf_open (const char *name, int block_size, int wflag) +BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag) { - BFile tmp = xmalloc(sizeof(BFile_struct)); + BFile tmp = (BFile) xmalloc(sizeof(BFile_struct)); - if (cache_name) + if (bfs->commit_area) { - FILE *outf; int first_time; - logf (LOG_LOG, "cf,mf_open %s, cache_name=%s", name, cache_name); - tmp->mf = mf_open(0, name, block_size, wflag); - tmp->cf = cf_open(tmp->mf, cache_name, name, block_size, wflag, - &first_time); - + tmp->mf = mf_open (bfs->register_area, name, block_size, 0); + tmp->cf = cf_open (tmp->mf, bfs->commit_area, name, block_size, + wflag, &first_time); if (first_time) { - outf = fopen (cache_name, "a"); + FILE *outf; + + outf = open_cache (bfs, "ab"); + if (!outf) + { + logf (LOG_FATAL|LOG_ERRNO, "open %scache", + bfs->lockDir ? bfs->lockDir : ""); + exit (1); + } fprintf (outf, "%s %d\n", name, block_size); fclose (outf); } } else { - tmp->mf = mf_open(0, name, block_size, wflag); + tmp->mf = mf_open(bfs->register_area, name, block_size, wflag); tmp->cf = NULL; } if (!tmp->mf) @@ -97,26 +237,58 @@ BFile bf_open (const char *name, int block_size, int wflag) xfree (tmp); return 0; } + zebra_lock_rdwr_init (&tmp->rdwr_lock); return(tmp); } -int bf_read (BFile bf, int no, int offset, int num, void *buf) +int bf_read (BFile bf, int no, int offset, int nbytes, void *buf) { int r; - if (bf->cf && (r=cf_read (bf->cf, no, offset, num, buf)) != -1) - return r; - return mf_read (bf->mf, no, offset, num, buf); + zebra_lock_rdwr_rlock (&bf->rdwr_lock); + if (bf->cf) + { + if ((r = cf_read (bf->cf, no, offset, nbytes, buf)) == -1) + r = mf_read (bf->mf, no, offset, nbytes, buf); + } + else + r = mf_read (bf->mf, no, offset, nbytes, buf); + zebra_lock_rdwr_runlock (&bf->rdwr_lock); + return r; } -int bf_write (BFile bf, int no, int offset, int num, const void *buf) +int bf_write (BFile bf, int no, int offset, int nbytes, const void *buf) { + int r; + zebra_lock_rdwr_wlock (&bf->rdwr_lock); if (bf->cf) - return cf_write (bf->cf, no, offset, num, buf); - return mf_write (bf->mf, no, offset, num, buf); + r = cf_write (bf->cf, no, offset, nbytes, buf); + else + r = mf_write (bf->mf, no, offset, nbytes, buf); + zebra_lock_rdwr_wunlock (&bf->rdwr_lock); + return r; +} + +int bf_commitExists (BFiles bfs) +{ + FILE *inf; + + inf = open_cache (bfs, "rb"); + if (inf) + { + fclose (inf); + return 1; + } + return 0; } -void bf_commit (const char *name) +void bf_reset (BFiles bfs) +{ + mf_reset (bfs->commit_area); + mf_reset (bfs->register_area); +} + +void bf_commitExec (BFiles bfs) { FILE *inf; int block_size; @@ -125,15 +297,16 @@ void bf_commit (const char *name) CFile cf; int first_time; - if (!(inf = fopen (name, "r"))) + assert (bfs->commit_area); + if (!(inf = open_cache (bfs, "rb"))) { - logf (LOG_FATAL|LOG_ERRNO, "cannot open commit %s", name); - exit (1); + logf (LOG_LOG, "No commit file"); + return ; } - while (fscanf (inf, "%s %d", path, &block_size) == 1) + while (fscanf (inf, "%s %d", path, &block_size) == 2) { - mf = mf_open(0, path, block_size, 1); - cf = cf_open(mf, name, path, block_size, 0, &first_time); + mf = mf_open (bfs->register_area, path, block_size, 1); + cf = cf_open (mf, bfs->commit_area, path, block_size, 0, &first_time); cf_commit (cf); @@ -142,3 +315,35 @@ void bf_commit (const char *name) } fclose (inf); } + +void bf_commitClean (BFiles bfs, const char *spec) +{ + FILE *inf; + int block_size; + char path[256]; + MFile mf; + CFile cf; + int mustDisable = 0; + int firstTime; + + if (!bfs->commit_area) + { + bf_cache (bfs, spec); + mustDisable = 1; + } + + if (!(inf = open_cache (bfs, "rb"))) + return ; + while (fscanf (inf, "%s %d", path, &block_size) == 2) + { + mf = mf_open (bfs->register_area, path, block_size, 0); + cf = cf_open (mf, bfs->commit_area, path, block_size, 1, &firstTime); + cf_unlink (cf); + cf_close (cf); + mf_close (mf); + } + fclose (inf); + unlink_cache (bfs); + if (mustDisable) + bf_cache (bfs, 0); +}