X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcfile.c;h=542b0966a403b3e43bacd63977cc94dd34fb1722;hb=bceca936710690858ea162e7bc22de819f0e280f;hp=0b829c5e69b5a98d0a28a8fed16c39e7d31835b2;hpb=327142accc3f6115431fc838dfc45291259253d7;p=idzebra-moved-to-github.git

diff --git a/bfile/cfile.c b/bfile/cfile.c
index 0b829c5..542b096 100644
--- a/bfile/cfile.c
+++ b/bfile/cfile.c
@@ -1,10 +1,42 @@
 /*
- * Copyright (C) 1995, Index Data I/S 
+ * Copyright (C) 1995-1999, Index Data ApS
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: cfile.c,v $
- * Revision 1.14  1996-04-12 07:01:55  adam
+ * Revision 1.24  1999-05-12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.23  1998/10/15 13:09:29  adam
+ * Minor changes.
+ *
+ * Revision 1.22  1998/10/13 20:07:22  adam
+ * Changed some log messages.
+ *
+ * Revision 1.21  1998/08/24 17:29:52  adam
+ * Minor changes.
+ *
+ * Revision 1.20  1998/08/07 15:07:13  adam
+ * Fixed but in cf_commit_flat.
+ *
+ * Revision 1.19  1997/02/12 20:37:17  adam
+ * Changed the messages logged. No real code changed.
+ *
+ * Revision 1.18  1996/10/29 13:56:15  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.17  1996/04/19 16:49:00  adam
+ * Minor changes.
+ *
+ * Revision 1.16  1996/04/19  16:23:47  adam
+ * Serious bug fix in shadow implementation; function new_bucket might
+ * set wrong bucket number on new bucket.
+ *
+ * Revision 1.15  1996/04/18  16:02:56  adam
+ * Changed logging a bit.
+ * Removed warning message when commiting flat shadow files.
+ *
+ * Revision 1.14  1996/04/12  07:01:55  adam
  * Yet another bug fix (next_block was initialized to 0; now set to 1).
  *
  * Revision 1.13  1996/04/09 14:48:49  adam
@@ -55,7 +87,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <mfile.h>
 #include "cfile.h"
 
@@ -103,11 +135,11 @@ CFile cf_open (MFile mf, MFile_area area, const char *fname,
 {
     char path[1024];
     int i;
-    CFile cf = xmalloc (sizeof(*cf));
+    CFile cf = (CFile) xmalloc (sizeof(*cf));
     int hash_bytes;
    
     cf->rmf = mf; 
-    logf (LOG_LOG, "cf_open %s", cf->rmf->name);
+    logf (LOG_DEBUG, "cf: open %s %s", cf->rmf->name, wflag ? "rdwr" : "rd");
     sprintf (path, "%s-b", fname);
     if (!(cf->block_mf = mf_open (area, path, block_size, wflag)))
     {
@@ -147,6 +179,7 @@ CFile cf_open (MFile mf, MFile_area area, const char *fname,
         assert (cf->head.hash_size > 2);
         hash_bytes = cf->head.hash_size * sizeof(int);
         assert (cf->head.next_bucket > 0);
+        assert (cf->head.next_block > 0);
         if (cf->head.state == 1)
             cf->array = xmalloc (hash_bytes);
         else
@@ -257,13 +290,13 @@ static struct CFile_hash_bucket *get_bucket (CFile cf, int block_no, int hno)
     return p;
 }
 
-static struct CFile_hash_bucket *new_bucket (CFile cf, int *block_no, int hno)
+static struct CFile_hash_bucket *new_bucket (CFile cf, int *block_nop, int hno)
 {
     struct CFile_hash_bucket *p;
-    int i;
+    int i, block_no;
 
-    *block_no = cf->head.next_bucket++;
-    p = alloc_bucket (cf, *block_no, hno);
+    block_no = *block_nop = cf->head.next_bucket++;
+    p = alloc_bucket (cf, block_no, hno);
 
     for (i = 0; i<HASH_BUCKET; i++)
     {
@@ -271,7 +304,7 @@ static struct CFile_hash_bucket *new_bucket (CFile cf, int *block_no, int hno)
         p->ph.no[i] = 0;
     }
     p->ph.next_bucket = 0;
-    p->ph.this_bucket = *block_no;
+    p->ph.this_bucket = block_no;
     p->dirty = 1;
     return p;
 }
@@ -310,6 +343,23 @@ static int cf_lookup_hash (CFile cf, int no)
         }
         if (hb)
             continue;
+#if 0
+        /* extra check ... */
+        for (hb = cf->bucket_lru_back; hb; hb = hb->lru_next)
+        {
+            if (hb->ph.this_bucket == block_no)
+            {
+                logf (LOG_FATAL, "Found hash bucket on other chain (1)");
+                abort ();
+            }
+            for (i = 0; i<HASH_BUCKET && hb->ph.vno[i]; i++)
+                if (hb->ph.no[i] == no)
+                {
+                    logf (LOG_FATAL, "Found hash bucket on other chain (2)");
+                    abort ();
+                }
+        }
+#endif
         (cf->no_miss)++;
         hb = get_bucket (cf, block_no, hno);
         for (i = 0; i<HASH_BUCKET && hb->ph.vno[i]; i++)
@@ -336,8 +386,8 @@ static void cf_moveto_flat (CFile cf)
     struct CFile_hash_bucket *p;
     int i, j;
 
-    logf (LOG_LOG, "Moving to flat shadow: %s", cf->rmf->name);
-    logf (LOG_LOG, "hits=%d miss=%d bucket_in_memory=%d total=%d",
+    logf (LOG_DEBUG, "cf: Moving to flat shadow: %s", cf->rmf->name);
+    logf (LOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=%d total=%d",
 	cf->no_hits, cf->no_miss, cf->bucket_in_memory, 
         cf->head.next_bucket - cf->head.first_bucket);
     assert (cf->head.state == 1);
@@ -360,6 +410,7 @@ static void cf_moveto_flat (CFile cf)
     xfree (cf->parray);
     cf->parray = NULL;
     cf->head.state = 2;
+    cf->dirty = 1;
 }
 
 static int cf_lookup (CFile cf, int no)
@@ -407,6 +458,18 @@ static int cf_new_hash (CFile cf, int no)
             }
         if (hb)
             continue;
+
+#if 0
+        /* extra check ... */
+        for (hb = cf->bucket_lru_back; hb; hb = hb->lru_next)
+        {
+            if (hb->ph.this_bucket == *bucketpp)
+            {
+                logf (LOG_FATAL, "Found hash bucket on other chain");
+                abort ();
+            }
+        }
+#endif
         (cf->no_miss)++;
         hb = get_bucket (cf, *bucketpp, hno);
         assert (hb);
@@ -433,7 +496,7 @@ int cf_new (CFile cf, int no)
 {
     if (cf->head.state > 1)
         return cf_new_flat (cf, no);
-    if (cf->no_miss*5 > cf->no_hits)
+    if (cf->no_miss*2 > cf->no_hits)
     {
         cf_moveto_flat (cf);
         assert (cf->head.state > 1);
@@ -443,14 +506,14 @@ int cf_new (CFile cf, int no)
 }
 
 
-int cf_read (CFile cf, int no, int offset, int num, void *buf)
+int cf_read (CFile cf, int no, int offset, int nbytes, void *buf)
 {
     int block;
     
     assert (cf);
     if (!(block = cf_lookup (cf, no)))
         return -1;
-    if (!mf_read (cf->block_mf, block, offset, num, buf))
+    if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
     {
         logf (LOG_FATAL|LOG_ERRNO, "cf_read no=%d, block=%d", no, block);
         exit (1);
@@ -458,7 +521,7 @@ int cf_read (CFile cf, int no, int offset, int num, void *buf)
     return 1;
 }
 
-int cf_write (CFile cf, int no, int offset, int num, const void *buf)
+int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
 {
     int block;
 
@@ -466,16 +529,16 @@ int cf_write (CFile cf, int no, int offset, int num, const void *buf)
     if (!(block = cf_lookup (cf, no)))
     {
         block = cf_new (cf, no);
-        if (offset || num)
+        if (offset || nbytes)
         {
             mf_read (cf->rmf, no, 0, 0, cf->iobuf);
-            memcpy (cf->iobuf + offset, buf, num);
+            memcpy (cf->iobuf + offset, buf, nbytes);
             buf = cf->iobuf;
             offset = 0;
-            num = 0;
+            nbytes = 0;
         }
     }
-    if (mf_write (cf->block_mf, block, offset, num, buf))
+    if (mf_write (cf->block_mf, block, offset, nbytes, buf))
     {
         logf (LOG_FATAL|LOG_ERRNO, "cf_write no=%d, block=%d", no, block);
         exit (1);
@@ -485,8 +548,7 @@ int cf_write (CFile cf, int no, int offset, int num, const void *buf)
 
 int cf_close (CFile cf)
 {
-    logf (LOG_LOG, "cf_close %s", cf->rmf->name);
-    logf (LOG_LOG, "hits=%d miss=%d bucket_in_memory=%d total=%d",
+    logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=%d total=%d",
           cf->no_hits, cf->no_miss, cf->bucket_in_memory,
           cf->head.next_bucket - cf->head.first_bucket);
     flush_bucket (cf, -1);