* Sebastian Hammer, Adam Dickmeiss
*
* $Log: isamc.c,v $
- * Revision 1.9 1998-03-06 13:54:02 adam
+ * Revision 1.14 1998-03-19 10:04:35 adam
+ * Minor changes.
+ *
+ * Revision 1.13 1998/03/18 09:23:55 adam
+ * Blocks are stored in chunks on free list - up to factor 2 in speed.
+ * Fixed bug that could occur in block category rearrangemen.
+ *
+ * Revision 1.12 1998/03/16 10:37:24 adam
+ * Added more statistics.
+ *
+ * Revision 1.11 1998/03/13 15:30:50 adam
+ * New functions isc_block_used and isc_block_size. Fixed 'leak'
+ * in isc_alloc_block.
+ *
+ * Revision 1.10 1998/03/11 11:18:18 adam
+ * Changed the isc_merge to take into account the mfill (minimum-fill).
+ *
+ * Revision 1.9 1998/03/06 13:54:02 adam
* Fixed two nasty bugs in isc_merge.
*
* Revision 1.8 1997/09/17 12:19:20 adam
#include <log.h>
#include "isamc-p.h"
+static void flush_block (ISAMC is, int cat);
static void release_fc (ISAMC is, int cat);
static void init_fc (ISAMC is, int cat);
+#define ISAMC_FREELIST_CHUNK 1
+
#define SMALL_TEST 0
ISAMC_M isc_getmethod (void)
{
static struct ISAMC_filecat_s def_cat[] = {
#if SMALL_TEST
- { 32, 28, 0, 3 },
- { 64, 54, 30, 0 },
+ { 32, 28, 0, 3 },
+ { 64, 54, 30, 0 },
#else
- { 32, 28, 0, 20 },
- { 512, 490, 100, 20 },
- { 4096, 3950, 1000, 20 },
- {32768, 32000, 10000, 0 },
+ { 32, 28, 20, 7 },
+ { 128, 120, 100, 8 },
+ { 512, 490, 350, 9 },
+ { 2048, 1900, 1700, 10 },
+ { 8192, 8000, 7900, 10 },
+ { 32768, 32000, 31000, 0 },
#endif
};
ISAMC_M m = xmalloc (sizeof(*m));
is->files[i].head.lastblock = 1;
is->files[i].head.freelist = 0;
}
+ is->files[i].alloc_entries_num = 0;
+ is->files[i].alloc_entries_max =
+ is->method->filecat[i].bsize / sizeof(int) - 1;
+ is->files[i].alloc_buf = xmalloc (is->method->filecat[i].bsize);
is->files[i].no_writes = 0;
is->files[i].no_reads = 0;
is->files[i].no_skip_writes = 0;
is->files[i].no_allocated = 0;
is->files[i].no_released = 0;
is->files[i].no_remap = 0;
+ is->files[i].no_forward = 0;
+ is->files[i].no_backward = 0;
+ is->files[i].sum_forward = 0;
+ is->files[i].sum_backward = 0;
+ is->files[i].no_next = 0;
+ is->files[i].no_prev = 0;
init_fc (is, i);
}
return is;
}
+int isc_block_used (ISAMC is, int type)
+{
+ if (type < 0 || type >= is->no_files)
+ return -1;
+ return is->files[type].head.lastblock-1;
+}
+
+int isc_block_size (ISAMC is, int type)
+{
+ ISAMC_filecat filecat = is->method->filecat;
+ if (type < 0 || type >= is->no_files)
+ return -1;
+ return filecat[type].bsize;
+}
+
int isc_close (ISAMC is)
{
int i;
if (is->method->debug)
+ {
+ logf (LOG_LOG, "isc: next forw mid-f prev backw mid-b");
+ for (i = 0; i<is->no_files; i++)
+ logf (LOG_LOG, "isc:%8d%8d%8.1f%8d%8d%8.1f",
+ is->files[i].no_next,
+ is->files[i].no_forward,
+ is->files[i].no_forward ?
+ (double) is->files[i].sum_forward/is->files[i].no_forward
+ : 0.0,
+ is->files[i].no_prev,
+ is->files[i].no_backward,
+ is->files[i].no_backward ?
+ (double) is->files[i].sum_backward/is->files[i].no_backward
+ : 0.0);
+ }
+ if (is->method->debug)
logf (LOG_LOG, "isc: writes reads skipped alloc released remap");
for (i = 0; i<is->no_files; i++)
{
is->files[i].no_released,
is->files[i].no_remap);
xfree (is->files[i].fc_list);
+ flush_block (is, i);
bf_close (is->files[i].bf);
}
xfree (is->files);
int isc_write_dblock (ISAMC is, int cat, int pos, char *src,
int nextpos, int offset)
{
- unsigned short size = offset + ISAMC_BLOCK_OFFSET_N;
+ ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=%d",
(int) size, nextpos);
return isc_write_block (is, cat, pos, src);
}
+#if ISAMC_FREELIST_CHUNK
+static void flush_block (ISAMC is, int cat)
+{
+ char *abuf = is->files[cat].alloc_buf;
+ int block = is->files[cat].head.freelist;
+ if (block && is->files[cat].alloc_entries_num)
+ {
+ memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(int));
+ bf_write (is->files[cat].bf, block, 0, 0, abuf);
+ is->files[cat].alloc_entries_num = 0;
+ }
+ xfree (abuf);
+}
+
+static int alloc_block (ISAMC is, int cat)
+{
+ int block = is->files[cat].head.freelist;
+ char *abuf = is->files[cat].alloc_buf;
+
+ (is->files[cat].no_allocated)++;
+
+ if (!block)
+ {
+ block = (is->files[cat].head.lastblock)++; /* no free list */
+ is->files[cat].head_is_dirty = 1;
+ }
+ else
+ {
+ if (!is->files[cat].alloc_entries_num) /* read first time */
+ {
+ bf_read (is->files[cat].bf, block, 0, 0, abuf);
+ memcpy (&is->files[cat].alloc_entries_num, abuf,
+ sizeof(is->files[cat].alloc_entries_num));
+ assert (is->files[cat].alloc_entries_num > 0);
+ }
+ /* have some free blocks now */
+ assert (is->files[cat].alloc_entries_num > 0);
+ is->files[cat].alloc_entries_num--;
+ if (!is->files[cat].alloc_entries_num) /* last one in block? */
+ {
+ memcpy (&is->files[cat].head.freelist, abuf + sizeof(int),
+ sizeof(int));
+ is->files[cat].head_is_dirty = 1;
+
+ if (is->files[cat].head.freelist)
+ {
+ bf_read (is->files[cat].bf, is->files[cat].head.freelist,
+ 0, 0, abuf);
+ memcpy (&is->files[cat].alloc_entries_num, abuf,
+ sizeof(is->files[cat].alloc_entries_num));
+ assert (is->files[cat].alloc_entries_num);
+ }
+ }
+ else
+ memcpy (&block, abuf + sizeof(int) + sizeof(int) *
+ is->files[cat].alloc_entries_num, sizeof(int));
+ }
+ return block;
+}
+
+static void release_block (ISAMC is, int cat, int pos)
+{
+ char *abuf = is->files[cat].alloc_buf;
+ int block = is->files[cat].head.freelist;
+
+ (is->files[cat].no_released)++;
+
+ if (block && !is->files[cat].alloc_entries_num) /* must read block */
+ {
+ bf_read (is->files[cat].bf, block, 0, 0, abuf);
+ memcpy (&is->files[cat].alloc_entries_num, abuf,
+ sizeof(is->files[cat].alloc_entries_num));
+ assert (is->files[cat].alloc_entries_num > 0);
+ }
+ assert (is->files[cat].alloc_entries_num <= is->files[cat].alloc_entries_max);
+ if (is->files[cat].alloc_entries_num == is->files[cat].alloc_entries_max)
+ {
+ assert (block);
+ memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(int));
+ bf_write (is->files[cat].bf, block, 0, 0, abuf);
+ is->files[cat].alloc_entries_num = 0;
+ }
+ if (!is->files[cat].alloc_entries_num) /* make new buffer? */
+ {
+ memcpy (abuf + sizeof(int), &block, sizeof(int));
+ is->files[cat].head.freelist = pos;
+ is->files[cat].head_is_dirty = 1;
+ }
+ else
+ {
+ memcpy (abuf + sizeof(int) +
+ is->files[cat].alloc_entries_num*sizeof(int),
+ &pos, sizeof(int));
+ }
+ is->files[cat].alloc_entries_num++;
+}
+#else
+static void flush_block (ISAMC is, int cat)
+{
+ char *abuf = is->files[cat].alloc_buf;
+ xfree (abuf);
+}
+
static int alloc_block (ISAMC is, int cat)
{
int block;
return block;
}
+static void release_block (ISAMC is, int cat, int pos)
+{
+ char buf[sizeof(int)];
+
+ (is->files[cat].no_released)++;
+ is->files[cat].head_is_dirty = 1;
+ memcpy (buf, &is->files[cat].head.freelist, sizeof(int));
+ is->files[cat].head.freelist = pos;
+ bf_write (is->files[cat].bf, pos, 0, sizeof(int), buf);
+}
+#endif
+
int isc_alloc_block (ISAMC is, int cat)
{
int block = 0;
if ((nb = is->files[cat].fc_list[j]) && (!block || nb < block))
{
is->files[cat].fc_list[j] = 0;
+ block = nb;
break;
}
}
return block;
}
-static void release_block (ISAMC is, int cat, int pos)
-{
- char buf[sizeof(int)];
-
- (is->files[cat].no_released)++;
- is->files[cat].head_is_dirty = 1;
- memcpy (buf, &is->files[cat].head.freelist, sizeof(int));
- is->files[cat].head.freelist = pos;
- bf_write (is->files[cat].bf, pos, 0, sizeof(int), buf);
-}
-
void isc_release_block (ISAMC is, int cat, int pos)
{
if (is->method->debug > 3)
if (pp->offset >= pp->size)
{
+ if (!pp->next)
+ {
+ pp->pos = 0;
+ return 0; /* end of file */
+ }
+ if (pp->next > pp->pos)
+ {
+ if (pp->next == pp->pos + 1)
+ is->files[pp->cat].no_next++;
+ else
+ {
+ is->files[pp->cat].no_forward++;
+ is->files[pp->cat].sum_forward += pp->next - pp->pos;
+ }
+ }
+ else
+ {
+ if (pp->next + 1 == pp->pos)
+ is->files[pp->cat].no_prev++;
+ else
+ {
+ is->files[pp->cat].no_backward++;
+ is->files[pp->cat].sum_backward += pp->pos - pp->next;
+ }
+ }
/* out new block position */
pp->pos = pp->next;
- if (!pp->pos)
- return 0; /* end of file */
src = pp->buf;
/* read block and save 'next' and 'size' entry */
isc_read_block (is, pp->cat, pp->pos, src);