* Sebastian Hammer, Adam Dickmeiss
*
* $Log: mfile.c,v $
- * Revision 1.3 1994-08-24 09:37:17 quinn
+ * 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
*
*/
+
+ /*
+ * TODO: The size estimates in init may not be accurate due to
+ * only partially written final blocks.
+ */
+
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <dirent.h>
#include <stdlib.h>
+#include <stdio.h>
#include <assert.h>
-#include <util.h>
+#include <alexutil.h>
#include <mfile.h>
static MFile_area_struct *open_areas = 0;
if (!ad)
{
- log(LOG_FATAL, "Could not find resource '%s'", name);
+ logf (LOG_FATAL, "Could not find resource '%s'", name);
return -1;
}
for (;;)
break;
if (rs != 3)
{
- log(LOG_FATAL, "Illegal directory description: %s", ad + offset);
+ logf (LOG_FATAL, "Illegal directory description: %s", ad + offset);
return -1;
}
switch (unit)
case 'K': case 'k': multi = 1024; break;
case 'M': case 'm': multi = 1048576; break;
default:
- log(LOG_FATAL, "Illegal unit: %c in %s", unit, ad + offset);
+ logf (LOG_FATAL, "Illegal unit: %c in %s", unit, ad + offset);
return -1;
}
*dp = dir = xmalloc(sizeof(mf_dir));
return 0;
}
-static int file_position(MFile mf, int pos)
+static int file_position(MFile mf, int pos, int offset)
{
int off = 0, c = mf->cur_file, ps;
if (mf->files[c].fd < 0 && (mf->files[c].fd = open(mf->files[c].path,
mf->wr ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
{
- log(LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
+ logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
return -1;
}
- if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize, SEEK_SET) < 0)
+ if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize + offset,
+ SEEK_SET) < 0)
{
- log(LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
+ logf (LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
return -1;
}
mf->cur_file = c;
MFile_area ma = xmalloc(sizeof(MFile_area_struct)), mp;
mf_dir *dirp;
meta_file *meta_f;
- part_file *part_f;
+ part_file *part_f = 0;
DIR *dd;
struct dirent *dent;
int fd, number;
char metaname[FILENAME_MAX+1], tmpnam[FILENAME_MAX+1];
+ logf (LOG_DEBUG, "mf_init(%s)", name);
for (mp = open_areas; mp; mp = mp->next)
if (!strcmp(name, mp->name))
abort();
ma->dirs = 0;
if (scan_areadef(ma, name) < 0)
{
- log(LOG_FATAL, "Failed to access description of '%s'", name);
+ logf (LOG_FATAL, "Failed to access description of '%s'", name);
return 0;
}
/* look at each directory */
{
if (!(dd = opendir(dirp->name)))
{
- log(LOG_FATAL|LOG_ERRNO, "Failed to open %s", dirp->name);
+ logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", dirp->name);
return 0;
}
/* look at each file */
continue;
if (sscanf(dent->d_name, "%[^.].%d", metaname, &number) != 2)
{
- log(LOG_FATAL, "Failed to resolve part-name %s", dent->d_name);
+ logf (LOG_FATAL, "Failed to resolve part-name %s",
+ dent->d_name);
return 0;
}
for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
/* get size */
if ((fd = open(part_f->path, O_RDONLY)) < 0)
{
- log(LOG_FATAL|LOG_ERRNO, "Failed to access %s", dent->d_name);
+ logf (LOG_FATAL|LOG_ERRNO, "Failed to access %s",
+ dent->d_name);
return 0;
}
if ((part_f->bytes = lseek(fd, 0, SEEK_END)) < 0)
{
- log(LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", dent->d_name);
+ logf (LOG_FATAL|LOG_ERRNO, "Failed to seek in %s",
+ dent->d_name);
return 0;
}
close(fd);
}
for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
{
- log(LOG_DEBUG, "mf_init: %s consists of %d part(s)", meta_f->name,
- meta_f->no_files);
+ logf (LOG_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);
+ cmp_part_file);
}
return ma;
}
char tmp[FILENAME_MAX+1];
mf_dir *dp;
+ logf(LOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size,
+ wflag ? "RW" : "RDONLY");
if (!ma)
{
if (!default_area && !(default_area = mf_init(MF_DEFAULT_AREA)))
{
- log(LOG_FATAL, "Failed to open default area.");
+ logf (LOG_FATAL, "Failed to open default area.");
return 0;
}
ma = default_area;
dp = dp->next);
if (!dp)
{
- log(LOG_FATAL, "Insufficient space for new mfile.");
+ logf (LOG_FATAL, "Insufficient space for new mfile.");
return 0;
}
new->files[0].dir = dp;
}
else
{
+ for (i = 0; i < new->no_files; i++)
+ {
+ if (new->files[i].bytes % block_size)
+ new->files[i].bytes += block_size - new->files[i].bytes %
+ block_size;
+ new->files[i].blocks = new->files[i].bytes / block_size;
+ }
assert(!new->open);
}
new->blocksize = block_size;
{
int i;
+ 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)
+ {
close(mf->files[i].fd);
+ mf->files[i].fd = -1;
+ }
mf->open = 0;
return 0;
}
*/
int mf_read(MFile mf, int no, int offset, int num, void *buf)
{
- int rd;
+ int rd, toread;
- if (file_position(mf, no) < 0)
+ if (file_position(mf, no, offset) < 0)
exit(1);
- if ((rd = read(mf->files[mf->cur_file].fd, buf, mf->blocksize)) < 0)
+ toread = num ? num : mf->blocksize;
+ if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
{
- log(LOG_FATAL|LOG_ERRNO, "Read failed");
+ logf (LOG_FATAL|LOG_ERRNO, "mf_read: Read failed (%s)",
+ mf->files[mf->cur_file].path);
exit(1);
}
- else if (rd < mf->blocksize)
+ else if (rd < toread)
return 0;
else
return 1;
*/
int mf_write(MFile mf, int no, int offset, int num, const void *buf)
{
- int ps;
+ int ps, nblocks, towrite;
mf_dir *dp;
char tmp[FILENAME_MAX+1];
+ unsigned char dummych = '\xff';
- if ((ps = file_position(mf, no)) < 0)
+ if ((ps = file_position(mf, no, offset)) < 0)
exit(1);
- assert(ps <= mf->files[mf->cur_file].blocks);
- /* extend table */
- if (ps == mf->files[mf->cur_file].blocks)
+ /* file needs to grow */
+ while (ps >= mf->files[mf->cur_file].blocks)
{
- assert(mf->cur_file == mf->no_files - 1);
- /* create new file */
- if (mf->files[mf->cur_file].dir->avail_bytes <
- mf->blocksize)
- {
- log(LOG_DEBUG, "Creating new file.");
+ logf (LOG_DEBUG, "File grows");
+ /* file overflow - allocate new file */
+ if ((ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize >
+ mf->files[mf->cur_file].dir->avail_bytes)
+ {
+ /* cap off file? */
+ if ((nblocks = 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, 0)) < 0)
+ exit(1);
+ if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
+ {
+ logf (LOG_ERRNO|LOG_FATAL, "write dummy");
+ exit(1);
+ }
+ mf->files[mf->cur_file].blocks += nblocks;
+ mf->files[mf->cur_file].bytes += nblocks * mf->blocksize;
+ mf->files[mf->cur_file].dir->avail_bytes -= nblocks *
+ mf->blocksize;
+ }
+ /* get other bit */
+ logf (LOG_DEBUG, "Creating new file.");
for (dp = mf->ma->dirs; dp && dp->avail_bytes < mf->min_bytes_creat;
dp = dp->next);
if (!dp)
{
- log(LOG_FATAL, "Cannot allocate more space for %s", mf->name);
+ logf (LOG_FATAL, "Cannot allocate more space for %s",
+ mf->name);
exit(1);
}
- mf->files[mf->cur_file].top = no - 1;
+ mf->files[mf->cur_file].top = (mf->cur_file ?
+ 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].path = xstrdup(tmp);
mf->no_files++;
/* open new file and position at beginning */
- if (file_position(mf, no) < 0)
+ if ((ps = file_position(mf, no, offset)) < 0)
exit(1);
}
- mf->files[mf->cur_file].blocks++;
- mf->files[mf->cur_file].bytes += mf->blocksize;
- mf->files[mf->cur_file].dir->avail_bytes -= mf->blocksize;
+ else
+ {
+ nblocks = ps - mf->files[mf->cur_file].blocks + 1;
+ mf->files[mf->cur_file].blocks += nblocks;
+ mf->files[mf->cur_file].bytes += nblocks * mf->blocksize;
+ mf->files[mf->cur_file].dir->avail_bytes -= nblocks * mf->blocksize;
+ }
}
- if (write(mf->files[mf->cur_file].fd, buf, mf->blocksize) < mf->blocksize)
+ towrite = num ? num : mf->blocksize;
+ if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite)
{
- log(LOG_FATAL|LOG_ERRNO, "Write failed");
+ logf (LOG_FATAL|LOG_ERRNO, "Write failed");
exit(1);
}
return 0;