X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=2d9234133bdcbbd88cae08f2fb9ed96da0b7309c;hb=cc9f94a61cbd9dcc0df0cf7d0c7c41d2cec88189;hp=d328d48fd3294a1a2bbadfef3c5440d4d95eeb6f;hpb=45a6ad99e5210bc4ef39bf00d81aee8f0fb26168;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index d328d48..2d92341 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: bfile.c,v $
- * Revision 1.31  1999-12-08 15:03:11  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
@@ -116,15 +122,19 @@
 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 = (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);
@@ -135,7 +145,8 @@ BFiles bfs_create (const char *spec)
 
 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);
@@ -143,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 = (char *) 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;
@@ -189,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);
@@ -214,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);
@@ -233,6 +231,7 @@ 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);
 }
 
@@ -240,16 +239,28 @@ 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, nbytes, buf)) != -1)
-        return r;
-    return mf_read (bf->mf, no, offset, nbytes, 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 nbytes, const void *buf)
 {
+    int r;
+    zebra_lock_rdwr_wlock (&bf->rdwr_lock);
     if (bf->cf)
-        return cf_write (bf->cf, no, offset, nbytes, buf);
-    return mf_write (bf->mf, no, offset, nbytes, 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)