X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fmfile.c;h=674687afb0ad8f2bede38ae3728b56a933ab4c54;hp=a9dc9f6f3494a28981c4d9bacdef0f6cd9fdff87;hb=a5c8c78e8671af863fc61b2ad8b24f92f827f7b2;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858 diff --git a/bfile/mfile.c b/bfile/mfile.c index a9dc9f6..674687a 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -1,114 +1,31 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: mfile.c,v $ - * 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 - * Function scan_areadef doesn't use sscanf (%n fails on this Linux). - * - * Revision 1.17 1996/03/20 13:29:11 quinn - * Bug-fix - * - * Revision 1.16 1995/12/12 15:57:57 adam - * Implemented mf_unlink. cf_unlink uses mf_unlink. - * - * Revision 1.15 1995/12/08 16:21:14 adam - * Work on commit/update. - * - * Revision 1.14 1995/12/05 13:12:37 quinn - * Added - * - * Revision 1.13 1995/11/30 17:00:50 adam - * Several bug fixes. Commit system runs now. - * - * Revision 1.12 1995/11/24 17:26:11 quinn - * Mostly about making some ISAM stuff in the config file optional. - * - * Revision 1.11 1995/11/13 09:32:43 quinn - * Comment work. - * - * Revision 1.10 1995/09/04 12:33:22 adam - * Various cleanup. YAZ util used instead. - * - * Revision 1.9 1994/11/04 14:26:39 quinn - * bug-fix. - * - * Revision 1.8 1994/10/05 16:56:42 quinn - * Minor. - * - * Revision 1.7 1994/09/19 14:12:37 quinn - * dunno. - * - * Revision 1.6 1994/09/14 13:10:15 quinn - * Corrected some bugs in the init-phase - * - * Revision 1.5 1994/09/12 08:01:51 quinn - * Small - * - * Revision 1.4 1994/09/01 14:51:07 quinn - * Allowed mf_write to write beyond eof+1. - * - * Revision 1.3 1994/08/24 09:37:17 quinn - * Changed reaction to read return values. - * - * Revision 1.2 1994/08/23 14:50:48 quinn - * Fixed mf_close(). - * - * Revision 1.1 1994/08/23 14:41:33 quinn - * First functional version. - * - */ +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. - /* - * TODO: The size estimates in init may not be accurate due to - * only partially written final blocks. - */ +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#if HAVE_CONFIG_H +#include +#endif #include #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -118,10 +35,12 @@ #include #include -#include -#include +#include +#include +#include +#include "mfile.h" -static int scan_areadef(MFile_area ma, const char *name, const char *ad) +static int scan_areadef(MFile_area ma, const char *ad, const char *base) { /* * If no definition is given, use current directory, unlimited. @@ -130,19 +49,26 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad) mf_dir **dp = &ma->dirs, *dir = *dp; if (!ad) - ad = ".:-1b"; + ad = ".:-1b"; for (;;) { const char *ad0 = ad; - int i = 0, fact = 1, multi, size = 0; + int i = 0, fact = 1, multi; + mfile_off_t size = 0; while (*ad == ' ' || *ad == '\t') ad++; if (!*ad) break; + if (!yaz_is_abspath(ad) && base) + { + strcpy(dirname, base); + i = strlen(dirname); + dirname[i++] = '/'; + } while (*ad) { - if (*ad == ':' && strchr ("+-0123456789", ad[1])) + if (*ad == ':' && strchr("+-0123456789", ad[1])) break; if (i < FILENAME_MAX) dirname[i++] = *ad; @@ -151,12 +77,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); + yaz_log(YLOG_WARN, "Missing colon after path: %s", ad0); return -1; } if (i == 0) { - logf (LOG_FATAL, "Empty path: %s", ad0); + yaz_log(YLOG_WARN, "Empty path: %s", ad0); return -1; } while (*ad == ' ' || *ad == '\t') @@ -171,7 +97,7 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad) size = 0; if (*ad < '0' || *ad > '9') { - logf (LOG_FATAL, "Missing size after path: %s", ad0); + yaz_log(YLOG_FATAL, "Missing size after path: %s", ad0); return -1; } size = 0; @@ -179,18 +105,19 @@ 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 '\0': - logf (LOG_FATAL, "Missing unit: %s", ad0); - return -1; - default: - logf (LOG_FATAL, "Illegal unit: %c in %s", *ad, ad0); - return -1; + 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': + yaz_log(YLOG_FATAL, "Missing unit: %s", ad0); + return -1; + default: + yaz_log(YLOG_FATAL, "Illegal unit: %c in %s", *ad, ad0); + 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; @@ -199,9 +126,19 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad) return 0; } -static int file_position(MFile mf, int pos, int offset) +/** \brief position within metafile (perform seek) + \param mf metafile handle + \param pos block position + \param offset offset within block + \retval 0 OK + \retval -1 ERROR + \retval -2 OK, but file does not created (read-only) +*/ + +static zint file_position(MFile mf, zint pos, int offset) { - int off = 0, c = mf->cur_file, ps; + zint off = 0, ps; + int c = mf->cur_file; if ((c > 0 && pos <= mf->files[c-1].top) || (c < mf->no_files -1 && pos > mf->files[c].top)) @@ -216,18 +153,29 @@ static int file_position(MFile mf, int pos, int offset) } 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_BINARY|O_RDWR|O_CREAT) : (O_BINARY|O_RDONLY), 0666)) < 0) + if (mf->files[c].fd < 0) { - if (!mf->wr && errno == ENOENT && off == 0) - return -2; - logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path); - return -1; + if ((mf->files[c].fd = open(mf->files[c].path, + mf->wr ? + (O_BINARY|O_RDWR|O_CREAT) : + (O_BINARY|O_RDONLY), 0666)) < 0) + { + if (!mf->wr && errno == ENOENT && off == 0) + { + /* we can't open it for reading. But not really an error */ + return -2; + } + yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to open %s", mf->files[c].path); + return -1; + } } - if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize + offset, + ps = pos - off; + if (mfile_seek(mf->files[c].fd, ps *(mfile_off_t) mf->blocksize + offset, SEEK_SET) < 0) { - logf (LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path); + yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to seek in %s", mf->files[c].path); + yaz_log(YLOG_WARN, "pos=" ZINT_FORMAT " off=" ZINT_FORMAT " blocksize=%d offset=%d", + pos, off, mf->blocksize, offset); return -1; } mf->cur_file = c; @@ -236,16 +184,18 @@ static int file_position(MFile mf, int pos, int offset) static int cmp_part_file(const void *p1, const void *p2) { - return ((part_file *)p1)->number - ((part_file *)p2)->number; + zint d = ((part_file *)p1)->number - ((part_file *)p2)->number; + if (d > 0) + return 1; + if (d < 0) + return -1; + return 0; } -/* - * 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, const char *spec) +MFile_area mf_init(const char *name, const char *spec, const char *base, + int only_shadow_files) { - 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; @@ -254,13 +204,14 @@ MFile_area mf_init(const char *name, const char *spec) int fd, number; char metaname[FILENAME_MAX+1], tmpnam[FILENAME_MAX+1]; - logf (LOG_DEBUG, "mf_init(%s)", name); + yaz_log(YLOG_DEBUG, "mf_init(%s)", name); strcpy(ma->name, name); ma->mfiles = 0; ma->dirs = 0; - if (scan_areadef(ma, name, spec) < 0) + if (scan_areadef(ma, spec, base) < 0) { - logf (LOG_FATAL, "Failed to access description of '%s'", name); + yaz_log(YLOG_WARN, "Failed to access description of '%s'", name); + mf_destroy(ma); return 0; } /* look at each directory */ @@ -268,19 +219,29 @@ 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); + yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to open directory %s", + dirp->name); + mf_destroy(ma); 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'; + + /* only files such as file-i-0.mf and file-i-b-0.mf, bug #739 */ + if (only_shadow_files && cp[-2] != '-') + continue; + if (!only_shadow_files && cp[-2] == '-') + continue; for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next) { /* known metafile */ @@ -293,7 +254,8 @@ 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)); + zebra_mutex_init(&meta_f->mutex); meta_f->ma = ma; meta_f->next = ma->mfiles; meta_f->open = 0; @@ -311,14 +273,19 @@ MFile_area mf_init(const char *name, const char *spec) /* get size */ if ((fd = open(part_f->path, O_BINARY|O_RDONLY)) < 0) { - logf (LOG_FATAL|LOG_ERRNO, "Failed to access %s", + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to access %s", dent->d_name); + closedir(dd); + mf_destroy(ma); return 0; } - if ((part_f->bytes = lseek(fd, 0, SEEK_END)) < 0) + if ((part_f->bytes = mfile_seek(fd, 0, SEEK_END)) < 0) { - logf (LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to seek in %s", dent->d_name); + close(fd); + closedir(dd); + mf_destroy(ma); return 0; } close(fd); @@ -329,7 +296,7 @@ MFile_area mf_init(const char *name, const char *spec) } for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next) { - logf (LOG_DEBUG, "mf_init: %s consists of %d part(s)", meta_f->name, + yaz_log(YLOG_DEBUG, "mf_init: %s consists of %d part(s)", meta_f->name, meta_f->no_files); qsort(meta_f->files, meta_f->no_files, sizeof(part_file), cmp_part_file); @@ -340,7 +307,6 @@ MFile_area mf_init(const char *name, const char *spec) void mf_destroy(MFile_area ma) { mf_dir *dp; - meta_file *meta_f; if (!ma) return; @@ -349,51 +315,68 @@ void mf_destroy(MFile_area ma) { mf_dir *d = dp; dp = dp->next; - xfree (d); + xfree(d); } + mf_reset(ma, 0); + xfree(ma); +} + +void mf_reset(MFile_area ma, int unlink_flag) +{ + meta_file *meta_f; + + if (!ma) + return; meta_f = ma->mfiles; while (meta_f) { int i; meta_file *m = meta_f; - + + meta_f = meta_f->next; + + assert(!m->open); for (i = 0; ino_files; i++) { - xfree (m->files[i].path); + if (unlink_flag) + unlink(m->files[i].path); + xfree(m->files[i].path); } - meta_f = meta_f->next; - xfree (m); + zebra_mutex_destroy(&m->mutex); + xfree(m); } - xfree (ma); + 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; - logf(LOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size, + yaz_log(YLOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size, wflag ? "RW" : "RDONLY"); - assert (ma); + assert(ma); for (mnew = ma->mfiles; mnew; mnew = mnew->next) if (!strcmp(name, mnew->name)) + { if (mnew->open) - abort(); - else - break; + { + yaz_log(YLOG_WARN, "metafile %s already open", name); + return 0; + } + break; + } 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; @@ -402,11 +385,12 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) mnew->min_bytes_creat; dp = dp->next); if (!dp) { - logf (LOG_FATAL, "Insufficient space for new mfile."); + yaz_log(YLOG_FATAL, "Insufficient space for file %s", name); + xfree(mnew); return 0; } mnew->files[0].dir = dp; - sprintf(tmp, "%s/%s.mf.%d", dp->name, mnew->name, 0); + sprintf(tmp, "%s/%s-%d.mf", dp->name, mnew->name, 0); mnew->files[0].path = xstrdup(tmp); mnew->ma = ma; mnew->next = ma->mfiles; @@ -419,7 +403,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) if (mnew->files[i].bytes % block_size) mnew->files[i].bytes += block_size - mnew->files[i].bytes % block_size; - mnew->files[i].blocks = mnew->files[i].bytes / block_size; + mnew->files[i].blocks = (int) (mnew->files[i].bytes / block_size); } assert(!mnew->open); } @@ -431,7 +415,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) for (i = 0; i < mnew->no_files; i++) { - mnew->files[i].blocks = mnew->files[i].bytes / mnew->blocksize; + mnew->files[i].blocks = (int)(mnew->files[i].bytes / mnew->blocksize); if (i == mnew->no_files - 1) mnew->files[i].top = -1; else @@ -442,85 +426,109 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) return mnew; } -/* - * Close a metafile. - */ int mf_close(MFile mf) { int i; - logf (LOG_DEBUG, "mf_close(%s)", mf->name); + yaz_log(YLOG_DEBUG, "mf_close(%s)", mf->name); assert(mf->open); for (i = 0; i < mf->no_files; i++) + { if (mf->files[i].fd >= 0) { +#ifndef WIN32 + if (mf->wr) + fsync(mf->files[i].fd); +#endif close(mf->files[i].fd); mf->files[i].fd = -1; } + } mf->open = 0; return 0; } -/* - * 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, zint no, int offset, int nbytes, void *buf) { - int rd, toread; + zint rd; + int 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; + { + yaz_log(YLOG_FATAL, "mf_read2 %s internal error", mf->name); + return -1; + } + } + 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)", + yaz_log(YLOG_FATAL|YLOG_ERRNO, "mf_read2: Read failed (%s)", mf->files[mf->cur_file].path); - exit(1); + return -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, zint no, int offset, int nbytes, const void *buf) { - int ps, nblocks, towrite; + int ret = 0; + zint ps; + zint nblocks; + int 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); + { + yaz_log(YLOG_FATAL, "mf_write: %s error (1)", mf->name); + ret = -1; + goto out; + } /* file needs to grow */ while (ps >= mf->files[mf->cur_file].blocks) { + mfile_off_t needed = (ps - mf->files[mf->cur_file].blocks + 1) * + mf->blocksize; /* file overflow - allocate new file */ if (mf->files[mf->cur_file].dir->max_bytes >= 0 && - (ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize > - mf->files[mf->cur_file].dir->avail_bytes) + needed > mf->files[mf->cur_file].dir->avail_bytes) { /* cap off file? */ - if ((nblocks = mf->files[mf->cur_file].dir->avail_bytes / - mf->blocksize) > 0) + if ((nblocks = (int) (mf->files[mf->cur_file].dir->avail_bytes / + mf->blocksize)) > 0) { - logf (LOG_DEBUG, "Capping off file %s at pos %d", + yaz_log(YLOG_DEBUG, "Capping off file %s at pos " ZINT_FORMAT, 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 - 1, 0)) < 0) - exit(1); - logf (LOG_DEBUG, "ps = %d", ps); + { + yaz_log(YLOG_FATAL, "mf_write: %s error (2)", + mf->name); + ret = -1; + goto out; + } + yaz_log(YLOG_DEBUG, "ps = " ZINT_FORMAT, ps); if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1) { - logf (LOG_ERRNO|LOG_FATAL, "write dummy"); - exit(1); + yaz_log(YLOG_ERRNO|YLOG_FATAL, "mf_write: %s error (3)", + mf->name); + ret = -1; + goto out; } mf->files[mf->cur_file].blocks += nblocks; mf->files[mf->cur_file].bytes += nblocks * mf->blocksize; @@ -528,32 +536,44 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf) mf->blocksize; } /* get other bit */ - logf (LOG_DEBUG, "Creating new file."); + yaz_log(YLOG_DEBUG, "Creating new file."); for (dp = mf->ma->dirs; dp && dp->max_bytes >= 0 && - dp->avail_bytes < mf->min_bytes_creat; dp = dp->next); + dp->avail_bytes < needed; dp = dp->next); if (!dp) { - logf (LOG_FATAL, "Cannot allocate more space for %s", - mf->name); - exit(1); + yaz_log(YLOG_FATAL, "mf_write: %s error (4) no more space", + mf->name); + for (dp = mf->ma->dirs; dp ; dp = dp->next) { + yaz_log(YLOG_FATAL,"%s: max=" ZINT_FORMAT + " used=" ZINT_FORMAT " available=" ZINT_FORMAT, + dp->name, (zint)dp->max_bytes, + (zint)(dp->max_bytes - dp->avail_bytes), (zint)dp->avail_bytes ); + } + yaz_log(YLOG_FATAL,"Adjust the limits in your zebra.cfg"); + ret = -1; + goto out; } mf->files[mf->cur_file].top = (mf->cur_file ? - mf->files[mf->cur_file-1].top : -1) + + mf->files[mf->cur_file-1].top : -1) + mf->files[mf->cur_file].blocks; mf->files[++(mf->cur_file)].top = -1; mf->files[mf->cur_file].dir = dp; mf->files[mf->cur_file].number = mf->files[mf->cur_file-1].number + 1; - mf->files[mf->cur_file].blocks = - mf->files[mf->cur_file].bytes = 0; + mf->files[mf->cur_file].blocks = 0; + 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-" ZINT_FORMAT ".mf", dp->name, mf->name, mf->files[mf->cur_file].number); mf->files[mf->cur_file].path = xstrdup(tmp); mf->no_files++; /* open new file and position at beginning */ if ((ps = file_position(mf, no, offset)) < 0) - exit(1); + { + yaz_log(YLOG_FATAL, "mf_write: %s error (5)", mf->name); + ret = -1; + goto out; + } } else { @@ -565,33 +585,56 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf) 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 for file %s part %d", + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Write failed for file %s part %d", mf->name, mf->cur_file); - exit(1); + ret = -1; } - return 0; + out: + zebra_mutex_unlock(&mf->mutex); + return ret; } -/* - * Destroy a metafile, unlinking component files. File must be open. - */ -int mf_unlink(MFile mf) +/** \brief metafile area statistics + \param ma metafile area handle + \param no area number (0=first, 1=second, ..) + \param directory holds directory upon completion (if non-NULL) + \param used_bytes holds used bytes upon completion (if non-NULL) + \param max_bytes holds max size bytes upon completion (if non-NULL) + \retval 0 area number does not exist + \retval 1 area number exists (and directory,used_bytes,.. are set) +*/ +int mf_area_directory_stat(MFile_area ma, int no, const char **directory, + double *used_bytes, double *max_bytes) { int i; - - for (i = 0; i < mf->no_files; i++) - unlink (mf->files[i].path); - return 0; + mf_dir *d = ma->dirs; + for (i = 0; d && inext) + ; + if (!d) + return 0; + if (directory) + *directory = d->name; + if (max_bytes) + { + /* possible loss of data. But it's just statistics and lies */ + *max_bytes = (double) d->max_bytes; + } + if (used_bytes) + { + /* possible loss of data. But it's just statistics and lies */ + *used_bytes = (double) (d->max_bytes - d->avail_bytes); + } + return 1; } - /* - * Unlink the file by name, rather than MFile-handle. File should be closed. + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab */ -int mf_unlink_name(MFile_area ma, const char *name) -{ - abort(); - return 0; -} +