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

diff --git a/bfile/cfile.c b/bfile/cfile.c
index c1fd26f..542b096 100644
--- a/bfile/cfile.c
+++ b/bfile/cfile.c
@@ -1,10 +1,34 @@
 /*
- * 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.16  1996-04-19 16:23:47  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.
  *
@@ -63,7 +87,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <mfile.h>
 #include "cfile.h"
 
@@ -111,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 %s", cf->rmf->name, wflag ? "rdwr" : "rd");
+    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)))
     {
@@ -183,11 +207,7 @@ CFile cf_open (MFile mf, MFile_area area, const char *fname,
 
 static int cf_hash (CFile cf, int no)
 {
-#if 1
     return (no>>3) % cf->head.hash_size;
-#else
-    return (no/(HASH_BUCKET*2+2)) % cf->head.hash_size;
-#endif
 }
 
 static void release_bucket (CFile cf, struct CFile_hash_bucket *p)
@@ -323,7 +343,7 @@ static int cf_lookup_hash (CFile cf, int no)
         }
         if (hb)
             continue;
-#if 1
+#if 0
         /* extra check ... */
         for (hb = cf->bucket_lru_back; hb; hb = hb->lru_next)
         {
@@ -366,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);
@@ -439,7 +459,7 @@ static int cf_new_hash (CFile cf, int no)
         if (hb)
             continue;
 
-#if 1
+#if 0
         /* extra check ... */
         for (hb = cf->bucket_lru_back; hb; hb = hb->lru_next)
         {
@@ -486,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);
@@ -501,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;
 
@@ -509,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);
@@ -528,18 +548,15 @@ int cf_write (CFile cf, int no, int offset, int num, const void *buf)
 
 int cf_close (CFile cf)
 {
-    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);
     if (cf->dirty)
     {
-        logf (LOG_LOG, "cf_close %s, dirty", cf->rmf->name);
         mf_write (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head);
         write_head (cf);
     }
-    else
-        logf (LOG_LOG, "cf_close %s", cf->rmf->name);
     mf_close (cf->hash_mf);
     mf_close (cf->block_mf);
     xfree (cf->array);