X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fmfile.h;h=81fd99e0c27ec15c1318e52dbfa59b63e934e203;hp=cc34f9edc3c99cc3ef040e6f3aae9a4ba4c2bd07;hb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;hpb=231ae24dce5e113aab05f17deb60344957d3622a

diff --git a/include/mfile.h b/include/mfile.h
index cc34f9e..81fd99e 100644
--- a/include/mfile.h
+++ b/include/mfile.h
@@ -1,51 +1,43 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: mfile.h,v $
- * Revision 1.6  1996-10-29 13:46:10  adam
- * Removed obsolete headers alexpath, alexutil. Created zebrautl.h as
- * a replacement.
- *
- * Revision 1.5  1995/12/05 11:15:03  quinn
- * Fixed FILENAME_MAX for some Sun systems, hopefully.
- *
- * Revision 1.4  1995/11/30  08:33:30  adam
- * Started work on commit facility.
- *
- * Revision 1.3  1995/09/04  12:33:35  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.2  1994/09/14  13:10:36  quinn
- * Small changes
- *
- * Revision 1.1  1994/08/23  14:41:46  quinn
- * First functional version of mfile.
- *
+ * $Id: mfile.h,v 1.17 2002-04-04 14:14:13 adam Exp $
  */
 
 #ifndef MFILE_H
 #define MFILE_H
 
 #include <stdio.h>
+#include <yaz/yconfig.h>
+
+#ifdef WIN32
+typedef long off_t;
+#else
+#include <sys/types.h>
+#endif
 
 #ifndef FILENAME_MAX
 #include <sys/param.h>
 #define FILENAME_MAX MAXPATHLEN
 #endif
 
+#include <zebra-lock.h>
+
+YAZ_BEGIN_CDECL
+
 #define MF_MIN_BLOCKS_CREAT 1          /* minimum free blocks in new dir */
-#define MF_DEFAULT_AREA "register"      /* Use if no mf_init */
 #define MF_MAX_PARTS 28                 /* max # of part-files per metafile */
 
 #define mf_blocksize(mf) ((mf)->blocksize)
 
+
 typedef struct mf_dir
 {
     char name[FILENAME_MAX+1];
-    int max_bytes;      /* allocated bytes in this dir. */
-    int avail_bytes;    /* bytes left */
+    off_t max_bytes;      /* allocated bytes in this dir. */
+    off_t avail_bytes;    /* bytes left */
     struct mf_dir *next;
 } mf_dir;
 
@@ -54,7 +46,7 @@ typedef struct part_file
     int number;
     int top;
     int blocks;
-    int bytes;
+    off_t bytes;
     mf_dir *dir;
     char *path;
     int fd;
@@ -70,10 +62,11 @@ typedef struct meta_file
     int no_files;
     int cur_file;
     int open;                          /* is this file open? */
-    int blocksize;
-    int min_bytes_creat;  /* minimum bytes required to enter directory */
+    off_t blocksize;
+    off_t min_bytes_creat;  /* minimum bytes required to enter directory */
     MFile_area ma;
     int wr;
+    Zebra_mutex mutex;
 
     struct meta_file *next;
 } *MFile, meta_file;
@@ -84,17 +77,18 @@ typedef struct MFile_area_struct
     mf_dir *dirs;
     struct meta_file *mfiles;
     struct MFile_area_struct *next;  /* global list of active areas */
+    Zebra_mutex mutex;
 } MFile_area_struct;
 
 /*
  * Open an area, cotaining metafiles in directories.
  */
-MFile_area mf_init(const char *name); 
+MFile_area mf_init(const char *name, const char *spec, const char *base); 
 
 /*
  * Release an area.
  */
-int mf_dispose(MFile_area ma);
+void mf_destroy(MFile_area ma);
 
 /*
  * Open a metafile.
@@ -109,21 +103,29 @@ int mf_close(MFile mf);
 /*
  * Read one block from a metafile. Interface mirrors bfile.
  */
-int mf_read(MFile mf, int no, int offset, int num, void *buf);
+int mf_read(MFile mf, int no, int offset, int nbytes, void *buf);
 
 /*
  * Same.
  */
-int mf_write(MFile mf, int no, int offset, int num, const void *buf);
+int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf);
 
 /*
  * Destroy a metafile, unlinking component files. File must be open.
  */
 int mf_unlink(MFile mf);
 
+
+/*
+ * Destroy all metafiles. No files may be opened.
+ */
+void mf_reset(MFile_area ma);
+
 /*
  * Unlink the file by name, rather than MFile-handle.
  */
 int mf_unlink_name(MFile_area, const char *name);
 
+YAZ_END_CDECL
+
 #endif