X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcfile.c;h=92413852ead477631f33b6d71c93724b42d53a95;hb=c76d814c4ebc9ec7fc962c900cb4b48ed58a4f30;hp=2c5d06bb0c826a27cfaf8dc52e85dbea48977dba;hpb=2a2f94560670aad22d976bd986ca67ec891aac28;p=idzebra-moved-to-github.git

diff --git a/bfile/cfile.c b/bfile/cfile.c
index 2c5d06b..9241385 100644
--- a/bfile/cfile.c
+++ b/bfile/cfile.c
@@ -1,72 +1,26 @@
-/*
- * Copyright (C) 1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: cfile.c,v $
- * 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
- * Bug fix: offset calculation when using flat files was completely broken.
- *
- * Revision 1.12  1996/04/09  06:47:28  adam
- * Function scan_areadef doesn't use sscanf (%n fails on this Linux).
- *
- * Revision 1.11  1996/03/26 15:59:05  adam
- * The directory of the shadow table file can be specified by the new
- * bf_lockDir call.
- *
- * Revision 1.10  1996/02/07  14:03:46  adam
- * Work on flat indexed shadow files.
- *
- * Revision 1.9  1996/02/07  10:08:43  adam
- * Work on flat shadow (not finished yet).
- *
- * Revision 1.8  1995/12/15  12:36:52  adam
- * Moved hash file information to union.
- * Renamed commit files.
- *
- * Revision 1.7  1995/12/15  10:35:07  adam
- * Changed names of commit files.
- *
- * Revision 1.6  1995/12/11  09:03:53  adam
- * New function: cf_unlink.
- * New member of commit file head: state (0) deleted, (1) hash file.
- *
- * Revision 1.5  1995/12/08  16:21:14  adam
- * Work on commit/update.
- *
- * Revision 1.4  1995/12/01  16:24:28  adam
- * Commit files use separate meta file area.
- *
- * Revision 1.3  1995/12/01  11:37:22  adam
- * Cached/commit files implemented as meta-files.
- *
- * Revision 1.2  1995/11/30  17:00:49  adam
- * Several bug fixes. Commit system runs now.
- *
- * Revision 1.1  1995/11/30  08:33:11  adam
- * Started work on commit facility.
- *
- */
+/* $Id: cfile.c,v 1.27 2002-08-02 19:26:55 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <assert.h>
 #include <stdlib.h>
@@ -84,7 +38,7 @@ static int write_head (CFile cf)
 
     if (!tab)
         return 0;
-    while (left >= HASH_BSIZE)
+    while (left >= (int) HASH_BSIZE)
     {
         mf_write (cf->hash_mf, bno++, 0, 0, tab);
         tab += HASH_BSIZE;
@@ -103,7 +57,7 @@ static int read_head (CFile cf)
 
     if (!tab)
         return 0;
-    while (left >= HASH_BSIZE)
+    while (left >= (int) HASH_BSIZE)
     {
         mf_read (cf->hash_mf, bno++, 0, 0, tab);
         tab += HASH_BSIZE;
@@ -120,11 +74,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)))
     {
@@ -151,7 +105,7 @@ CFile cf_open (MFile mf, MFile_area area, const char *fname,
         cf->head.next_block = 1;
         if (wflag)
             mf_write (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head);
-        cf->array = xmalloc (hash_bytes);
+        cf->array = (int *) xmalloc (hash_bytes);
         for (i = 0; i<cf->head.hash_size; i++)
             cf->array[i] = 0;
         if (wflag)
@@ -166,14 +120,15 @@ CFile cf_open (MFile mf, MFile_area area, const char *fname,
         assert (cf->head.next_bucket > 0);
         assert (cf->head.next_block > 0);
         if (cf->head.state == 1)
-            cf->array = xmalloc (hash_bytes);
+            cf->array = (int *) xmalloc (hash_bytes);
         else
             cf->array = NULL;
         read_head (cf);
     }
     if (cf->head.state == 1)
     {
-        cf->parray = xmalloc (cf->head.hash_size * sizeof(*cf->parray));
+        cf->parray = (struct CFile_hash_bucket **)
+	    xmalloc (cf->head.hash_size * sizeof(*cf->parray));
         for (i = 0; i<cf->head.hash_size; i++)
             cf->parray[i] = NULL;
     }
@@ -183,10 +138,11 @@ CFile cf_open (MFile mf, MFile_area area, const char *fname,
     cf->bucket_in_memory = 0;
     cf->max_bucket_in_memory = 100;
     cf->dirty = 0;
-    cf->iobuf = xmalloc (cf->head.block_size);
+    cf->iobuf = (char *) xmalloc (cf->head.block_size);
     memset (cf->iobuf, 0, cf->head.block_size);
     cf->no_hits = 0;
     cf->no_miss = 0;
+    zebra_mutex_init (&cf->mutex);
     return cf;
 }
 
@@ -241,7 +197,7 @@ static struct CFile_hash_bucket *alloc_bucket (CFile cf, int block_no, int hno)
         flush_bucket (cf, 1);
     assert (cf->bucket_in_memory < cf->max_bucket_in_memory);
     ++(cf->bucket_in_memory);
-    p = xmalloc (sizeof(*p));
+    p = (struct CFile_hash_bucket *) xmalloc (sizeof(*p));
 
     p->lru_next = NULL;
     p->lru_prev = cf->bucket_lru_front;
@@ -371,14 +327,14 @@ static void cf_moveto_flat (CFile cf)
     struct CFile_hash_bucket *p;
     int i, j;
 
-    logf (LOG_LOG, "cf: Moving to flat shadow: %s", cf->rmf->name);
-    logf (LOG_LOG, "cf: 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);
     flush_bucket (cf, -1);
     assert (cf->bucket_in_memory == 0);
-    p = xmalloc (sizeof(*p));
+    p = (struct CFile_hash_bucket *) xmalloc (sizeof(*p));
     for (i = cf->head.first_bucket; i < cf->head.next_bucket; i++)
     {
         if (!mf_read (cf->hash_mf, i, 0, 0, &p->ph))
@@ -491,14 +447,19 @@ 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);
+    zebra_mutex_lock (&cf->mutex);
     if (!(block = cf_lookup (cf, no)))
+    {
+	zebra_mutex_unlock (&cf->mutex);
         return -1;
-    if (!mf_read (cf->block_mf, block, offset, num, buf))
+    }
+    zebra_mutex_unlock (&cf->mutex);
+    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);
@@ -506,24 +467,26 @@ 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;
 
     assert (cf);
+    zebra_mutex_lock (&cf->mutex);
     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))
+    zebra_mutex_unlock (&cf->mutex);
+    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);
@@ -533,7 +496,7 @@ int cf_write (CFile cf, int no, int offset, int num, const void *buf)
 
 int cf_close (CFile cf)
 {
-    logf (LOG_DEBUG, "cf: 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);
@@ -547,6 +510,7 @@ int cf_close (CFile cf)
     xfree (cf->array);
     xfree (cf->parray);
     xfree (cf->iobuf);
+    zebra_mutex_destroy (&cf->mutex);
     xfree (cf);
     return 0;
 }