/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: mfile.c,v $
- * Revision 1.19 1996-05-01 07:16:30 quinn
+ * Revision 1.43 2002-04-04 20:50:36 adam
+ * Multi register works with record paths and data1 profile path
+ *
+ * Revision 1.42 2002/04/04 14:14:13 adam
+ * Multiple registers (alpha early)
+ *
+ * Revision 1.41 2000/11/29 14:24:01 adam
+ * Script configure uses yaz pthreads options. Added locking for
+ * zebra_register_{lock,unlock}.
+ *
+ * Revision 1.40 2000/10/17 12:37:09 adam
+ * Fixed notification of live-updates. Fixed minor problem with mf_init
+ * where it didn't handle shadow area file names correctly.
+ *
+ * Revision 1.39 2000/05/05 13:48:03 adam
+ * Fixed locking for metafiles.
+ *
+ * Revision 1.38 2000/03/20 19:08:35 adam
+ * Added remote record import using Z39.50 extended services and Segment
+ * Requests.
+ *
+ * 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
+ * Fixed stupid bug regarding split-files.
+ *
+ * Revision 1.31 1999/02/18 12:49:33 adam
+ * Changed file naming scheme for register files as well as record
+ * store/index files.
+ *
+ * Revision 1.30 1999/02/02 14:50:02 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.29 1998/05/27 14:28:34 adam
+ * Fixed bug in mf_write. 'Cap off' byte written at wrong offset.
+ *
+ * Revision 1.28 1998/05/20 10:00:35 adam
+ * Fixed register spec so that colon isn't treated as size separator
+ * unless followed by [0-9+-] in order to allow DOS drive specifications.
+ *
+ * Revision 1.27 1998/02/10 11:55:07 adam
+ * Minor changes.
+ *
+ * Revision 1.26 1997/10/27 14:25:38 adam
+ * Fixed memory leaks.
+ *
+ * Revision 1.25 1997/09/18 08:59:16 adam
+ * Extra generic handle for the character mapping routines.
+ *
+ * Revision 1.24 1997/09/17 12:19:06 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.23 1997/09/09 13:37:53 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.22 1997/09/04 13:56:39 adam
+ * Added O_BINARY to open calls.
+ *
+ * Revision 1.21 1996/10/29 13:56:18 adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.20 1996/05/14 12:10:16 quinn
+ * Bad areadef scan
+ *
+ * Revision 1.19 1996/05/01 07:16:30 quinn
* Fixed ancient bug.
*
* Revision 1.18 1996/04/09 06:47:30 adam
#include <sys/types.h>
#include <fcntl.h>
+#ifdef WIN32
+#include <io.h>
+#else
#include <unistd.h>
-#include <dirent.h>
+#endif
+#include <direntz.h>
+#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
-#include <alexutil.h>
+#include <zebra-lock.h>
+#include <zebrautl.h>
#include <mfile.h>
-static MFile_area_struct *open_areas = 0;
-static MFile_area_struct *default_area = 0;
-
-static int scan_areadef(MFile_area ma, const char *name)
+static int scan_areadef(MFile_area ma, const char *ad, const char *base)
{
/*
* If no definition is given, use current directory, unlimited.
*/
- const char *ad = res_get_def(common_resource, name, ".:-1b");
char dirname[FILENAME_MAX+1];
mf_dir **dp = &ma->dirs, *dir = *dp;
if (!ad)
- {
- logf (LOG_FATAL, "Could not find resource '%s'", name);
- return -1;
- }
+ ad = ".:-1b";
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++;
if (!*ad)
break;
- while (*ad && *ad != ':')
+ if (!yaz_is_abspath(ad) && base)
+ {
+ strcpy (dirname, base);
+ i = strlen(dirname);
+ dirname[i++] = '/';
+ }
+ while (*ad)
{
+ if (*ad == ':' && strchr ("+-0123456789", ad[1]))
+ break;
if (i < FILENAME_MAX)
dirname[i++] = *ad;
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')
else if (*ad == '+')
ad++;
size = 0;
- if (*ad <= '0' || *ad >= '9')
+ if (*ad < '0' || *ad > '9')
{
logf (LOG_FATAL, "Missing size after path: %s", ad0);
return -1;
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;
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;
else
off = c ? (mf->files[c-1].top + 1) : 0;
if (mf->files[c].fd < 0 && (mf->files[c].fd = open(mf->files[c].path,
- mf->wr ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
+ mf->wr ? (O_BINARY|O_RDWR|O_CREAT) : (O_BINARY|O_RDONLY), 0666)) < 0)
{
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;
* Create a new area, cotaining metafiles in directories.
* Find the part-files in each directory, and inventory the existing metafiles.
*/
-MFile_area mf_init(const char *name)
+MFile_area mf_init(const char *name, const char *spec, const char *base)
{
- MFile_area ma = xmalloc(sizeof(MFile_area_struct)), mp;
+ MFile_area ma = (MFile_area) xmalloc(sizeof(*ma));
mf_dir *dirp;
meta_file *meta_f;
part_file *part_f = 0;
struct dirent *dent;
int fd, number;
char metaname[FILENAME_MAX+1], tmpnam[FILENAME_MAX+1];
-
+
logf (LOG_DEBUG, "mf_init(%s)", name);
- for (mp = open_areas; mp; mp = mp->next)
- if (!strcmp(name, mp->name))
- return mp;
- ma = xmalloc(sizeof(MFile_area_struct));
strcpy(ma->name, name);
- ma->next = open_areas;
- open_areas = ma;
ma->mfiles = 0;
ma->dirs = 0;
- if (scan_areadef(ma, name) < 0)
+ if (scan_areadef(ma, spec, base) < 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 */
{
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 */
while ((dent = readdir(dd)))
{
- if (*dent->d_name == '.')
- continue;
- if (sscanf(dent->d_name, "%[^.].mf.%d", metaname, &number) != 2)
- {
- logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name);
- continue;
- }
+ int len = strlen(dent->d_name);
+ const char *cp = strrchr (dent->d_name, '-');
+ if (strchr (".-", *dent->d_name))
+ continue;
+ if (len < 5 || !cp || strcmp (dent->d_name + len - 3, ".mf"))
+ continue;
+ number = atoi(cp+1);
+ memcpy (metaname, dent->d_name, cp - dent->d_name);
+ metaname[ cp - dent->d_name] = '\0';
+
for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
{
/* known metafile */
/* new metafile */
if (!meta_f)
{
- meta_f = xmalloc(sizeof(*meta_f));
+ meta_f = (meta_file *) xmalloc(sizeof(*meta_f));
+ zebra_mutex_init (&meta_f->mutex);
meta_f->ma = ma;
meta_f->next = ma->mfiles;
meta_f->open = 0;
sprintf(tmpnam, "%s/%s", dirp->name, dent->d_name);
part_f->path = xstrdup(tmpnam);
/* get size */
- if ((fd = open(part_f->path, O_RDONLY)) < 0)
+ if ((fd = open(part_f->path, O_BINARY|O_RDONLY)) < 0)
{
logf (LOG_FATAL|LOG_ERRNO, "Failed to access %s",
dent->d_name);
return ma;
}
+void mf_destroy(MFile_area ma)
+{
+ mf_dir *dp;
+ meta_file *meta_f;
+
+ if (!ma)
+ return;
+ dp = ma->dirs;
+ while (dp)
+ {
+ mf_dir *d = dp;
+ dp = dp->next;
+ xfree (d);
+ }
+ meta_f = ma->mfiles;
+ while (meta_f)
+ {
+ int i;
+ meta_file *m = meta_f;
+
+ for (i = 0; i<m->no_files; i++)
+ {
+ 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 *new;
+ meta_file *mnew;
int i;
char tmp[FILENAME_MAX+1];
mf_dir *dp;
logf(LOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size,
wflag ? "RW" : "RDONLY");
- if (!ma)
- {
- if (!default_area && !(default_area = mf_init(MF_DEFAULT_AREA)))
- {
- logf (LOG_FATAL, "Failed to open default area.");
- return 0;
- }
- ma = default_area;
- }
- for (new = ma->mfiles; new; new = new->next)
- if (!strcmp(name, new->name))
- if (new->open)
+ assert (ma);
+ for (mnew = ma->mfiles; mnew; mnew = mnew->next)
+ if (!strcmp(name, mnew->name))
+ {
+ if (mnew->open)
abort();
else
break;
- if (!new)
+ }
+ if (!mnew)
{
- new = xmalloc(sizeof(*new));
- strcpy(new->name, name);
+ mnew = (meta_file *) xmalloc(sizeof(*mnew));
+ strcpy(mnew->name, name);
/* allocate one, empty file */
- new->no_files = 1;
- new->files[0].bytes = new->files[0].blocks = 0;
- new->files[0].top = -1;
- new->files[0].number = 0;
- new->files[0].fd = -1;
- new->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
+ zebra_mutex_init (&mnew->mutex);
+ mnew->no_files = 1;
+ 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;
+ mnew->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
for (dp = ma->dirs; dp && dp->max_bytes >= 0 && dp->avail_bytes <
- new->min_bytes_creat; dp = dp->next);
+ mnew->min_bytes_creat; dp = dp->next);
if (!dp)
{
logf (LOG_FATAL, "Insufficient space for new mfile.");
return 0;
}
- new->files[0].dir = dp;
- sprintf(tmp, "%s/%s.mf.%d", dp->name, new->name, 0);
- new->files[0].path = xstrdup(tmp);
- new->ma = ma;
+ mnew->files[0].dir = dp;
+ sprintf(tmp, "%s/%s-%d.mf", dp->name, mnew->name, 0);
+ mnew->files[0].path = xstrdup(tmp);
+ mnew->ma = ma;
+ mnew->next = ma->mfiles;
+ ma->mfiles = mnew;
}
else
{
- for (i = 0; i < new->no_files; i++)
+ for (i = 0; i < mnew->no_files; i++)
{
- if (new->files[i].bytes % block_size)
- new->files[i].bytes += block_size - new->files[i].bytes %
+ if (mnew->files[i].bytes % block_size)
+ mnew->files[i].bytes += block_size - mnew->files[i].bytes %
block_size;
- new->files[i].blocks = new->files[i].bytes / block_size;
+ mnew->files[i].blocks = mnew->files[i].bytes / block_size;
}
- assert(!new->open);
+ assert(!mnew->open);
}
- new->blocksize = block_size;
- new->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
- new->wr=wflag;
- new->cur_file = 0;
- new->open = 1;
+ mnew->blocksize = block_size;
+ mnew->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
+ mnew->wr=wflag;
+ mnew->cur_file = 0;
+ mnew->open = 1;
- for (i = 0; i < new->no_files; i++)
+ for (i = 0; i < mnew->no_files; i++)
{
- new->files[i].blocks = new->files[i].bytes / new->blocksize;
- if (i == new->no_files - 1)
- new->files[i].top = -1;
+ mnew->files[i].blocks = mnew->files[i].bytes / mnew->blocksize;
+ if (i == mnew->no_files - 1)
+ mnew->files[i].top = -1;
else
- new->files[i].top = i ? (new->files[i-1].top + new->files[i].blocks)
- : (new->files[i].blocks - 1);
+ mnew->files[i].top =
+ i ? (mnew->files[i-1].top + mnew->files[i].blocks)
+ : (mnew->files[i].blocks - 1);
}
- return new;
+ return mnew;
}
/*
/*
* 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)
{
int rd, toread;
+ zebra_mutex_lock (&mf->mutex);
if ((rd = file_position(mf, no, offset)) < 0)
+ {
if (rd == -2)
+ {
+ zebra_mutex_unlock (&mf->mutex);
return 0;
+ }
else
exit(1);
- toread = num ? num : mf->blocksize;
+ }
+ toread = nbytes ? nbytes : mf->blocksize;
if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
{
logf (LOG_FATAL|LOG_ERRNO, "mf_read: Read failed (%s)",
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;
/*
* Write.
*/
-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)
{
int ps, nblocks, towrite;
mf_dir *dp;
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 */
mf->files[mf->cur_file].path, nblocks);
if ((ps = file_position(mf,
(mf->cur_file ? mf->files[mf->cur_file-1].top : 0) +
- mf->files[mf->cur_file].blocks + nblocks, 0)) < 0)
+ mf->files[mf->cur_file].blocks + nblocks - 1, 0)) < 0)
exit(1);
+ logf (LOG_DEBUG, "ps = %d", ps);
if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
{
logf (LOG_ERRNO|LOG_FATAL, "write dummy");
mf->files[mf->cur_file].blocks =
mf->files[mf->cur_file].bytes = 0;
mf->files[mf->cur_file].fd = -1;
- sprintf(tmp, "%s/%s.mf.%d", dp->name, mf->name,
+ sprintf(tmp, "%s/%s-%d.mf", dp->name, mf->name,
mf->files[mf->cur_file].number);
mf->files[mf->cur_file].path = xstrdup(tmp);
mf->no_files++;
nblocks * mf->blocksize;
}
}
- towrite = num ? num : mf->blocksize;
+ towrite = nbytes ? nbytes : mf->blocksize;
if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite)
{
- logf (LOG_FATAL|LOG_ERRNO, "Write failed");
+ logf (LOG_FATAL|LOG_ERRNO, "Write failed for file %s part %d",
+ mf->name, mf->cur_file);
exit(1);
}
+ zebra_mutex_unlock (&mf->mutex);
return 0;
}