X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fbfile.h;h=018a8d6f4cf6c3172c70fee8cff7148cc6849925;hb=a20e59c5087fb92c419f2330c786367f9ce8ccd2;hp=bae4b037e9299a57d05cbd6b7d418cb0ccf2b49a;hpb=69ae704e275bf69059f261e63635c96e9fa6eab1;p=idzebra-moved-to-github.git

diff --git a/include/bfile.h b/include/bfile.h
index bae4b03..018a8d6 100644
--- a/include/bfile.h
+++ b/include/bfile.h
@@ -1,56 +1,76 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: bfile.h,v $
- * Revision 1.1  1994-08-16 16:16:02  adam
- * bfile header created.
- *
+ * $Id: bfile.h,v 1.20 2002-04-04 14:14:13 adam Exp $
  */
 
 #ifndef BFILE_H
 #define BFILE_H
-struct BFile_block
-{
-    struct BFile_block *h_next, **h_prev;
-    struct BFile_block *lru_next, *lru_prev;
-    void *data;
-    int dirty;
-    int no;
-};
+
+#include <mfile.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define bf_blocksize(bf) mf_blocksize(bf->mf)
+
+typedef struct BFiles_struct *BFiles;
+
+BFiles bfs_create (const char *spec, const char *base);
+void bfs_destroy (BFiles bfiles);
 
 typedef struct BFile_struct
 {
-    int fd;
-    int block_size;
-    int cache;
-    struct BFile_block *all_blocks;
-    struct BFile_block *free_list;
-    struct BFile_block **hash_array;
+    MFile mf;
+    Zebra_lock_rdwr rdwr_lock;
+    struct CFile_struct *cf;
+} *BFile, BFile_struct;
 
-    struct BFile_block *lru_back, *lru_front;
-    int hash_size;
-    void *all_data;
+/* bf_close: closes bfile.
+   returns 0 if successful; non-zero otherwise 
+ */
+int bf_close (BFile);
 
-    int  hits;
-    int  misses;
-} *BFile;
+/* bf_open: opens bfile.
+   opens bfile with name 'name' and with 'block_size' as block size.
+   returns bfile handle is successful; NULL otherwise 
+ */
+BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag);
 
-int bf_close (BFile);
-BFile bf_open (const char *name, int block_size, int cache);
-BFile bf_open_w (const char *name, int block_size, int cache);
-int bf_read (BFile bf, int no, void *buf);
-int bf_write (BFile bf, int no, const void *buf);
+/* bf_read: reads bytes from bfile 'bf'.
+   reads 'nbytes' bytes (or whole block if 0) from offset 'offset' from
+   block 'no'. stores contents in buffer 'buf'.
+   returns 1 if whole block could be read; 0 otherwise.
+ */
+int bf_read (BFile bf, int no, int offset, int nbytes, void *buf);
+
+/* bf_write: writes bytes to bfile 'bf'.
+   writes 'nbytes' bytes (or whole block if 0) at offset 'offset' to
+   block 'no'. retrieves contents from buffer 'buf'.
+   returns 0 if successful; non-zero otherwise.
+ */
+int bf_write (BFile bf, int no, int offset, int nbytes, const void *buf);
 
-int bf_readp (BFile bf, int no, void **bufp);
-int bf_newp (BFile bf, int no, void **bufp);
-int bf_touch (BFile bf, int no);
-void bf_flush_blocks (BFile bf, int no_to_flush);
+/* bf_cache: enables bfile cache if spec is not NULL */
+void bf_cache (BFiles bfs, const char *spec);
 
-void *xmalloc_f (size_t size);
-#define xmalloc(x) xmalloc_f(x)
+/* bf_commitExists: returns 1 if commit is pending; 0 otherwise */
+int bf_commitExists (BFiles bfs);
 
-extern char *prog;
+/* bf_commitExec: executes commit */
+void bf_commitExec (BFiles bfs);
+
+/* bf_commitClean: cleans commit files, etc */
+void bf_commitClean (BFiles bfs, const char *spec);
+
+/* bf_reset: delete register and shadow completely */
+void bf_reset (BFiles bfs);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif