+/*
+ * Copyright (C) 1994-1999, Index Data
+ * All rights reserved.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: drdwr.c,v $
+ * Revision 1.12 1999-05-18 20:00:33 adam
+ * Minor fix.
+ *
+ * Revision 1.11 1999/05/15 14:36:37 adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.10 1999/02/02 14:50:21 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.9 1997/09/09 13:38:01 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.8 1995/01/24 11:25:11 adam
+ * Removed stupid assertion.
+ *
+ * Revision 1.7 1994/10/05 10:47:15 adam
+ * Function pr_lru is non-static now. No warning no more.
+ *
+ * Revision 1.6 1994/09/06 13:05:14 adam
+ * Further development of insertion. Some special cases are
+ * not properly handled yet! assert(0) are put here. The
+ * binary search in each page definitely reduce usr CPU.
+ *
+ * Revision 1.5 1994/09/01 17:49:38 adam
+ * Removed stupid line. Work on insertion in dictionary. Not finished yet.
+ *
+ */
+
#include <sys/types.h>
#include <fcntl.h>
+#ifndef WIN32
#include <unistd.h>
+#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <dict.h>
-static void pr_lru (Dict_BFile bf)
+void dict_pr_lru (Dict_BFile bf)
{
struct Dict_file_block *p;
for (p=bf->lru_back; p; p = p->lru_next)
p = bf->lru_back;
if (p->dirty)
{
- bf_write (bf->bf, p->no, 0, 0, p->data);
+ if (!bf->compact_flag)
+ bf_write (bf->bf, p->no, 0, 0, p->data);
+ else
+ {
+ int effective_block = p->no / bf->block_size;
+ int effective_offset = p->no -
+ effective_block * bf->block_size;
+ int remain = bf->block_size - effective_offset;
+
+ if (remain >= p->nbytes)
+ {
+ bf_write (bf->bf, effective_block, effective_offset,
+ p->nbytes, p->data);
+#if 0
+ logf (LOG_LOG, "bf_write no=%d offset=%d size=%d",
+ effective_block, effective_offset,
+ p->nbytes);
+#endif
+
+ }
+ else
+ {
+#if 0
+ logf (LOG_LOG, "bf_write1 no=%d offset=%d size=%d",
+ effective_block, effective_offset,
+ remain);
+#endif
+ bf_write (bf->bf, effective_block, effective_offset,
+ remain, p->data);
+#if 0
+ logf (LOG_LOG, "bf_write2 no=%d offset=%d size=%d",
+ effective_block+1, 0, p->nbytes - remain);
+#endif
+ bf_write (bf->bf, effective_block+1, 0,
+ p->nbytes - remain, (char*)p->data + remain);
+ }
+ }
}
release_block (bf, p);
}
}
bf->misses++;
p = alloc_block (bf, no);
- i = bf_read (bf->bf, no, 0, 0, p->data);
+
+ if (!bf->compact_flag)
+ i = bf_read (bf->bf, no, 0, 0, p->data);
+ else
+ {
+ int effective_block = no / bf->block_size;
+ int effective_offset = no - effective_block * bf->block_size;
+
+ i = bf_read (bf->bf, effective_block, effective_offset,
+ bf->block_size - effective_offset, p->data);
+ if (i > 0 && effective_offset > 0)
+ i = bf_read (bf->bf, effective_block+1, 0, effective_offset,
+ (char*) p->data + bf->block_size - effective_offset);
+ i = 1;
+ }
if (i > 0)
{
*bufp = p->data;
return i;
}
-int dict_bf_newp (Dict_BFile dbf, int no, void **bufp)
+int dict_bf_newp (Dict_BFile dbf, int no, void **bufp, int nbytes)
{
struct Dict_file_block *p;
if (!(p = find_block (dbf, no)))
*bufp = p->data;
memset (p->data, 0, dbf->block_size);
p->dirty = 1;
-#if 1
+ p->nbytes = nbytes;
+#if 0
printf ("bf_newp of %d:", no);
- pr_lru (dbf);
+ dict_pr_lru (dbf);
#endif
return 1;
}