X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fmfile.c;h=674687afb0ad8f2bede38ae3728b56a933ab4c54;hp=3f673aa15f6bcbffcbbc74032b38b364292a137f;hb=a5c8c78e8671af863fc61b2ad8b24f92f827f7b2;hpb=05b9b8ed020c5bfa48a913d6a2e2b50ddf1bab8e diff --git a/bfile/mfile.c b/bfile/mfile.c index 3f673aa..674687a 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -1,8 +1,5 @@ -/* $Id: mfile.c,v 1.57 2004-12-08 12:23:08 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 - Index Data Aps - -This file is part of the Zebra server. +/* 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 @@ -15,24 +12,20 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. -*/ - - +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ - /* - * TODO: The size estimates in init may not be accurate due to - * only partially written final blocks. - */ - +#if HAVE_CONFIG_H +#include +#endif #include #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -43,7 +36,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include +#include +#include #include "mfile.h" static int scan_areadef(MFile_area ma, const char *ad, const char *base) @@ -68,13 +62,13 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) break; if (!yaz_is_abspath(ad) && base) { - strcpy (dirname, 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; @@ -83,12 +77,12 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) dirname[i] = '\0'; if (*ad++ != ':') { - yaz_log (YLOG_WARN, "Missing colon after path: %s", ad0); + yaz_log(YLOG_WARN, "Missing colon after path: %s", ad0); return -1; } if (i == 0) { - yaz_log (YLOG_WARN, "Empty path: %s", ad0); + yaz_log(YLOG_WARN, "Empty path: %s", ad0); return -1; } while (*ad == ' ' || *ad == '\t') @@ -103,7 +97,7 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) size = 0; if (*ad < '0' || *ad > '9') { - yaz_log (YLOG_FATAL, "Missing size after path: %s", ad0); + yaz_log(YLOG_FATAL, "Missing size after path: %s", ad0); return -1; } size = 0; @@ -116,10 +110,10 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) case 'M': case 'm': multi = 1048576; break; case 'G': case 'g': multi = 1073741824; break; case '\0': - yaz_log (YLOG_FATAL, "Missing unit: %s", ad0); + yaz_log(YLOG_FATAL, "Missing unit: %s", ad0); return -1; default: - yaz_log (YLOG_FATAL, "Illegal unit: %c in %s", *ad, ad0); + yaz_log(YLOG_FATAL, "Illegal unit: %c in %s", *ad, ad0); return -1; } ad++; @@ -132,6 +126,15 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) return 0; } +/** \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) { zint off = 0, ps; @@ -158,16 +161,19 @@ static zint file_position(MFile mf, zint pos, int offset) (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; + } + yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to open %s", mf->files[c].path); + return -1; } } ps = pos - off; - if (mfile_seek(mf->files[c].fd, ps * (mfile_off_t) mf->blocksize + offset, + if (mfile_seek(mf->files[c].fd, ps *(mfile_off_t) mf->blocksize + offset, SEEK_SET) < 0) { - yaz_log (YLOG_WARN|YLOG_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; @@ -186,11 +192,8 @@ static int cmp_part_file(const void *p1, const void *p2) 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, const char *base) +MFile_area mf_init(const char *name, const char *spec, const char *base, + int only_shadow_files) { MFile_area ma = (MFile_area) xmalloc(sizeof(*ma)); mf_dir *dirp; @@ -201,13 +204,14 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) int fd, number; char metaname[FILENAME_MAX+1], tmpnam[FILENAME_MAX+1]; - yaz_log (YLOG_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, spec, base) < 0) { - yaz_log (YLOG_WARN, "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 */ @@ -215,23 +219,29 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) { if (!(dd = opendir(dirp->name))) { - yaz_log (YLOG_WARN|YLOG_ERRNO, "Failed to open directory %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))) { int len = strlen(dent->d_name); - const char *cp = strrchr (dent->d_name, '-'); - if (strchr (".-", *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")) + 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); + 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 */ @@ -245,12 +255,11 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) if (!meta_f) { meta_f = (meta_file *) xmalloc(sizeof(*meta_f)); - zebra_mutex_init (&meta_f->mutex); + zebra_mutex_init(&meta_f->mutex); meta_f->ma = ma; meta_f->next = ma->mfiles; meta_f->open = 0; meta_f->cur_file = -1; - meta_f->unlink_flag = 0; ma->mfiles = meta_f; strcpy(meta_f->name, metaname); part_f = &meta_f->files[0]; @@ -264,19 +273,21 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) /* get size */ if ((fd = open(part_f->path, O_BINARY|O_RDONLY)) < 0) { - yaz_log (YLOG_FATAL|YLOG_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 = mfile_seek(fd, 0, SEEK_END)) < 0) { - yaz_log (YLOG_FATAL|YLOG_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; } -#ifndef WIN32 - fsync(fd); -#endif close(fd); if (dirp->max_bytes >= 0) dirp->avail_bytes -= part_f->bytes; @@ -285,7 +296,7 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) } for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next) { - yaz_log (YLOG_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); @@ -296,7 +307,6 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) void mf_destroy(MFile_area ma) { mf_dir *dp; - meta_file *meta_f; if (!ma) return; @@ -305,26 +315,13 @@ void mf_destroy(MFile_area ma) { 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; ino_files; i++) - { - xfree (m->files[i].path); - } - zebra_mutex_destroy (&meta_f->mutex); - meta_f = meta_f->next; - xfree (m); + xfree(d); } - xfree (ma); + mf_reset(ma, 0); + xfree(ma); } -void mf_reset(MFile_area ma) +void mf_reset(MFile_area ma, int unlink_flag) { meta_file *meta_f; @@ -336,22 +333,21 @@ void mf_reset(MFile_area ma) int i; meta_file *m = meta_f; - assert (!m->open); + meta_f = meta_f->next; + + assert(!m->open); for (i = 0; ino_files; i++) { - unlink (m->files[i].path); - 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); } 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) { meta_file *mnew; @@ -361,34 +357,36 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) 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 = (meta_file *) xmalloc(sizeof(*mnew)); strcpy(mnew->name, name); /* allocate one, empty file */ - zebra_mutex_init (&mnew->mutex); + 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->unlink_flag = 0; mnew->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size; for (dp = ma->dirs; dp && dp->max_bytes >= 0 && dp->avail_bytes < mnew->min_bytes_creat; dp = dp->next); if (!dp) { - yaz_log (YLOG_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; @@ -428,73 +426,64 @@ 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; - yaz_log (YLOG_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 - fsync(mf->files[i].fd); + if (mf->wr) + fsync(mf->files[i].fd); #endif close(mf->files[i].fd); mf->files[i].fd = -1; } - if (mf->unlink_flag) - unlink(mf->files[i].path); } mf->open = 0; return 0; } -/* - * Read one block from a metafile. Interface mirrors bfile. - */ int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf) { zint rd; int toread; - zebra_mutex_lock (&mf->mutex); + zebra_mutex_lock(&mf->mutex); if ((rd = file_position(mf, no, offset)) < 0) { if (rd == -2) { - zebra_mutex_unlock (&mf->mutex); + zebra_mutex_unlock(&mf->mutex); return 0; } else { - yaz_log (YLOG_FATAL, "mf_read %s internal error", mf->name); - exit(1); + 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) { - yaz_log (YLOG_FATAL|YLOG_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; } - zebra_mutex_unlock (&mf->mutex); + zebra_mutex_unlock(&mf->mutex); if (rd < toread) return 0; else return 1; } -/* - * Write. - */ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) { + int ret = 0; zint ps; zint nblocks; int towrite; @@ -502,11 +491,12 @@ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) char tmp[FILENAME_MAX+1]; unsigned char dummych = '\xff'; - zebra_mutex_lock (&mf->mutex); + zebra_mutex_lock(&mf->mutex); if ((ps = file_position(mf, no, offset)) < 0) { - yaz_log (YLOG_FATAL, "mf_write %s internal error (1)", mf->name); - 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) @@ -521,22 +511,24 @@ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) if ((nblocks = (int) (mf->files[mf->cur_file].dir->avail_bytes / mf->blocksize)) > 0) { - yaz_log (YLOG_DEBUG, "Capping off file %s at pos " ZINT_FORMAT, + 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) { - yaz_log (YLOG_FATAL, "mf_write %s internal error (2)", + yaz_log(YLOG_FATAL, "mf_write: %s error (2)", mf->name); - exit(1); + ret = -1; + goto out; } - yaz_log (YLOG_DEBUG, "ps = " ZINT_FORMAT, ps); + yaz_log(YLOG_DEBUG, "ps = " ZINT_FORMAT, ps); if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1) { - yaz_log (YLOG_ERRNO|YLOG_FATAL, "mf_write %s internal error (3)", + yaz_log(YLOG_ERRNO|YLOG_FATAL, "mf_write: %s error (3)", mf->name); - exit(1); + ret = -1; + goto out; } mf->files[mf->cur_file].blocks += nblocks; mf->files[mf->cur_file].bytes += nblocks * mf->blocksize; @@ -544,17 +536,25 @@ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) mf->blocksize; } /* get other bit */ - yaz_log (YLOG_DEBUG, "Creating new file."); + yaz_log(YLOG_DEBUG, "Creating new file."); for (dp = mf->ma->dirs; dp && dp->max_bytes >= 0 && dp->avail_bytes < needed; dp = dp->next); if (!dp) { - yaz_log (YLOG_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; @@ -570,9 +570,9 @@ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) /* open new file and position at beginning */ if ((ps = file_position(mf, no, offset)) < 0) { - yaz_log (YLOG_FATAL, "mf_write %s internal error (4)", - mf->name); - exit(1); + yaz_log(YLOG_FATAL, "mf_write: %s error (5)", mf->name); + ret = -1; + goto out; } } else @@ -588,35 +588,53 @@ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) towrite = nbytes ? nbytes : mf->blocksize; if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite) { - yaz_log (YLOG_FATAL|YLOG_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; } - zebra_mutex_unlock (&mf->mutex); - 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) { - if (mf->open) - mf->unlink_flag = 1; - else + int i; + mf_dir *d = ma->dirs; + for (i = 0; d && inext) + ; + if (!d) + return 0; + if (directory) + *directory = d->name; + if (max_bytes) { - int i; - for (i = 0; ino_files; i++) - unlink(mf->files[i].path); + /* possible loss of data. But it's just statistics and lies */ + *max_bytes = (double) d->max_bytes; } - return 0; + 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; -} +