X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fmfile.c;h=2f6500fc03e407ecffcdd4223477261f9f8b0596;hp=002a3f966bfec4d2780d796aa92627bf7b543372;hb=e075935572b3ef0a246aaefde50efadbfa12e5c4;hpb=896c0427df9d8eff5de6a1735dcd992e067df844 diff --git a/bfile/mfile.c b/bfile/mfile.c index 002a3f9..2f6500f 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -1,6 +1,6 @@ -/* $Id: mfile.c,v 1.49 2002-08-02 19:26:55 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps +/* $Id: mfile.c,v 1.66 2006-06-07 10:14:39 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS This file is part of the Zebra server. @@ -32,7 +32,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -43,8 +44,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include -#include +#include +#include +#include "mfile.h" static int scan_areadef(MFile_area ma, const char *ad, const char *base) { @@ -60,7 +62,7 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) { const char *ad0 = ad; int i = 0, fact = 1, multi; - off_t size = 0; + mfile_off_t size = 0; while (*ad == ' ' || *ad == '\t') ad++; @@ -83,12 +85,12 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) dirname[i] = '\0'; if (*ad++ != ':') { - logf (LOG_WARN, "Missing colon after path: %s", ad0); + yaz_log (YLOG_WARN, "Missing colon after path: %s", ad0); return -1; } if (i == 0) { - logf (LOG_WARN, "Empty path: %s", ad0); + yaz_log (YLOG_WARN, "Empty path: %s", ad0); return -1; } while (*ad == ' ' || *ad == '\t') @@ -103,7 +105,7 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) 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; @@ -116,10 +118,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': - logf (LOG_FATAL, "Missing unit: %s", ad0); + yaz_log (YLOG_FATAL, "Missing unit: %s", ad0); return -1; default: - logf (LOG_FATAL, "Illegal unit: %c in %s", *ad, ad0); + yaz_log (YLOG_FATAL, "Illegal unit: %c in %s", *ad, ad0); return -1; } ad++; @@ -132,9 +134,10 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base) return 0; } -static int file_position(MFile mf, int pos, int offset) +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)) @@ -158,14 +161,17 @@ static int file_position(MFile mf, int pos, int offset) { if (!mf->wr && errno == ENOENT && off == 0) return -2; - logf (LOG_WARN|LOG_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; } } - 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_WARN|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; @@ -174,7 +180,12 @@ 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; } /* @@ -192,13 +203,13 @@ 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]; - 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, spec, base) < 0) { - logf (LOG_WARN, "Failed to access description of '%s'", name); + yaz_log (YLOG_WARN, "Failed to access description of '%s'", name); return 0; } /* look at each directory */ @@ -206,7 +217,7 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) { if (!(dd = opendir(dirp->name))) { - logf (LOG_WARN|LOG_ERRNO, "Failed to open directory %s", + yaz_log (YLOG_WARN|YLOG_ERRNO, "Failed to open directory %s", dirp->name); return 0; } @@ -241,6 +252,7 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) 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]; @@ -254,13 +266,13 @@ 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) { - logf (LOG_FATAL|LOG_ERRNO, "Failed to access %s", + yaz_log (YLOG_FATAL|YLOG_ERRNO, "Failed to access %s", dent->d_name); 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); return 0; } @@ -275,7 +287,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) { - 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); @@ -349,7 +361,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) 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); for (mnew = ma->mfiles; mnew; mnew = mnew->next) @@ -372,12 +384,13 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) 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) { - logf (LOG_FATAL, "Insufficient space for new mfile."); + yaz_log (YLOG_FATAL, "Insufficient space for new mfile."); return 0; } mnew->files[0].dir = dp; @@ -394,7 +407,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); } @@ -406,7 +419,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 @@ -424,9 +437,10 @@ int mf_close(MFile mf) { int i; - logf (LOG_DEBUG, "mf_close(%s)", mf->name); + yaz_log (YLOG_DEBUG, "mf_close(%s) unlink=%d", mf->name, mf->unlink_flag); assert(mf->open); for (i = 0; i < mf->no_files; i++) + { if (mf->files[i].fd >= 0) { #ifndef WIN32 @@ -435,6 +449,9 @@ int mf_close(MFile mf) close(mf->files[i].fd); mf->files[i].fd = -1; } + if (mf->unlink_flag) + unlink(mf->files[i].path); + } mf->open = 0; return 0; } @@ -442,9 +459,10 @@ int mf_close(MFile mf) /* * Read one block from a metafile. Interface mirrors bfile. */ -int mf_read(MFile mf, int no, int offset, int nbytes, 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) @@ -456,14 +474,14 @@ int mf_read(MFile mf, int no, int offset, int nbytes, void *buf) } else { - yaz_log (LOG_FATAL, "mf_read %s internal error", mf->name); + yaz_log (YLOG_FATAL, "mf_read %s internal error", mf->name); exit(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_read: Read failed (%s)", mf->files[mf->cur_file].path); exit(1); } @@ -477,9 +495,11 @@ int mf_read(MFile mf, int no, int offset, int nbytes, void *buf) /* * Write. */ -int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf) +int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) { - int ps, nblocks, towrite; + zint ps; + zint nblocks; + int towrite; mf_dir *dp; char tmp[FILENAME_MAX+1]; unsigned char dummych = '\xff'; @@ -487,36 +507,36 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf) zebra_mutex_lock (&mf->mutex); if ((ps = file_position(mf, no, offset)) < 0) { - yaz_log (LOG_FATAL, "mf_write %s internal error (1)", mf->name); + yaz_log (YLOG_FATAL, "mf_write %s internal error (1)", mf->name); exit(1); } /* file needs to grow */ while (ps >= mf->files[mf->cur_file].blocks) { - off_t needed = (ps - mf->files[mf->cur_file].blocks + 1) * + 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 && 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) { - yaz_log (LOG_FATAL, "mf_write %s internal error (2)", + yaz_log (YLOG_FATAL, "mf_write %s internal error (2)", mf->name); exit(1); } - logf (LOG_DEBUG, "ps = %d", ps); + yaz_log (YLOG_DEBUG, "ps = " ZINT_FORMAT, ps); if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1) { - logf (LOG_ERRNO|LOG_FATAL, "mf_write %s internal error (3)", + yaz_log (YLOG_ERRNO|YLOG_FATAL, "mf_write %s internal error (3)", mf->name); exit(1); } @@ -526,12 +546,12 @@ int mf_write(MFile mf, int no, int offset, int nbytes, 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 < needed; dp = dp->next); if (!dp) { - logf (LOG_FATAL, "Cannot allocate more space for %s", + yaz_log (YLOG_FATAL, "Cannot allocate more space for %s", mf->name); exit(1); } @@ -542,17 +562,17 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf) 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-%d.mf", 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) { - yaz_log (LOG_FATAL, "mf_write %s internal error (4)", + yaz_log (YLOG_FATAL, "mf_write %s internal error (4)", mf->name); exit(1); } @@ -570,7 +590,7 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf) 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); } @@ -583,18 +603,47 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf) */ int mf_unlink(MFile mf) { - int i; - - for (i = 0; i < mf->no_files; i++) - unlink (mf->files[i].path); + if (mf->open) + { + mf->unlink_flag = 1; + } + else + { + int i; + for (i = 0; ino_files; i++) + unlink(mf->files[i].path); + } return 0; } -/* - * Unlink the file by name, rather than MFile-handle. File should be closed. - */ -int mf_unlink_name(MFile_area ma, const char *name) +int mf_area_directory_stat(MFile_area ma, int no, const char **directory, + double *used_bytes, double *max_bytes) { - abort(); - return 0; + int i; + 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; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +