X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=684d6b063ef250a050b2af653b3851c4db92ebd0;hb=eb2b742588ce07fb4516bbca22c93b938b13e433;hp=7720bf96040841596402dfcf729167d6db854c57;hpb=bceca936710690858ea162e7bc22de819f0e280f;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 7720bf9..684d6b0 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.33  1999-05-12 13:08:06  adam
+ * Revision 1.37  2000-03-15 15:00:30  adam
+ * First work on threaded version.
+ *
+ * Revision 1.36  1999/12/08 15:03:11  adam
+ * Implemented bf_reset.
+ *
+ * Revision 1.35  1999/10/14 14:33:50  adam
+ * Added truncation 5=106.
+ *
+ * Revision 1.34  1999/05/26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.33  1999/05/12 13:08:06  adam
  * First version of ISAMS.
  *
  * Revision 1.32  1999/04/28 14:53:07  adam
@@ -128,6 +140,7 @@
 #include <assert.h>
 #include <errno.h>
 
+#include <zebra-lock.h>
 #include <zebrautl.h>
 #include <mfile.h>
 
@@ -144,7 +157,8 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
     for (;;)
     {
         const char *ad0 = ad;
-        int i = 0, fact = 1, multi, size = 0;
+        int i = 0, fact = 1, multi;
+	off_t size = 0;
 
         while (*ad == ' ' || *ad == '\t')
             ad++;
@@ -161,12 +175,12 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
         dirname[i] = '\0';
         if (*ad++ != ':')
         {
-	    logf (LOG_FATAL, "Missing colon after path: %s", ad0);
+	    logf (LOG_WARN, "Missing colon after path: %s", ad0);
             return -1;
         }
         if (i == 0)
         {
-	    logf (LOG_FATAL, "Empty path: %s", ad0);
+	    logf (LOG_WARN, "Empty path: %s", ad0);
             return -1;
         }
         while (*ad == ' ' || *ad == '\t')
@@ -189,9 +203,10 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
             size = size*10 + (*ad++ - '0');
         switch (*ad)
 	{
-	    case 'B': case 'b': multi = 1; break;
-	    case 'K': case 'k': multi = 1024; break;
-	    case 'M': case 'm': multi = 1048576; break;
+	case 'B': case 'b': multi = 1; break;
+	case 'K': case 'k': multi = 1024; break;
+	case 'M': case 'm': multi = 1048576; break;
+	case 'G': case 'g': multi = 1073741824; break;
             case '\0':
 	        logf (LOG_FATAL, "Missing unit: %s", ad0);
 		return -1;
@@ -200,7 +215,7 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
 	        return -1;
 	}
         ad++;
-	*dp = dir = xmalloc(sizeof(mf_dir));
+	*dp = dir = (mf_dir *) xmalloc(sizeof(mf_dir));
 	dir->next = 0;
 	strcpy(dir->name, dirname);
 	dir->max_bytes = dir->avail_bytes = fact * size * multi;
@@ -231,13 +246,13 @@ static int file_position(MFile mf, int pos, int offset)
     {
         if (!mf->wr && errno == ENOENT && off == 0)
             return -2;
-    	logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
+    	logf (LOG_WARN|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
     	return -1;
     }
     if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize + offset,
     	SEEK_SET) < 0)
     {
-    	logf (LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
+    	logf (LOG_WARN|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
     	return -1;
     }
     mf->cur_file = c;
@@ -255,7 +270,7 @@ static int cmp_part_file(const void *p1, const void *p2)
  */
 MFile_area mf_init(const char *name, const char *spec)
 {
-    MFile_area ma = xmalloc(sizeof(*ma));
+    MFile_area ma = (MFile_area) xmalloc(sizeof(*ma));
     mf_dir *dirp;
     meta_file *meta_f;
     part_file *part_f = 0;
@@ -270,7 +285,7 @@ MFile_area mf_init(const char *name, const char *spec)
     ma->dirs = 0;
     if (scan_areadef(ma, name, spec) < 0)
     {
-    	logf (LOG_FATAL, "Failed to access description of '%s'", name);
+    	logf (LOG_WARN, "Failed to access description of '%s'", name);
     	return 0;
     }
     /* look at each directory */
@@ -278,7 +293,8 @@ MFile_area mf_init(const char *name, const char *spec)
     {
     	if (!(dd = opendir(dirp->name)))
     	{
-    	    logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", dirp->name);
+    	    logf (LOG_WARN|LOG_ERRNO, "Failed to open directory %s",
+                                     dirp->name);
     	    return 0;
 	}
 	/* look at each file */
@@ -303,7 +319,7 @@ MFile_area mf_init(const char *name, const char *spec)
 	    /* new metafile */
 	    if (!meta_f)
 	    {
-	    	meta_f = xmalloc(sizeof(*meta_f));
+	    	meta_f = (meta_file *) xmalloc(sizeof(*meta_f));
 	    	meta_f->ma = ma;
 	    	meta_f->next = ma->mfiles;
 	    	meta_f->open = 0;
@@ -371,19 +387,44 @@ void mf_destroy(MFile_area ma)
 	{
 	    xfree (m->files[i].path);
 	}
+	zebra_mutex_destroy (&meta_f->mutex);
 	meta_f = meta_f->next;
 	xfree (m);
     }
     xfree (ma);
 }
 
+void mf_reset(MFile_area ma)
+{
+    meta_file *meta_f;
+
+    if (!ma)
+	return;
+    meta_f = ma->mfiles;
+    while (meta_f)
+    {
+	int i;
+	meta_file *m = meta_f;
+
+	assert (!m->open);
+	for (i = 0; i<m->no_files; i++)
+	{
+	    unlink (m->files[i].path);
+	    xfree (m->files[i].path);
+	}
+	meta_f = meta_f->next;
+	xfree (m);
+    }
+    ma->mfiles = 0;
+}
+
 /*
  * Open a metafile.
  * If !ma, Use MF_DEFAULT_AREA.
  */
 MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
 {
-    struct meta_file *mnew;
+    meta_file *mnew;
     int i;
     char tmp[FILENAME_MAX+1];
     mf_dir *dp;
@@ -401,11 +442,13 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
 	}
     if (!mnew)
     {
-    	mnew = xmalloc(sizeof(*mnew));
+    	mnew = (meta_file *) xmalloc(sizeof(*mnew));
     	strcpy(mnew->name, name);
     	/* allocate one, empty file */
+	zebra_mutex_init (&mnew->mutex);
     	mnew->no_files = 1;
-    	mnew->files[0].bytes = mnew->files[0].blocks = 0;
+    	mnew->files[0].bytes = 0;
+	mnew->files[0].blocks = 0;
     	mnew->files[0].top = -1;
     	mnew->files[0].number = 0;
     	mnew->files[0].fd = -1;
@@ -480,6 +523,7 @@ int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
 {
     int rd, toread;
 
+    zebra_mutex_lock (&mf->mutex);
     if ((rd = file_position(mf, no, offset)) < 0)
     {
         if (rd == -2)
@@ -494,7 +538,8 @@ int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
               mf->files[mf->cur_file].path);
     	exit(1);
     }
-    else if (rd < toread)
+    zebra_mutex_unlock (&mf->mutex);
+    if (rd < toread)
     	return 0;
     else
     	return 1;
@@ -510,6 +555,7 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
     char tmp[FILENAME_MAX+1];
     unsigned char dummych = '\xff';
 
+    zebra_mutex_lock (&mf->mutex);
     if ((ps = file_position(mf, no, offset)) < 0)
 	exit(1);
     /* file needs to grow */
@@ -586,6 +632,7 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
 		mf->name, mf->cur_file);
     	exit(1);
     }
+    zebra_mutex_unlock (&mf->mutex);
     return 0;
 }