X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=ccaf537223655cb29c4f5ea999431e4c6679e679;hb=8d1e93a6c1ecf5e314f4d525731164ad08b75cb6;hp=b5be5b59d8b0732a01a1fa2648d0aa95d6395631;hpb=15cc9ba9f620849435a5096494433b1c4cd9ffe6;p=idzebra-moved-to-github.git diff --git a/bfile/bfile.c b/bfile/bfile.c index b5be5b5..ccaf537 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -4,7 +4,48 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.7 1994-08-23 14:25:45 quinn + * 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 + * Various cleanup. YAZ util used instead. + * + * Revision 1.10 1994/08/25 10:15:54 quinn + * Trivial + * + * Revision 1.9 1994/08/24 08:45:48 quinn + * Using mfile. + * + * Revision 1.8 1994/08/23 15:03:34 quinn + * *** empty log message *** + * + * Revision 1.7 1994/08/23 14:25:45 quinn * Added O_CREAT because some geek wanted it. Sheesh. * * Revision 1.6 1994/08/23 14:21:38 quinn @@ -24,41 +65,207 @@ * */ -#include -#include -#include -#include -#include +#include #include +#include +#include +#include + +#include +#include +#include "cfile.h" + +static MFile_area commit_area = NULL; +static char *commit_lockDir = NULL; + +static FILE *open_cache (const char *flags) +{ + char cacheFilename[1024]; + FILE *file; + + sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : ""); + file = fopen (cacheFilename, flags); + return file; +} + +static void unlink_cache (void) +{ + char cacheFilename[1024]; + + sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : ""); + unlink (cacheFilename); +} + +void bf_lockDir (const char *lockDir) +{ + size_t len; + + xfree (commit_lockDir); + + if (lockDir == NULL) + lockDir = ""; + len = strlen(lockDir); + commit_lockDir = xmalloc (len+2); + strcpy (commit_lockDir, lockDir); + + if (len > 0 && commit_lockDir[len-1] != '/') + strcpy (commit_lockDir + len, "/"); +} + +void bf_cache (int enableFlag) +{ + if (enableFlag) + { + if (!commit_area) + if (res_get (common_resource, "shadow")) + { + commit_area = mf_init ("shadow"); + } + else + { + logf (LOG_FATAL, "Shadow area must be defined if commit" + "is to be enabled"); + exit (1); + } + } + else + commit_area = NULL; +} int bf_close (BFile bf) { - close(bf->fd); - xfree(bf); - return(0); + if (bf->cf) + cf_close (bf->cf); + mf_close (bf->mf); + xfree (bf); + return 0; } BFile bf_open (const char *name, int block_size, int wflag) { BFile tmp = xmalloc(sizeof(BFile_struct)); - if ((tmp->fd = open(name, wflag ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0) + if (commit_area) { - log(LOG_FATAL|LOG_ERRNO, "open"); - return(0); + int first_time; + + tmp->mf = mf_open (0, name, block_size, 0); + tmp->cf = cf_open (tmp->mf, commit_area, name, block_size, + wflag, &first_time); + if (first_time) + { + FILE *outf; + + outf = open_cache ("a"); + if (!outf) + { + logf (LOG_FATAL|LOG_ERRNO, "open %scache", + commit_lockDir ? commit_lockDir : ""); + exit (1); + } + fprintf (outf, "%s %d\n", name, block_size); + fclose (outf); + } + } + else + { + tmp->mf = mf_open(0, name, block_size, wflag); + tmp->cf = NULL; + } + if (!tmp->mf) + { + logf (LOG_FATAL, "mf_open failed for %s", name); + xfree (tmp); + return 0; } - tmp->block_size = block_size; return(tmp); } int bf_read (BFile bf, int no, int offset, int num, void *buf) { - lseek(bf->fd, no * bf->block_size + offset, 0); - return(read(bf->fd, buf, num ? num : bf->block_size)); + 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); } int bf_write (BFile bf, int no, int offset, int num, const void *buf) { - lseek(bf->fd, no * bf->block_size + offset, 0); - return(write(bf->fd, buf, num ? num : bf->block_size)); + if (bf->cf) + return cf_write (bf->cf, no, offset, num, buf); + return mf_write (bf->mf, no, offset, num, buf); +} + +int bf_commitExists (void) +{ + FILE *inf; + + inf = open_cache ("r"); + if (inf) + { + fclose (inf); + return 1; + } + return 0; +} + +void bf_commitExec (void) +{ + FILE *inf; + int block_size; + char path[256]; + MFile mf; + CFile cf; + int first_time; + + assert (commit_area); + if (!(inf = open_cache ("r"))) + { + logf (LOG_LOG, "No commit file"); + return ; + } + while (fscanf (inf, "%s %d", path, &block_size) == 2) + { + mf = mf_open (0, path, block_size, 1); + cf = cf_open (mf, commit_area, path, block_size, 0, &first_time); + + cf_commit (cf); + + cf_close (cf); + mf_close (mf); + } + fclose (inf); +} + +void bf_commitClean (void) +{ + FILE *inf; + int block_size; + char path[256]; + MFile mf; + CFile cf; + int mustDisable = 0; + int firstTime; + + if (!commit_area) + { + bf_cache (1); + mustDisable = 1; + } + + if (!(inf = open_cache ("r"))) + return ; + while (fscanf (inf, "%s %d", path, &block_size) == 2) + { + mf = mf_open (0, path, block_size, 0); + cf = cf_open (mf, commit_area, path, block_size, 1, &firstTime); + cf_unlink (cf); + cf_close (cf); + mf_close (mf); + } + fclose (inf); + unlink_cache (); + if (mustDisable) + bf_cache (0); }