X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=3993e34b292e31a72bc1117ce80b7ec3cd78fdf3;hb=6ec32a146d639c16e9929435fdbfd8d915e918b3;hp=957e255acc257820f2b19b5bb367beab29534c07;hpb=47ea1fc957c7b97bb30a26698f072109cae275e4;p=idzebra-moved-to-github.git diff --git a/bfile/mfile.c b/bfile/mfile.c index 957e255..3993e34 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -1,10 +1,26 @@ -/* - * Copyright (C) 1994-2002, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Id: mfile.c,v 1.47 2002-07-25 13:06:43 adam Exp $ - */ +/* $Id: mfile.c,v 1.55 2004-08-06 12:55:01 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 + Index Data Aps + +This file is part of the Zebra server. + +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. + +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. +*/ + + /* @@ -44,7 +60,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++; @@ -116,9 +132,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)) @@ -146,10 +163,13 @@ static int file_position(MFile mf, int pos, int offset) 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); + logf(LOG_WARN, "pos=" ZINT_FORMAT " off=" ZINT_FORMAT " blocksize=%d offset=%d", + pos, off, mf->blocksize, offset); return -1; } mf->cur_file = c; @@ -158,7 +178,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; } /* @@ -225,6 +250,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]; @@ -242,7 +268,7 @@ MFile_area mf_init(const char *name, const char *spec, const char *base) 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", dent->d_name); @@ -356,6 +382,7 @@ 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); @@ -378,7 +405,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); } @@ -390,7 +417,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 @@ -411,12 +438,18 @@ int mf_close(MFile mf) logf (LOG_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); +#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; } @@ -424,9 +457,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) @@ -459,9 +493,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'; @@ -475,17 +511,17 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf) /* 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", + logf (LOG_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) + @@ -495,7 +531,7 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf) mf->name); exit(1); } - logf (LOG_DEBUG, "ps = %d", ps); + logf (LOG_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)", @@ -524,10 +560,10 @@ 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++; @@ -565,10 +601,14 @@ 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; }