-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: mfile.c,v 1.44 2002-04-11 20:09:08 adam Exp $
- */
+/* $Id: mfile.c,v 1.52 2003-04-05 12:32:34 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.
+*/
+
+
/*
{
const char *ad0 = ad;
int i = 0, fact = 1, multi;
- off_t size = 0;
+ mfile_off_t size = 0;
while (*ad == ' ' || *ad == '\t')
ad++;
}
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_WARN|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)
+ return -2;
+ 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,
+ 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=%d off=%d blocksize=%d offset=%d",
+ pos, off, mf->blocksize, offset);
return -1;
}
mf->cur_file = c;
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];
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);
return 0;
}
+#ifndef WIN32
+ fsync(fd);
+#endif
close(fd);
if (dirp->max_bytes >= 0)
dirp->avail_bytes -= part_f->bytes;
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 (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);
}
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
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;
}
return 0;
}
else
+ {
+ yaz_log (LOG_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)
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);
exit(1);
+ }
/* 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",
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);
+ {
+ yaz_log (LOG_FATAL, "mf_write %s internal error (2)",
+ mf->name);
+ 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");
+ logf (LOG_ERRNO|LOG_FATAL, "mf_write %s internal error (3)",
+ mf->name);
exit(1);
}
mf->files[mf->cur_file].blocks += nblocks;
/* get other bit */
logf (LOG_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->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,
mf->files[mf->cur_file].number);
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)",
+ mf->name);
exit(1);
+ }
}
else
{
*/
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; i<mf->no_files; i++)
+ unlink(mf->files[i].path);
+ }
return 0;
}