X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=ce6972d8f23acb0a5fea0d3bd65ae0ac4858ae7b;hb=eb2b742588ce07fb4516bbca22c93b938b13e433;hp=b38ff42f916c311b42e94cc72c332945af4eae27;hpb=ac2780bc12c8c2fce4c5e2bfe4c4dbb58616b8e2;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index b38ff42..ce6972d 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.25  1997-10-27 14:25:38  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
@@ -85,7 +106,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -103,10 +124,15 @@ struct BFiles_struct {
 
 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;
 }
 
@@ -146,7 +172,7 @@ void bf_lockDir (BFiles bfs, const char *lockDir)
     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] != '/')
@@ -166,6 +192,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);
@@ -175,7 +202,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)
     {
@@ -188,7 +215,7 @@ BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag)
         {
             FILE *outf;
 
-            outf = open_cache (bfs, "a");
+            outf = open_cache (bfs, "ab");
             if (!outf)
             {
                 logf (LOG_FATAL|LOG_ERRNO, "open %scache",
@@ -210,30 +237,43 @@ 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)
 {
     FILE *inf;
 
-    inf = open_cache (bfs, "r");
+    inf = open_cache (bfs, "rb");
     if (inf)
     {
         fclose (inf);
@@ -242,6 +282,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;
@@ -252,7 +298,7 @@ void bf_commitExec (BFiles bfs)
     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 ;
@@ -286,7 +332,7 @@ void bf_commitClean (BFiles bfs, const char *spec)
         mustDisable = 1;
     }
 
-    if (!(inf = open_cache (bfs, "r")))
+    if (!(inf = open_cache (bfs, "rb")))
         return ;
     while (fscanf (inf, "%s %d", path, &block_size) == 2)
     {