/*
- * Copyright (C) 1995, Index Data I/S
+ * Copyright (C) 1995-1998, Index Data ApS
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: cfile.c,v $
- * Revision 1.13 1996-04-09 14:48:49 adam
+ * 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
+ * Minor changes.
+ *
+ * Revision 1.16 1996/04/19 16:23:47 adam
+ * Serious bug fix in shadow implementation; function new_bucket might
+ * set wrong bucket number on new bucket.
+ *
+ * Revision 1.15 1996/04/18 16:02:56 adam
+ * Changed logging a bit.
+ * Removed warning message when commiting flat shadow files.
+ *
+ * Revision 1.14 1996/04/12 07:01:55 adam
+ * Yet another bug fix (next_block was initialized to 0; now set to 1).
+ *
+ * Revision 1.13 1996/04/09 14:48:49 adam
* Bug fix: offset calculation when using flat files was completely broken.
*
* Revision 1.12 1996/04/09 06:47:28 adam
#include <stdlib.h>
#include <string.h>
-#include <alexutil.h>
+#include <zebrautl.h>
#include <mfile.h>
#include "cfile.h"
{
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", cf->rmf->name);
+ 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)))
{
hash_bytes = cf->head.hash_size * sizeof(int);
cf->head.flat_bucket = cf->head.next_bucket = cf->head.first_bucket =
(hash_bytes+sizeof(cf->head))/HASH_BSIZE + 2;
- cf->head.next_block = 0;
+ cf->head.next_block = 1;
if (wflag)
mf_write (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head);
cf->array = xmalloc (hash_bytes);
assert (cf->head.hash_size > 2);
hash_bytes = cf->head.hash_size * sizeof(int);
assert (cf->head.next_bucket > 0);
+ assert (cf->head.next_block > 0);
if (cf->head.state == 1)
cf->array = xmalloc (hash_bytes);
else
return p;
}
-static struct CFile_hash_bucket *new_bucket (CFile cf, int *block_no, int hno)
+static struct CFile_hash_bucket *new_bucket (CFile cf, int *block_nop, int hno)
{
struct CFile_hash_bucket *p;
- int i;
+ int i, block_no;
- *block_no = cf->head.next_bucket++;
- p = alloc_bucket (cf, *block_no, hno);
+ block_no = *block_nop = cf->head.next_bucket++;
+ p = alloc_bucket (cf, block_no, hno);
for (i = 0; i<HASH_BUCKET; i++)
{
p->ph.no[i] = 0;
}
p->ph.next_bucket = 0;
- p->ph.this_bucket = *block_no;
+ p->ph.this_bucket = block_no;
p->dirty = 1;
return p;
}
}
if (hb)
continue;
+#if 0
+ /* extra check ... */
+ for (hb = cf->bucket_lru_back; hb; hb = hb->lru_next)
+ {
+ if (hb->ph.this_bucket == block_no)
+ {
+ logf (LOG_FATAL, "Found hash bucket on other chain (1)");
+ abort ();
+ }
+ for (i = 0; i<HASH_BUCKET && hb->ph.vno[i]; i++)
+ if (hb->ph.no[i] == no)
+ {
+ logf (LOG_FATAL, "Found hash bucket on other chain (2)");
+ abort ();
+ }
+ }
+#endif
(cf->no_miss)++;
hb = get_bucket (cf, block_no, hno);
for (i = 0; i<HASH_BUCKET && hb->ph.vno[i]; i++)
hno += cf->head.next_bucket;
if (hno >= cf->head.flat_bucket)
cf->head.flat_bucket = hno+1;
+ cf->dirty = 1;
mf_write (cf->hash_mf, hno, off, sizeof(int), &vno);
}
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);
xfree (cf->parray);
cf->parray = NULL;
cf->head.state = 2;
+ cf->dirty = 1;
}
static int cf_lookup (CFile cf, int no)
}
if (hb)
continue;
+
+#if 0
+ /* extra check ... */
+ for (hb = cf->bucket_lru_back; hb; hb = hb->lru_next)
+ {
+ if (hb->ph.this_bucket == *bucketpp)
+ {
+ logf (LOG_FATAL, "Found hash bucket on other chain");
+ abort ();
+ }
+ }
+#endif
(cf->no_miss)++;
hb = get_bucket (cf, *bucketpp, hno);
assert (hb);
{
if (cf->head.state > 1)
return cf_new_flat (cf, no);
- if (cf->no_miss*5 > cf->no_hits)
+ if (cf->no_miss*2 > cf->no_hits)
{
cf_moveto_flat (cf);
assert (cf->head.state > 1);
int cf_close (CFile cf)
{
- logf (LOG_LOG, "cf_close %s", cf->rmf->name);
- 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);