X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=2d9234133bdcbbd88cae08f2fb9ed96da0b7309c;hb=cc9f94a61cbd9dcc0df0cf7d0c7c41d2cec88189;hp=eb59b4a10d922be376ca010a5f630b4805fadd39;hpb=247f1ebfc107315f1c0b2b59bb59fe4774f3b0d4;p=idzebra-moved-to-github.git diff --git a/bfile/bfile.c b/bfile/bfile.c index eb59b4a..2d92341 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,10 +1,31 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.26 1998-02-17 10:32:52 adam + * Revision 1.33 2002-04-04 14:14:13 adam + * Multiple registers (alpha early) + * + * 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 @@ -88,7 +109,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -101,21 +122,31 @@ struct BFiles_struct { MFile_area commit_area; MFile_area_struct *register_area; - char *lockDir; + char *base; + char *cache_fname; }; -BFiles bfs_create (const char *spec) +BFiles bfs_create (const char *spec, const char *base) { - BFiles bfs = xmalloc (sizeof(*bfs)); + BFiles bfs = (BFiles) xmalloc (sizeof(*bfs)); bfs->commit_area = NULL; - bfs->register_area = mf_init("register", spec); - bfs->lockDir = NULL; + bfs->base = 0; + bfs->cache_fname = 0; + if (base) + bfs->base = xstrdup (base); + bfs->register_area = mf_init("register", spec, base); + if (!bfs->register_area) + { + bfs_destroy(bfs); + return 0; + } return bfs; } void bfs_destroy (BFiles bfs) { - xfree (bfs->lockDir); + xfree (bfs->cache_fname); + xfree (bfs->base); mf_destroy (bfs->commit_area); mf_destroy (bfs->register_area); xfree (bfs); @@ -123,45 +154,32 @@ void bfs_destroy (BFiles 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); + file = fopen (bfs->cache_fname, 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 = xmalloc (len+2); - strcpy (bfs->lockDir, lockDir); - - if (len > 0 && bfs->lockDir[len-1] != '/') - strcpy (bfs->lockDir + len, "/"); + unlink (bfs->cache_fname); } void bf_cache (BFiles bfs, const char *spec) { if (spec) { + yaz_log (LOG_LOG, "enabling cache spec=%s", spec); if (!bfs->commit_area) - bfs->commit_area = mf_init ("shadow", spec); + bfs->commit_area = mf_init ("shadow", spec, bfs->base); + if (bfs->commit_area) + { + bfs->cache_fname = xmalloc (strlen(bfs->commit_area->dirs->name)+ + 8); + strcpy (bfs->cache_fname, bfs->commit_area->dirs->name); + strcat (bfs->cache_fname, "/cache"); + yaz_log (LOG_LOG, "cache_fname = %s", bfs->cache_fname); + } } else bfs->commit_area = NULL; @@ -169,6 +187,7 @@ void bf_cache (BFiles bfs, const char *spec) int bf_close (BFile bf) { + zebra_lock_rdwr_destroy (&bf->rdwr_lock); if (bf->cf) cf_close (bf->cf); mf_close (bf->mf); @@ -178,7 +197,7 @@ int bf_close (BFile bf) 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 (bfs->commit_area) { @@ -194,8 +213,7 @@ BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag) outf = open_cache (bfs, "ab"); if (!outf) { - logf (LOG_FATAL|LOG_ERRNO, "open %scache", - bfs->lockDir ? bfs->lockDir : ""); + logf (LOG_FATAL|LOG_ERRNO, "open %s", bfs->cache_fname); exit (1); } fprintf (outf, "%s %d\n", name, block_size); @@ -213,23 +231,36 @@ BFile bf_open (BFiles bfs, 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) @@ -245,6 +276,12 @@ int bf_commitExists (BFiles bfs) return 0; } +void bf_reset (BFiles bfs) +{ + mf_reset (bfs->commit_area); + mf_reset (bfs->register_area); +} + void bf_commitExec (BFiles bfs) { FILE *inf;