X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcommit.c;h=8c77b80f29eeed3c6b2f68a2ce37b217a826dbe8;hb=87153cf0749ab9ecb4a6d652e0842957467ffe4b;hp=216825cde063ced933871f5687490c052144cb14;hpb=d75b9accf5a28bd5d8ffd70bbb33b3e8e009d079;p=idzebra-moved-to-github.git

diff --git a/bfile/commit.c b/bfile/commit.c
index 216825c..8c77b80 100644
--- a/bfile/commit.c
+++ b/bfile/commit.c
@@ -4,22 +4,51 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: commit.c,v $
- * Revision 1.1  1995-11-30 08:33:13  adam
+ * Revision 1.6  1995-12-15 12:36:53  adam
+ * Moved hash file information to union.
+ * Renamed commit files.
+ *
+ * Revision 1.5  1995/12/12  15:57:55  adam
+ * Implemented mf_unlink. cf_unlink uses mf_unlink.
+ *
+ * Revision 1.4  1995/12/11  09:03:55  adam
+ * New function: cf_unlink.
+ * New member of commit file head: state (0) deleted, (1) hash file.
+ *
+ * Revision 1.3  1995/12/01  16:24:29  adam
+ * Commit files use separate meta file area.
+ *
+ * Revision 1.2  1995/12/01  11:37:24  adam
+ * Cached/commit files implemented as meta-files.
+ *
+ * Revision 1.1  1995/11/30  08:33:13  adam
  * Started work on commit facility.
  *
  */
 
 #include <assert.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <alexutil.h>
+#include <stdlib.h>
 
+#include <alexutil.h>
 #include <mfile.h>
 #include "cfile.h"
 
+void cf_unlink (CFile cf)
+{
+    if (cf->bucket_in_memory)
+    {
+        logf (LOG_FATAL, "Cannot unlink potential dirty cache");
+        exit (1);
+    }
+    cf->head.state = 0;
+    cf->dirty = 1;
+    mf_unlink (cf->block_mf);
+    mf_unlink (cf->hash_mf);
+}
+
 void cf_commit (CFile cf)
 {
-    int i, r, bucket_no;
+    int i, bucket_no;
     int hash_bytes;
     struct CFile_ph_bucket *p;
 
@@ -29,36 +58,23 @@ void cf_commit (CFile cf)
         exit (1);
     }
     p = xmalloc (sizeof(*p));
-    hash_bytes = cf->head.hash_size * sizeof(int);
+    hash_bytes = cf->head.u.hash.hash_size * sizeof(int);
     bucket_no = (hash_bytes+sizeof(cf->head))/HASH_BSIZE + 2;
-    if (lseek (cf->hash_fd, bucket_no * HASH_BSIZE, SEEK_SET) < 0)
-    {
-        logf (LOG_FATAL|LOG_ERRNO, "seek commit");
-        exit (1);
-    }
-    for (; bucket_no < cf->head.next_bucket; bucket_no++)
+    for (; bucket_no < cf->head.u.hash.next_bucket; bucket_no++)
     {
-        r = read (cf->hash_fd, p, HASH_BSIZE);
-        if (r != HASH_BSIZE)
+        if (!mf_read (cf->hash_mf, bucket_no, 0, 0, p))
         {
             logf (LOG_FATAL, "read commit hash");
             exit (1);
         }
         for (i = 0; i<HASH_BUCKET && p->vno[i]; i++)
         {
-            if (lseek (cf->block_fd, p->vno[i]*cf->head.block_size,
-                SEEK_SET) < 0)
-            {
-                logf (LOG_FATAL, "lseek commit block");
-                exit (1);
-            }
-            r = read (cf->block_fd, cf->iobuf, cf->head.block_size);
-            if (r != cf->head.block_size)
+            if (!mf_read (cf->block_mf, p->vno[i], 0, 0, cf->iobuf))
             {
                 logf (LOG_FATAL, "read commit block");
                 exit (1);
             }
-            mf_write (cf->mf, p->no[i], 0, 0, cf->iobuf);
+            mf_write (cf->rmf, p->no[i], 0, 0, cf->iobuf);
         }
     }
     xfree (p);