/*
- * 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.24 1997-09-18 08:59:16 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
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
BFiles bfs_create (const char *spec)
{
- 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;
+ 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);
if (lockDir == NULL)
lockDir = "";
len = strlen(lockDir);
- bfs->lockDir = xmalloc (len+2);
+ bfs->lockDir = (char *) xmalloc (len+2);
strcpy (bfs->lockDir, lockDir);
if (len > 0 && bfs->lockDir[len-1] != '/')
int bf_close (BFile bf)
{
+ zebra_lock_rdwr_destroy (&bf->rdwr_lock);
if (bf->cf)
cf_close (bf->cf);
mf_close (bf->mf);
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)
{
{
FILE *outf;
- outf = open_cache (bfs, "a");
+ outf = open_cache (bfs, "ab");
if (!outf)
{
logf (LOG_FATAL|LOG_ERRNO, "open %scache",
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, "r");
+ inf = open_cache (bfs, "rb");
if (inf)
{
fclose (inf);
return 0;
}
+void bf_reset (BFiles bfs)
+{
+ mf_reset (bfs->commit_area);
+ mf_reset (bfs->register_area);
+}
+
void bf_commitExec (BFiles bfs)
{
FILE *inf;
int first_time;
assert (bfs->commit_area);
- if (!(inf = open_cache (bfs, "r")))
+ if (!(inf = open_cache (bfs, "rb")))
{
logf (LOG_LOG, "No commit file");
return ;
mustDisable = 1;
}
- if (!(inf = open_cache (bfs, "r")))
+ if (!(inf = open_cache (bfs, "rb")))
return ;
while (fscanf (inf, "%s %d", path, &block_size) == 2)
{