X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fbfile.c;h=3ba061e17a1be4250b5934e5d658ecc1b26258c0;hp=d1a684ad413d6555f51e67ecf3cdc10dda2e6a72;hb=5437b50633032595afe6f87dc0f989bc92a5aea8;hpb=e127268c91736bf5a116cbc24653da4b845ca046 diff --git a/bfile/bfile.c b/bfile/bfile.c index d1a684a..3ba061e 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,142 +1,113 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: bfile.c,v $ - * 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 - * 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 - * Fixed call to log - * - * Revision 1.5 1994/08/18 08:10:08 quinn - * Minimal changes - * - * Revision 1.4 1994/08/17 14:27:32 quinn - * last mods - * - * Revision 1.2 1994/08/17 14:09:32 quinn - * Compiles cleanly (still only dummy). - * - * Revision 1.1 1994/08/17 13:55:08 quinn - * New blocksystem. dummy only - * - */ +/* $Id: bfile.c,v 1.37 2004-11-19 10:26:53 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #include #include +#ifdef WIN32 +#include +#else #include +#endif #include #include + #include "cfile.h" -static MFile_area commit_area = NULL; -static char *commit_lockDir = NULL; +struct BFiles_struct { + MFile_area commit_area; + MFile_area_struct *register_area; + char *base; + char *cache_fname; +}; -static FILE *open_cache (const char *flags) +BFiles bfs_create (const char *spec, const char *base) { - char cacheFilename[1024]; - FILE *file; + BFiles bfs = (BFiles) xmalloc (sizeof(*bfs)); + bfs->commit_area = 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; +} - sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : ""); - file = fopen (cacheFilename, flags); - return file; +void bfs_destroy (BFiles bfs) +{ + if (!bfs) + return; + xfree (bfs->cache_fname); + xfree (bfs->base); + mf_destroy (bfs->commit_area); + mf_destroy (bfs->register_area); + xfree (bfs); } -static void unlink_cache (void) +static FILE *open_cache (BFiles bfs, const char *flags) { - char cacheFilename[1024]; + FILE *file; - sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : ""); - unlink (cacheFilename); + file = fopen (bfs->cache_fname, flags); + return file; } -void bf_lockDir (const char *lockDir) +static void unlink_cache (BFiles bfs) { - 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, "/"); + unlink (bfs->cache_fname); } -void bf_cache (int enableFlag) +void bf_cache (BFiles bfs, const char *spec) { - if (enableFlag) + if (spec) { - 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); - } + yaz_log (YLOG_LOG, "enabling cache spec=%s", spec); + if (!bfs->commit_area) + 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 (YLOG_LOG, "cache_fname = %s", bfs->cache_fname); + } } else - commit_area = NULL; + 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); @@ -144,26 +115,25 @@ 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 (commit_area) + if (bfs->commit_area) { int first_time; - tmp->mf = mf_open (0, name, block_size, 0); - tmp->cf = cf_open (tmp->mf, commit_area, name, block_size, + 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) { FILE *outf; - outf = open_cache ("a"); + outf = open_cache (bfs, "ab"); if (!outf) { - logf (LOG_FATAL|LOG_ERRNO, "open %scache", - commit_lockDir ? commit_lockDir : ""); + yaz_log (YLOG_FATAL|YLOG_ERRNO, "open %s", bfs->cache_fname); exit (1); } fprintf (outf, "%s %d\n", name, block_size); @@ -172,39 +142,52 @@ BFile bf_open (const char *name, int block_size, int wflag) } 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) { - logf (LOG_FATAL, "mf_open failed for %s", name); + yaz_log (YLOG_FATAL, "mf_open failed for %s", name); 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, zint 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, zint 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 (void) +int bf_commitExists (BFiles bfs) { FILE *inf; - inf = open_cache ("r"); + inf = open_cache (bfs, "rb"); if (inf) { fclose (inf); @@ -213,7 +196,15 @@ int bf_commitExists (void) return 0; } -void bf_commitExec (void) +void bf_reset (BFiles bfs) +{ + if (!bfs) + return; + mf_reset (bfs->commit_area); + mf_reset (bfs->register_area); +} + +void bf_commitExec (BFiles bfs) { FILE *inf; int block_size; @@ -222,16 +213,16 @@ void bf_commitExec (void) CFile cf; int first_time; - assert (commit_area); - if (!(inf = open_cache ("r"))) + assert (bfs->commit_area); + if (!(inf = open_cache (bfs, "rb"))) { - logf (LOG_LOG, "No commit file"); + yaz_log (YLOG_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); + 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); @@ -241,7 +232,7 @@ void bf_commitExec (void) fclose (inf); } -void bf_commitClean (void) +void bf_commitClean (BFiles bfs, const char *spec) { FILE *inf; int block_size; @@ -251,24 +242,24 @@ void bf_commitClean (void) int mustDisable = 0; int firstTime; - if (!commit_area) + if (!bfs->commit_area) { - bf_cache (1); + bf_cache (bfs, spec); mustDisable = 1; } - if (!(inf = open_cache ("r"))) + if (!(inf = open_cache (bfs, "rb"))) 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); + 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 (); + unlink_cache (bfs); if (mustDisable) - bf_cache (0); + bf_cache (bfs, 0); }