/*
- * 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.21 1996-10-29 13:56:13 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
+ * 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
#include <stdlib.h>
#include <string.h>
#include <assert.h>
+#ifdef WIN32
+#include <io.h>
+#else
#include <unistd.h>
+#endif
#include <zebrautl.h>
#include <bfile.h>
#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)
+{
+ 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 (LOG_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 (LOG_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);
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 : "");
+ logf (LOG_FATAL|LOG_ERRNO, "open %s", bfs->cache_fname);
exit (1);
}
fprintf (outf, "%s %d\n", name, block_size);
}
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)
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 (void)
+int bf_commitExists (BFiles bfs)
{
FILE *inf;
- inf = open_cache ("r");
+ inf = open_cache (bfs, "rb");
if (inf)
{
fclose (inf);
return 0;
}
-void bf_commitExec (void)
+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;
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");
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);
fclose (inf);
}
-void bf_commitClean (void)
+void bf_commitClean (BFiles bfs, const char *spec)
{
FILE *inf;
int block_size;
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);
}
projects / idzebra-moved-to-github.git / blobdiff