/*
- * Copyright (C) 1995, Index Data I/S
+ * Copyright (C) 1995-1999, Index Data ApS
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: cfile.c,v $
- * Revision 1.18 1996-10-29 13:56:15 adam
+ * Revision 1.24 1999-05-12 13:08:06 adam
+ * First version of ISAMS.
+ *
+ * Revision 1.23 1998/10/15 13:09:29 adam
+ * Minor changes.
+ *
+ * Revision 1.22 1998/10/13 20:07:22 adam
+ * Changed some log messages.
+ *
+ * Revision 1.21 1998/08/24 17:29:52 adam
+ * Minor changes.
+ *
+ * Revision 1.20 1998/08/07 15:07:13 adam
+ * Fixed but in cf_commit_flat.
+ *
+ * Revision 1.19 1997/02/12 20:37:17 adam
+ * Changed the messages logged. No real code changed.
+ *
+ * Revision 1.18 1996/10/29 13:56:15 adam
* Include of zebrautl.h instead of alexutil.h.
*
* Revision 1.17 1996/04/19 16:49:00 adam
{
char path[1024];
int i;
- CFile cf = xmalloc (sizeof(*cf));
+ CFile cf = (CFile) xmalloc (sizeof(*cf));
int hash_bytes;
cf->rmf = mf;
- logf (LOG_LOG, "cf_open %s %s", cf->rmf->name, wflag ? "rdwr" : "rd");
+ logf (LOG_DEBUG, "cf: open %s %s", cf->rmf->name, wflag ? "rdwr" : "rd");
sprintf (path, "%s-b", fname);
if (!(cf->block_mf = mf_open (area, path, block_size, wflag)))
{
struct CFile_hash_bucket *p;
int i, j;
- logf (LOG_LOG, "Moving to flat shadow: %s", cf->rmf->name);
- logf (LOG_LOG, "hits=%d miss=%d bucket_in_memory=%d total=%d",
+ logf (LOG_DEBUG, "cf: Moving to flat shadow: %s", cf->rmf->name);
+ logf (LOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=%d total=%d",
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
assert (cf->head.state == 1);
}
-int cf_read (CFile cf, int no, int offset, int num, void *buf)
+int cf_read (CFile cf, int no, int offset, int nbytes, void *buf)
{
int block;
assert (cf);
if (!(block = cf_lookup (cf, no)))
return -1;
- if (!mf_read (cf->block_mf, block, offset, num, buf))
+ if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
logf (LOG_FATAL|LOG_ERRNO, "cf_read no=%d, block=%d", no, block);
exit (1);
return 1;
}
-int cf_write (CFile cf, int no, int offset, int num, const void *buf)
+int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
{
int block;
if (!(block = cf_lookup (cf, no)))
{
block = cf_new (cf, no);
- if (offset || num)
+ if (offset || nbytes)
{
mf_read (cf->rmf, no, 0, 0, cf->iobuf);
- memcpy (cf->iobuf + offset, buf, num);
+ memcpy (cf->iobuf + offset, buf, nbytes);
buf = cf->iobuf;
offset = 0;
- num = 0;
+ nbytes = 0;
}
}
- if (mf_write (cf->block_mf, block, offset, num, buf))
+ if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
logf (LOG_FATAL|LOG_ERRNO, "cf_write no=%d, block=%d", no, block);
exit (1);
int cf_close (CFile cf)
{
- logf (LOG_LOG, "hits=%d miss=%d bucket_in_memory=%d total=%d",
+ logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=%d total=%d",
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
flush_bucket (cf, -1);
if (cf->dirty)
{
- logf (LOG_LOG, "cf_close %s, dirty", cf->rmf->name);
mf_write (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head);
write_head (cf);
}
- else
- logf (LOG_LOG, "cf_close %s", cf->rmf->name);
mf_close (cf->hash_mf);
mf_close (cf->block_mf);
xfree (cf->array);