projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On Unix, zebra/z'mbol uses automake.
[idzebra-moved-to-github.git]
/
include
/
mfile.h
diff --git
a/include/mfile.h
b/include/mfile.h
index
a2822bc
..
26c9300
100644
(file)
--- a/
include/mfile.h
+++ b/
include/mfile.h
@@
-1,26
+1,27
@@
/*
/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: mfile.h,v $
- * 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.14 2000-03-20 19:08:36 adam Exp $
*/
#ifndef MFILE_H
#define MFILE_H
#include <stdio.h>
*/
#ifndef MFILE_H
#define MFILE_H
#include <stdio.h>
+#include <yaz/yconfig.h>
+
+#ifndef FILENAME_MAX
+#include <sys/param.h>
+#define FILENAME_MAX MAXPATHLEN
+#endif
+
+#include <zebra-lock.h>
-#include <util.h>
+YAZ_BEGIN_CDECL
#define MF_MIN_BLOCKS_CREAT 1 /* minimum free blocks in new dir */
#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)
#define MF_MAX_PARTS 28 /* max # of part-files per metafile */
#define mf_blocksize(mf) ((mf)->blocksize)
@@
-28,8
+29,8
@@
typedef struct mf_dir
{
char name[FILENAME_MAX+1];
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;
struct mf_dir *next;
} mf_dir;
@@
-38,7
+39,7
@@
typedef struct part_file
int number;
int top;
int blocks;
int number;
int top;
int blocks;
- int bytes;
+ off_t bytes;
mf_dir *dir;
char *path;
int fd;
mf_dir *dir;
char *path;
int fd;
@@
-54,10
+55,11
@@
typedef struct meta_file
int no_files;
int cur_file;
int open; /* is this file open? */
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;
MFile_area ma;
int wr;
+ Zebra_mutex mutex;
struct meta_file *next;
} *MFile, meta_file;
struct meta_file *next;
} *MFile, meta_file;
@@
-68,17
+70,18
@@
typedef struct MFile_area_struct
mf_dir *dirs;
struct meta_file *mfiles;
struct MFile_area_struct *next; /* global list of active areas */
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_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);
/*
* Release an area.
*/
/*
* Release an area.
*/
-int mf_dispose(MFile_area ma);
+void mf_destroy(MFile_area ma);
/*
* Open a metafile.
/*
* Open a metafile.
@@
-93,21
+96,29
@@
int mf_close(MFile mf);
/*
* Read one block from a metafile. Interface mirrors bfile.
*/
/*
* 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.
*/
/*
* 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 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);
/*
* Unlink the file by name, rather than MFile-handle.
*/
int mf_unlink_name(MFile_area, const char *name);
+YAZ_END_CDECL
+
#endif
#endif