--- freem/src/global_bltin.c 2025/04/10 01:24:38 1.15
+++ freem/src/global_bltin.c 2025/04/11 20:55:49 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: global_bltin.c,v 1.15 2025/04/10 01:24:38 snw Exp $
+ * $Id: global_bltin.c,v 1.21 2025/04/11 20:55:49 snw Exp $
* freem database engine
*
*
@@ -24,6 +24,24 @@
* along with FreeM. If not, see .
*
* $Log: global_bltin.c,v $
+ * Revision 1.21 2025/04/11 20:55:49 snw
+ * Disable -Wunused-result where possible
+ *
+ * Revision 1.20 2025/04/11 18:24:32 snw
+ * Fix bug in memory cache
+ *
+ * Revision 1.19 2025/04/11 16:52:05 snw
+ * Fix indentation in global handler
+ *
+ * Revision 1.18 2025/04/11 16:23:18 snw
+ * Avoid re-reading the same block consecutively when possible
+ *
+ * Revision 1.17 2025/04/11 14:21:03 snw
+ * Make all but one of the read/write calls in global_bltin use gbl_read_block or gbl_write_block
+ *
+ * Revision 1.16 2025/04/11 00:52:40 snw
+ * Replace all lseek/read calls in global handler to use gbl_read_block function
+ *
* Revision 1.15 2025/04/10 01:24:38 snw
* Remove C++ style comments
*
@@ -81,13 +99,13 @@ global_handle *global_handles_head;
unsigned long gbl_cache_misses = 0;
unsigned long gbl_cache_hits = 0;
-static void b_free (short filedes, unsigned long blknbr);
+static void b_free (global_handle *g, unsigned long blknbr);
static void splitp (global_handle *g, char *block, long *addr, long *offs, unsigned long *blknbr);
static void update (global_handle *g, char *ins_key, long keyl);
static void insert (global_handle *g, char *ins_key, long key_len, unsigned long blknbr);
static void scanpblk (char *block, long *adr, long *fnd);
static void scandblk (char *block, long *adr, long *fnd);
-static void getnewblk (int filedes, unsigned long *blknbr);
+static void getnewblk (global_handle *g, unsigned long *blknbr);
static short int g_collate (char *t);
short g_numeric (char *str);
void close_all_globals(void);
@@ -133,7 +151,7 @@ static void panic (void);
#define DATA 8
#if !defined(__OpenBSD__) && !defined(_AIX) && !defined(__osf__) && !defined(MSDOS) && !defined(__vax__) && !defined(__OS2__)
- long time ();
+long time ();
#endif
inline long gbl_path(char *key, char *buf)
@@ -316,7 +334,7 @@ int gbl_write_header(global_handle *g, g
if (g->opened == FALSE) {
return FALSE;
}
-
+
gbl_lock (g, 1);
old_position = lseek (g->fd, 0, SEEK_CUR);
lseek (g->fd, 0, SEEK_SET);
@@ -439,9 +457,13 @@ short gbl_open(global_handle *g, short a
}
else {
g->opened = TRUE;
- result = gbl_read_header (g, &g->header);
+ result = gbl_read_header (g, &g->header);
if (result == GBL_HDR_OK) {
+ /* initialize last_block_accessed cache */
+ g->last_block_accessed = (char *) calloc (g->header.block_size, sizeof (char));
+ NULLPTRCHK(g->last_block_accessed,"gbl_open");
+
g->opened = TRUE;
}
else {
@@ -471,6 +493,85 @@ short gbl_open(global_handle *g, short a
} /* gbl_open() */
+int gbl_read_block(global_handle *g, unsigned long blocknum, char *block)
+{
+ struct stat gstat;
+ unsigned long hdr_offset;
+ hdr_offset = sizeof (global_header);
+
+ if (g->opened == FALSE) {
+ return FALSE;
+ }
+
+ g->use_count++;
+
+ if (!g->locked) gbl_lock (g, 1);
+ fstat (g->fd, &gstat);
+
+ if ((g->last_block == blocknum) &&
+ (g->have_cached_block) &&
+ (g->cached_block_num == blocknum) &&
+ (gstat.st_mtime < g->last_read_time)) {
+ /* the global has not been modified since the last read; grab from memory */
+ g->memory_reads++;
+ memcpy (block, g->last_block_accessed, g->header.block_size);
+ }
+ else {
+ /* have to go out to disk */
+ lseek (g->fd, hdr_offset + ((long) blocknum * (long) (g->header.block_size)), SEEK_SET);
+ read (g->fd, block, g->header.block_size);
+
+ /* update cache */
+ memcpy (g->last_block_accessed, block, g->header.block_size);
+ g->have_cached_block = TRUE;
+ g->cached_block_num = blocknum;
+ g->last_block = blocknum;
+ g->read_ops++;
+ }
+
+ g->last_read_time = time (0L);
+ g->use_count++;
+
+ if (g->locked) gbl_unlock (g);
+
+ return TRUE;
+} /* gbl_read_block() */
+
+int gbl_write_block(global_handle *g, unsigned long blocknum, char *block)
+{
+ int errsav;
+ unsigned long hdr_offset;
+ hdr_offset = sizeof (global_header);
+
+ if (g->opened == FALSE) {
+ return FALSE;
+ }
+
+ gbl_lock (g, 1);
+
+ for (;;) {
+
+ errno = 0;
+
+ lseek (g->fd, hdr_offset + (blocknum * g->header.block_size), SEEK_SET);
+ write (g->fd, block, BLOCKLEN);
+ errsav = errno;
+ g->last_block = blocknum;
+ g->use_count++;
+ g->write_ops++;
+
+ if (errsav == 0) break;
+
+ panic ();
+
+ }
+
+ gbl_update_tid (g);
+ gbl_unlock (g);
+
+ return TRUE;
+}
+
global_handle *gbl_handle(char *key)
{
global_handle *g;
@@ -512,12 +613,18 @@ global_handle *gbl_handle(char *key)
g->use_count = 1;
g->locked = FALSE;
g->age = time (0L);
+ g->last_read_time = 0;
g->last_block = 0;
g->opened = FALSE;
g->fd = 0;
g->fast_path = -1;
g->cache_misses = 0;
g->cache_hits = 0;
+ g->read_ops = 0;
+ g->write_ops = 0;
+ g->memory_reads = 0;
+ g->have_cached_block = FALSE;
+ g->last_block_accessed = NULL;
strcpy (g->global_name, global_name);
gbl_path (key, g->global_path);
@@ -636,7 +743,7 @@ void global_bltin (short action, char *k
static char block[BLOCKLEN];
static int getnflag; /* flag 1=$ZO-variable 0=$Q-function */
static int tryfast; /* try fast access if get_sym on */
- /* previous global */
+ /* previous global */
int iresult;
@@ -645,83 +752,62 @@ void global_bltin (short action, char *k
register long int k;
register long int ch;
- j = 0;
-
+ j = 0;
hdr_offset = sizeof (global_header);
/* process optional limitations */
if (glvnflag.all && key[0] >= '%' && key[0] <= 'z') {
if ((i = glvnflag.one[0])) { /* number of significant chars */
-
j = 0;
while ((k = key[j]) != DELIM && k != EOL) {
-
if (j >= i) {
-
while ((k = key[++j]) != DELIM && k != EOL);
-
stcpy (&key[i], &key[j]);
-
break;
}
-
j++;
-
}
}
if (glvnflag.one[1]) { /* upper/lower sensitivity */
-
j = 0;
-
while ((k = key[j]) != DELIM && k != EOL) {
-
if (k >= 'a' && k <= 'z') key[j] = k - 32;
-
j++;
-
}
}
if ((i = glvnflag.one[2])) {
-
if (stlen (key) > i) {
merr_raise (M75);
return;
} /* key length limit */
-
}
if ((i = glvnflag.one[3])) { /* subscript length limit */
-
+
j = 0;
-
while ((k = key[j++]) != DELIM && k != EOL);
-
+
if (k == DELIM) {
-
k = 0;
for (;;) {
-
k = key[j++];
-
if (k == DELIM || k == EOL) {
-
if (k > i) {
merr_raise (M75);
return;
}
-
k = 0;
}
-
if (k == EOL) break;
k++;
}
}
+
}
}
@@ -784,22 +870,6 @@ void global_bltin (short action, char *k
}
}
- if (v22ptr) {
-
- procv22 (key);
-
- if (key[0] != '^') {
- char losav[256];
-
- stcpy (losav, l_o_val);
- symtab (action, key, data);
- stcpy (g_o_val, l_o_val);
- stcpy (l_o_val, losav);
-
- return;
- }
- }
-
g = gbl_handle (key);
i = gbl_path (key, filnam);
@@ -864,10 +934,8 @@ void global_bltin (short action, char *k
compactkey[k++] = ch << 1;
}
- else if (ch < SP || ch >= DEL) {
-
- /*no CTRLs */
-
+ else if (ch < SP || ch >= DEL) {
+ /* no CTRLs */
merr_raise (SBSCR);
return;
}
@@ -1011,19 +1079,9 @@ reopen:
merr_raise (iresult);
return;
}
-
- for (;;) {
-
- errno = 0;
-
- lseek (g->fd, hdr_offset + (ROOT * BLOCKLEN), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
-
- if (errno == 0) break;
-
- panic ();
- }
+ gbl_write_block (g, ROOT, block);
+
block[NRBLK] = 0;
block[NRBLK + 1] = 0;
block[NRBLK + 2] = ROOT; /* clear */
@@ -1060,7 +1118,7 @@ reopen:
/* even ones read/write access (set_sym,kill_sym) 1 */
/* temporarily disabled
-lock:
+ lock:
*/
if (action == get_sym) {
@@ -1076,110 +1134,108 @@ tfast0:
tfast1:
-
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+ gbl_read_block (g, blknbr, block);
/* temporarily disabled
-tfast2:
+ tfast2:
*/
- if ((typ = block[BTYP]) == DATA) { /* scan data block: here we test for equality only */
-
- offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
- j = UNSIGN (block[0]);
- i = 0;
+ if ((typ = block[BTYP]) == DATA) { /* scan data block: here we test for equality only */
- stcpy0 (key1, &block[2], j); /* get first key */
-
- ch = keyl; /* ch is a register! */
-
- while (i < offset) {
-
- j = UNSIGN (block[i++]); /* length of key - offset */
- k = UNSIGN (block[i++]); /* offset into previous entry */
+ offset = UNSIGN (block[OFFS]) * 256 +
+ UNSIGN (block[OFFS + 1]);
+ j = UNSIGN (block[0]);
+ i = 0;
- j += k;
+ stcpy0 (key1, &block[2], j); /* get first key */
- while (k < j) key1[k++] = block[i++]; /* get key */
-
- if (j != ch) { /* keys have different length */
+ ch = keyl; /* ch is a register! */
+
+ while (i < offset) {
+
+ j = UNSIGN (block[i++]); /* length of key - offset */
+ k = UNSIGN (block[i++]); /* offset into previous entry */
+
+ j += k;
+
+ while (k < j) key1[k++] = block[i++]; /* get key */
+
+ if (j != ch) { /* keys have different length */
+
+ i += UNSIGN (block[i]);
+ i++;
+
+ continue;
+
+ }
+
+ j = ch;
+
+ do {
+ j--;
+ } while (compactkey[j] == key1[j]); /* compare keys */
+
+
+ if (j < 0) {
+
+ k = UNSIGN (block[i++]);
+ stcpy0 (data, &block[i], k); /* get value */
+ data[k] = EOL1; /* append EOL */
+
+ goto quit;
+
+ }
i += UNSIGN (block[i]);
- i++;
-
- continue;
-
+ i++; /* skip data */
+
+ }
+
+ /* fast access failed. try normal path */
+ if (tryfast) {
+ gbl_cache_miss (g);
+ goto tfast0;
}
- j = ch;
+ merr_raise (M7);
+ data[0] = EOL;
- do {
- j--;
- } while (compactkey[j] == key1[j]); /* compare keys */
+ goto quit; /* variable not found */
+ }
+ else {
-
- if (j < 0) {
+ if (g->fast_path > 0) {
+ gbl_cache_miss (g);
+ goto tfast0;
+ }
+
+ if (typ == EMPTY) {
- k = UNSIGN (block[i++]);
- stcpy0 (data, &block[i], k); /* get value */
- data[k] = EOL1; /* append EOL */
-
+ if (blknbr == ROOT) {
+ gbl_close (g);
+ goto reopen;
+ }
+
+ merr_raise (DBDGD);
goto quit;
-
+
}
-
- i += UNSIGN (block[i]);
- i++; /* skip data */
-
- }
-
- /* fast access failed. try normal path */
- if (tryfast) {
- gbl_cache_miss (g);
- goto tfast0;
+
}
-
- merr_raise (M7);
- data[0] = EOL;
- goto quit; /* variable not found */
- }
- else {
-
- if (g->fast_path > 0) {
- gbl_cache_miss (g);
- goto tfast0;
- }
-
- if (typ == EMPTY) {
-
- if (blknbr == ROOT) {
- gbl_close (g);
- goto reopen;
- }
-
+ scanpblk (block, &addr, &found);
+
+ addr += UNSIGN (block[addr]) + 2; /* skip key */
+
+ if ((blknbr = UNSIGN (block[addr]) * 65536 + UNSIGN (block[addr + 1]) * 256 + UNSIGN (block[addr + 2])) == g->last_block) {
merr_raise (DBDGD);
goto quit;
-
}
- }
-
- scanpblk (block, &addr, &found);
-
- addr += UNSIGN (block[addr]) + 2; /* skip key */
-
- if ((blknbr = UNSIGN (block[addr]) * 65536 + UNSIGN (block[addr + 1]) * 256 + UNSIGN (block[addr + 2])) == g->last_block) {
- merr_raise (DBDGD);
- goto quit;
- }
-
- addr += PLEN; /* skip data */
- g->last_block = blknbr;
- g->fast_path = 1;
+ addr += PLEN; /* skip data */
+ g->last_block = blknbr;
+ g->fast_path = 1;
- if (merr () == INRPT) goto quit;
+ if (merr () == INRPT) goto quit;
}
} /* end of get_sym */
@@ -1189,14 +1245,12 @@ tfast2:
/* a KILL on an unsubscripted global deletes the entire file */
if (action == kill_sym && compactkey[0] == g_EOL) {
- lseek (g->fd, hdr_offset + ROOT, SEEK_SET);
-
- /* note : UNIX does not tell other */
- block[BTYP] = EMPTY; /* jobs that a file has been unlinked */
-
+ /* note : UNIX does not tell other jobs that a file has been unlinked */
/* as long as they keep it open. */
/* so we mark this global as EMPTY */
- write (g->fd, block, BLOCKLEN);
+ block[BTYP] = EMPTY;
+
+ gbl_write_block (g, ROOT, block);
gbl_unlock (g);
gbl_close (g);
@@ -1221,10 +1275,8 @@ k_again: /* entry point for repeated
traceblk[trx] = blknbr;
traceadr[trx] = 0;
-
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
-
+
+ gbl_read_block (g, blknbr, block);
typ = block[BTYP];
if (typ == DATA) {
@@ -1267,7 +1319,7 @@ k_again: /* entry point for repeated
datal = stlen (data);
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
if (found != 2) { /* new entry */
@@ -1293,7 +1345,8 @@ k_again: /* entry point for repeated
}
-s10: {
+s10:
+ {
long len; /* insert key */
char key0[256];
@@ -1391,8 +1444,7 @@ s10: {
}
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
+ gbl_write_block (g, blknbr, block);
if (traceadr[trx] == 0) update (g, compactkey, keyl);
@@ -1445,7 +1497,7 @@ s10: {
goto splitd;
}
-s20:
+ s20:
i = offset;
k = addr + olddatal;
@@ -1478,10 +1530,8 @@ s20:
}
stcpy0 (&block[++addr], data, (long) datal);
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
- gbl_update_tid (g);
+ gbl_write_block (g, blknbr, block);
break;
@@ -1507,14 +1557,13 @@ s20:
/* get following entry, eventually in the next blk */
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
if (addr >= offset) {
if ((blknbr = UNSIGN (block[RLPTR]) * 65536 + UNSIGN (block[RLPTR + 1]) * 256 + UNSIGN (block[RLPTR + 2]))) {
-
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+
+ gbl_read_block (g, blknbr, block);
j1 = UNSIGN (block[0]);
i = 0;
@@ -1595,9 +1644,8 @@ s20:
goto quit;
} /* no next block */
-
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+
+ gbl_read_block (g, blknbr, block);
scandblk (block, &addr, &found);
}
@@ -1644,7 +1692,7 @@ s20:
while (i < keyl) if (compactkey[i++] & 01)
- j1++;
+ j1++;
i = 0;
j = 0;
k = 0;
@@ -1677,8 +1725,8 @@ s20:
while ((ch = UNSIGN (scratch[i++])) != g_EOL) {
ch0 = (ch >= SP ? (ch >> 1) : /* 'string' chars */
- (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
- (ch >> 1) + SP)); /* '.' or '-' */
+ (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
+ (ch >> 1) + SP)); /* '.' or '-' */
if (ch0 == DEL) {
@@ -1753,12 +1801,11 @@ s20:
goto quit; /* no next block */
}
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+ gbl_read_block (g, blknbr, block);
addr = 0;
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
}
}
@@ -1777,8 +1824,7 @@ s20:
goto quit; /* no next block */
}
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+ gbl_read_block (g, blknbr, block);
addr = 0;
}
@@ -1826,8 +1872,8 @@ s20:
while ((ch = UNSIGN (key0[i++])) != g_EOL) {
ch0 = (ch >= SP ? (ch >> 1) : /* 'string' chars */
- (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
- (ch >> 1) + SP)); /* '.' or '-' */
+ (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
+ (ch >> 1) + SP)); /* '.' or '-' */
if (ch0 == DEL) {
@@ -1903,8 +1949,8 @@ s20:
}
ch0 = (ch >= SP ? (ch >> 1) : /* 'string' chars */
- (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
- (ch >> 1) + SP)); /* '.' or '-' */
+ (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
+ (ch >> 1) + SP)); /* '.' or '-' */
if (ch0 == DEL) {
@@ -1948,7 +1994,7 @@ s20:
case kill_sym: /* search and destroy */
-killo: /* entry from killone section */
+ killo: /* entry from killone section */
offset = UNSIGN (block[OFFS]) * 256 + UNSIGN (block[OFFS + 1]);
i = 0;
@@ -1987,32 +2033,30 @@ killo: /* entry from killone section
other = traceblk[--trx];
addr = traceadr[trx];
-
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+
+ gbl_read_block (g, other, block);
addr += UNSIGN (block[addr]);
addr += (2 + PLEN); /* skip previous entry */
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
traceadr[trx] = addr;
if (addr < offset) break;
traceadr[trx] = 0;
traceblk[trx] = UNSIGN (block[RLPTR]) * 65536 +
- UNSIGN (block[RLPTR + 1]) * 256 +
- UNSIGN (block[RLPTR + 2]);
+ UNSIGN (block[RLPTR + 1]) * 256 +
+ UNSIGN (block[RLPTR + 2]);
}
trx = trxsav;
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+ gbl_read_block (g, blknbr, block);
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
addr = 0;
k = UNSIGN (block[0]);
stcpy0 (key0, &block[2], k);
@@ -2101,47 +2145,43 @@ killo: /* entry from killone section
if ((begadr == 0) && (endadr == offset)) { /* block becomes empty */
long left,
- right;
+ right;
char block0[BLOCKLEN];
-p_empty: /* entry if pointer block goes empty */
+ p_empty: /* entry if pointer block goes empty */
left = UNSIGN (block[LLPTR]) * 65536 +
- UNSIGN (block[LLPTR + 1]) * 256 +
- UNSIGN (block[LLPTR + 2]);
+ UNSIGN (block[LLPTR + 1]) * 256 +
+ UNSIGN (block[LLPTR + 2]);
right = UNSIGN (block[RLPTR]) * 65536 +
- UNSIGN (block[RLPTR + 1]) * 256 +
- UNSIGN (block[RLPTR + 2]);
+ UNSIGN (block[RLPTR + 1]) * 256 +
+ UNSIGN (block[RLPTR + 2]);
if (left) {
- lseek (g->fd, hdr_offset + ((long) left * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block0, BLOCKLEN);
+ gbl_read_block (g, left, block0);
block0[RLPTR] = block[RLPTR];
block0[RLPTR + 1] = block[RLPTR + 1];
block0[RLPTR + 2] = block[RLPTR + 2];
-
- lseek (g->fd, hdr_offset + ((long) left * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+
+ gbl_write_block (g, left, block0);
}
if (right) {
-
- lseek (g->fd, hdr_offset + ((long) right * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block0, BLOCKLEN);
+
+ gbl_read_block (g, right, block0);
block0[LLPTR] = block[LLPTR];
block0[LLPTR + 1] = block[LLPTR + 1];
block0[LLPTR + 2] = block[LLPTR + 2];
-
- lseek (g->fd, hdr_offset + ((long) right * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+
+ gbl_write_block (g, right, block0);
}
- b_free (g->fd, blknbr); /* modify free list */
+ b_free (g, blknbr); /* modify free list */
/* delete pointer */
/**************************/
@@ -2154,10 +2194,9 @@ p_empty: /* entry if pointer block goes
blknbr = traceblk[--trx];
addr = traceadr[trx];
- lseek (g->fd, hdr_offset + ((long) (blknbr) * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+ gbl_read_block (g, blknbr, block);
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
freecnt = UNSIGN (block[addr]) + 2 + PLEN;
/* delete key */
@@ -2167,14 +2206,15 @@ p_empty: /* entry if pointer block goes
if (blknbr == ROOT) { /* global went empty */
- lseek (g->fd, hdr_offset + 0L, SEEK_SET);
+
/* note : UNIX does not tell other */
block[BTYP] = EMPTY; /* jobs that a file has been unlinked */
/* as long as they keep it open. */
/* so we mark this global as EMPTY */
- write (g->fd, block, BLOCKLEN);
+ gbl_write_block (g, 0L, block);
+
gbl_close (g);
unlink (filnam);
@@ -2199,8 +2239,7 @@ p_empty: /* entry if pointer block goes
for (i = offset; i < offset + freecnt; block[i++] = 0);
- lseek (g->fd, hdr_offset + ((long) (blknbr) * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
+ gbl_write_block (g, blknbr, block);
if (addr == 0) { /* update of pointer */
traceadr[trx] = 0;
@@ -2230,28 +2269,29 @@ p_empty: /* entry if pointer block goes
j = block[begadr + 1];
k = 0;
if (begadr)
- while (key0[k] == key1[k])
- k++; /* new key_offset */
+ while (key0[k] == key1[k])
+ k++; /* new key_offset */
if (k < j) {
- ch = j - k; /* space requirement */
- block[begadr] = i + ch; /* new key_length */
- block[begadr + 1] = k; /* new key_offset */
- i = offset;
- j = i + ch;
- offset = j;
- begadr++;
- while (i > begadr)
- block[j--] = block[i--];
- stcpy0 (&block[begadr + 1], &key0[k], ch);
+ ch = j - k; /* space requirement */
+ block[begadr] = i + ch; /* new key_length */
+ block[begadr + 1] = k; /* new key_offset */
+ i = offset;
+ j = i + ch;
+ offset = j;
+ begadr++;
+ while (i > begadr)
+ block[j--] = block[i--];
+ stcpy0 (&block[begadr + 1], &key0[k], ch);
}
}
block[OFFS] = offset / 256;
block[OFFS + 1] = offset % 256;
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
+
+ gbl_write_block (g, blknbr, block);
+
if (addr < 3) { /* update of pointer */
- traceadr[trx] = 0;
- update (g, &block[2], (long) UNSIGN (block[0]));
+ traceadr[trx] = 0;
+ update (g, &block[2], (long) UNSIGN (block[0]));
}
}
@@ -2259,7 +2299,7 @@ p_empty: /* entry if pointer block goes
break;
-zinv:
+ zinv:
{
long len;
@@ -2273,12 +2313,11 @@ zinv:
data[0] = EOL1;
goto quit;
} /* no previous block */
-
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+
+ gbl_read_block (g, blknbr, block);
addr = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
}
@@ -2353,8 +2392,8 @@ zinv:
while ((ch = UNSIGN (scratch[i++])) != g_EOL) {
ch0 = (ch >= SP ? (ch >> 1) : /* 'string' chars */
- (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
- (ch >> 1) + SP)); /* '.' or '-' */
+ (ch < 20 ? (ch >> 1) + '0' : /* 0...9 */
+ (ch >> 1) + SP)); /* '.' or '-' */
if (ch0 == DEL) {
@@ -2399,167 +2438,142 @@ zinv:
case zdata: /* nonstandard data function */
- {
- long counties[128];
- char key0[256];
- int icnt, icnt0, len;
+ {
+ long counties[128];
+ char key0[256];
+ int icnt, icnt0, len;
- i = 0;
+ i = 0;
- while (i < 128) counties[i++] = 0L; /* init count; */
+ while (i < 128) counties[i++] = 0L; /* init count; */
- if (found == 2) { /* ... advance to next entry */
- addr += UNSIGN (block[addr]);
- addr += 2; /* skip key */
- addr += UNSIGN (block[addr]);
- addr++; /* skip data */
+ if (found == 2) { /* ... advance to next entry */
+ addr += UNSIGN (block[addr]);
+ addr += 2; /* skip key */
+ addr += UNSIGN (block[addr]);
+ addr++; /* skip data */
- counties[0] = 1L;
- }
+ counties[0] = 1L;
+ }
- offset = UNSIGN (block[OFFS]) * 256 + UNSIGN (block[OFFS + 1]);
- icnt = 0;
- i = 0;
+ offset = UNSIGN (block[OFFS]) * 256 + UNSIGN (block[OFFS + 1]);
+ icnt = 0;
+ i = 0;
- while ((ch = compactkey[i++]) != g_EOL) {
-
- if (ch & 01) {
- icnt++;
- }
+ while ((ch = compactkey[i++]) != g_EOL) {
+ if (ch & 01) {
+ icnt++;
}
- len = i - 1;
- i = 0;
+ }
- while (i < addr) { /* compute offset complete key */
+ len = i - 1;
+ i = 0;
+
+ while (i < addr) { /* compute offset complete key */
- icnt0 = UNSIGN (block[i++]);
- icnt0 += (j = UNSIGN (block[i++]));
+ icnt0 = UNSIGN (block[i++]);
+ icnt0 += (j = UNSIGN (block[i++]));
- while (j < icnt0) key0[j++] = block[i++];
+ while (j < icnt0) key0[j++] = block[i++];
- key0[j] = g_EOL;
- i += UNSIGN (block[i]);
+ key0[j] = g_EOL;
+ i += UNSIGN (block[i]);
- i++; /* skip data */
+ i++; /* skip data */
- }
+ }
- for (;;) { /* is it still a descendant ??? */
+ for (;;) { /* is it still a descendant ??? */
- if (addr >= offset) { /* look in next block */
+ if (addr >= offset) { /* look in next block */
- if ((blknbr = UNSIGN (block[RLPTR]) * 65536 + UNSIGN (block[RLPTR + 1]) * 256 + UNSIGN (block[RLPTR + 2])) == 0) {
- break; /* no next block */
- }
+ if ((blknbr = UNSIGN (block[RLPTR]) * 65536 + UNSIGN (block[RLPTR + 1]) * 256 + UNSIGN (block[RLPTR + 2])) == 0) {
+ break; /* no next block */
+ }
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+ gbl_read_block (g, blknbr, block);
- addr = 0;
- offset = UNSIGN (block[OFFS]) * 256 +
+ addr = 0;
+ offset = UNSIGN (block[OFFS]) * 256 +
UNSIGN (block[OFFS + 1]);
- }
+ }
- i = UNSIGN (block[addr++]);
- i += (j = UNSIGN (block[addr++]));
+ i = UNSIGN (block[addr++]);
+ i += (j = UNSIGN (block[addr++]));
- while (j < i) key0[j++] = block[addr++];
+ while (j < i) key0[j++] = block[addr++];
- addr += UNSIGN (block[addr]);
- addr++; /* skip data */
- icnt0 = 0;
- i = 0;
+ addr += UNSIGN (block[addr]);
+ addr++; /* skip data */
+ icnt0 = 0;
+ i = 0;
- while (i < j) if (key0[i++] & 01)
+ while (i < j) if (key0[i++] & 01)
- icnt0++;
+ icnt0++;
- if (icnt0 <= icnt) break;
+ if (icnt0 <= icnt) break;
- i = 0;
+ i = 0;
- while (i < len) {
+ while (i < len) {
- if (key0[i] != compactkey[i]) break;
+ if (key0[i] != compactkey[i]) break;
- i++;
+ i++;
- }
+ }
- if (i < len) break;
+ if (i < len) break;
- counties[icnt0 - icnt]++;
+ counties[icnt0 - icnt]++;
- }
+ }
- i = 128;
+ i = 128;
- while (counties[--i] == 0L);
+ while (counties[--i] == 0L);
- lintstr (data, counties[0]);
+ lintstr (data, counties[0]);
- j = 1;
- tmp1[0] = ',';
+ j = 1;
+ tmp1[0] = ',';
- while (j <= i) {
- lintstr (&tmp1[1], counties[j++]);
- stcat (data, tmp1);
- }
-
+ while (j <= i) {
+ lintstr (&tmp1[1], counties[j++]);
+ stcat (data, tmp1);
}
+
+ }
- break;
+ break;
case getinc:
- {
- int setopsav;
+ {
+ int setopsav;
- setopsav = setop;
- setop = '+';
- data[0] = '1';
- data[1] = EOL;
+ setopsav = setop;
+ setop = '+';
+ data[0] = '1';
+ data[1] = EOL;
- global (set_sym, key, data);
+ global (set_sym, key, data);
- setop = setopsav;
+ setop = setopsav;
- return;
- }
+ return;
+ }
case killone:
-
- {
- if (found == 2) goto killo; /* entry found use normal kill routine */
+ {
+ if (found == 2) goto killo; /* entry found use normal kill routine */
- goto quit;
- }
-
- case merge_sym:
-
- printf("MERGE NOT IMPLEMENTED FOR GLOBALS\n");
-
-#ifdef DEBUG_GBL
-
- int loop;
-
- printf ("DEBUG MERGE: ");
- printf ("[key] is [");
-
- for (loop = 0; key[loop] != EOL; loop++) printf ("%c", (key[loop] == DELIM) ? '!' : key[loop]);
-
- printf ("]\r\n");
- printf ("[data] is [");
-
- for(loop = 0; data[loop] != EOL; loop++) printf ("%c", (data[loop] == DELIM) ? '!' : data[loop]);
-
- printf("]\r\n");
-
-#endif
- return;
+ goto quit;
+ }
default:
@@ -2583,7 +2597,7 @@ splitd: /* split data block in two se
/* 'addr' there I would like to insert, if possible (which is not) */
/* 'offset' filled up to this limit */
- getnewblk (g->fd, &newblk); /* get a new block */
+ getnewblk (g, &newblk); /* get a new block */
/* if we have to insert at the begin or end of a block */
/* we don't split - we just start a new block */
@@ -2591,8 +2605,8 @@ splitd: /* split data block in two se
if (addr >= offset) {
long right,
- right1,
- right2;
+ right1,
+ right2;
right = UNSIGN (block[RLPTR]);
right1 = UNSIGN (block[RLPTR + 1]);
@@ -2601,8 +2615,7 @@ splitd: /* split data block in two se
block[RLPTR + 1] = newblk % 65536 / 256;
block[RLPTR + 2] = newblk % 256;
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
+ gbl_write_block (g, blknbr, block);
block[RLPTR] = right;
block[RLPTR + 1] = right1;
@@ -2621,16 +2634,14 @@ splitd: /* split data block in two se
char block0[BLOCKLEN];
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block0, BLOCKLEN);
+ gbl_read_block (g, other, block0);
block0[LLPTR] = blknbr / 65536;
block0[LLPTR + 1] = blknbr % 65536 / 256;
block0[LLPTR + 2] = blknbr % 256;
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
-
+ gbl_write_block (g, other, block0);
+
}
goto spltex;
@@ -2647,9 +2658,8 @@ splitd: /* split data block in two se
block[LLPTR + 1] = newblk % 65536 / 256;
block[LLPTR + 2] = newblk % 256;
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
-
+ gbl_write_block (g, blknbr, block);
+
block[LLPTR] = left;
block[LLPTR + 1] = left1;
block[LLPTR + 2] = left2;
@@ -2669,17 +2679,17 @@ splitd: /* split data block in two se
}
/* other is ***always*** zero !!!
- * if (other=left*65536+left1*256+left2) up-date RL-PTR of LL-block
- * { char block0[BLOCKLEN];
- * lseek(filedes,(long)other*(long)(BLOCKLEN),0);
- * read(filedes,block0,BLOCKLEN);
- * block0[RLPTR ]=blknbr/65536;
- * block0[RLPTR+1]=blknbr%65536/256;
- * block0[RLPTR+2]=blknbr%256;
- * lseek(filedes,(long)other*(long)(BLOCKLEN),0);
- * write(filedes,block0,BLOCKLEN);
- * }
- */
+ * if (other=left*65536+left1*256+left2) up-date RL-PTR of LL-block
+ * { char block0[BLOCKLEN];
+ * lseek(filedes,(long)other*(long)(BLOCKLEN),0);
+ * read(filedes,block0,BLOCKLEN);
+ * block0[RLPTR ]=blknbr/65536;
+ * block0[RLPTR+1]=blknbr%65536/256;
+ * block0[RLPTR+2]=blknbr%256;
+ * lseek(filedes,(long)other*(long)(BLOCKLEN),0);
+ * write(filedes,block0,BLOCKLEN);
+ * }
+ */
goto spltex;
@@ -2761,8 +2771,8 @@ splitd: /* split data block in two se
/* update rightlink and leftlink pointers */
other = UNSIGN (block[RLPTR]) * 65536 +
- UNSIGN (block[RLPTR + 1]) * 256 +
- UNSIGN (block[RLPTR + 2]);
+ UNSIGN (block[RLPTR + 1]) * 256 +
+ UNSIGN (block[RLPTR + 2]);
block0[RLPTR] = block[RLPTR];
block0[RLPTR + 1] = block[RLPTR + 1];
block0[RLPTR + 2] = block[RLPTR + 2];
@@ -2773,8 +2783,7 @@ splitd: /* split data block in two se
block0[LLPTR + 1] = blknbr % 65536 / 256;
block0[LLPTR + 2] = blknbr % 256;
- lseek (g->fd, hdr_offset + ((long) (newblk) * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+ gbl_write_block (g, newblk, block0);
offset = limit;
/* insert new block in pointer structure */
@@ -2784,15 +2793,13 @@ splitd: /* split data block in two se
/* up-date LL-PTR of RL-block */
if (other != 0) {
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block0, BLOCKLEN);
+ gbl_read_block (g, other, block0);
block0[LLPTR] = newblk / 65536;
block0[LLPTR + 1] = newblk % 65536 / 256;
block0[LLPTR + 2] = newblk % 256;
-
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+
+ gbl_write_block (g, other, block0);
}
@@ -2801,8 +2808,8 @@ splitd: /* split data block in two se
/* save old block away and make new block the current block */
/* update rightlink and leftlink pointers */
other = UNSIGN (block[RLPTR]) * 65536 +
- UNSIGN (block[RLPTR + 1]) * 256 +
- UNSIGN (block[RLPTR + 2]);
+ UNSIGN (block[RLPTR + 1]) * 256 +
+ UNSIGN (block[RLPTR + 2]);
block0[RLPTR] = block[RLPTR];
block0[RLPTR + 1] = block[RLPTR + 1];
block0[RLPTR + 2] = block[RLPTR + 2];
@@ -2813,8 +2820,8 @@ splitd: /* split data block in two se
block0[LLPTR + 1] = blknbr % 65536 / 256;
block0[LLPTR + 2] = blknbr % 256;
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
+ gbl_write_block (g, blknbr, block);
+
stcpy0 (block, block0, (long) BLOCKLEN);
traceadr[trx] = (addr -= limit);
@@ -2826,15 +2833,13 @@ splitd: /* split data block in two se
/* up-date LL-PTR of RL-block */
if (other != 0) {
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block0, BLOCKLEN);
+ gbl_read_block (g, other, block0);
block0[LLPTR] = newblk / 65536;
block0[LLPTR + 1] = newblk % 65536 / 256;
block0[LLPTR + 2] = newblk % 256;
-
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+
+ gbl_write_block (g, other, block0);
}
@@ -2869,12 +2874,8 @@ static void splitp (global_handle *g, ch
unsigned long newblk;
unsigned long other;
register int i, j;
-
- long hdr_offset;
-
- hdr_offset = sizeof (global_header);
- getnewblk (g->fd, &newblk); /* get a new block */
+ getnewblk (g, &newblk); /* get a new block */
if (*blknbr == ROOT) { /* ROOT overflow is special */
@@ -2901,16 +2902,15 @@ static void splitp (global_handle *g, ch
/* update number of blocks ! */
i = UNSIGN (block0[NRBLK]) * 65536 +
- UNSIGN (block0[NRBLK + 1]) * 256 +
- UNSIGN (block0[NRBLK + 2]) + 1;
+ UNSIGN (block0[NRBLK + 1]) * 256 +
+ UNSIGN (block0[NRBLK + 2]) + 1;
block0[NRBLK] = i / 65536;
block0[NRBLK + 1] = i % 65536 / 256;
block0[NRBLK + 2] = i % 256;
block0[BTYP] = POINTER;
- lseek (g->fd, hdr_offset + ROOT, SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+ gbl_write_block (g, ROOT, block0);
/* shift trace_stack */
j = trx++;
@@ -2927,7 +2927,7 @@ static void splitp (global_handle *g, ch
traceblk[1] = newblk;
*blknbr = newblk;
- getnewblk (g->fd, &newblk); /* get a new block */
+ getnewblk (g, &newblk); /* get a new block */
}
@@ -2969,8 +2969,8 @@ static void splitp (global_handle *g, ch
/* update rightlink and leftlink pointers */
other = UNSIGN (block[RLPTR]) * 65536 +
- UNSIGN (block[RLPTR + 1]) * 256 +
- UNSIGN (block[RLPTR + 2]);
+ UNSIGN (block[RLPTR + 1]) * 256 +
+ UNSIGN (block[RLPTR + 2]);
block0[RLPTR] = block[RLPTR];
block0[RLPTR + 1] = block[RLPTR + 1];
block0[RLPTR + 2] = block[RLPTR + 2];
@@ -2981,8 +2981,7 @@ static void splitp (global_handle *g, ch
block0[LLPTR + 1] = (*blknbr) % 65536 / 256;
block0[LLPTR + 2] = (*blknbr) % 256;
- lseek (g->fd, hdr_offset + ((long) (newblk) * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+ gbl_write_block (g, newblk, block0);
(*offs) = limit;
@@ -2991,15 +2990,13 @@ static void splitp (global_handle *g, ch
/* up-date LL-PTR of RL-block */
if (other != 0) {
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block0, BLOCKLEN);
+ gbl_read_block (g, other, block0);
block0[LLPTR] = newblk / 65536;
block0[LLPTR + 1] = newblk % 65536 / 256;
block0[LLPTR + 2] = newblk % 256;
-
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+
+ gbl_write_block (g, other, block0);
}
@@ -3008,8 +3005,8 @@ static void splitp (global_handle *g, ch
/* update rightlink and leftlink pointers */
other = UNSIGN (block[RLPTR]) * 65536 +
- UNSIGN (block[RLPTR + 1]) * 256 +
- UNSIGN (block[RLPTR + 2]);
+ UNSIGN (block[RLPTR + 1]) * 256 +
+ UNSIGN (block[RLPTR + 2]);
block0[RLPTR] = block[RLPTR];
block0[RLPTR + 1] = block[RLPTR + 1];
@@ -3023,9 +3020,9 @@ static void splitp (global_handle *g, ch
(*addr) -= limit;
(*offs) -= limit;
+
+ gbl_write_block (g, *blknbr, block);
- lseek (g->fd, hdr_offset + ((long) (*blknbr) * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
stcpy0 (block, block0, (long) BLOCKLEN);
(*blknbr) = newblk;
@@ -3035,15 +3032,13 @@ static void splitp (global_handle *g, ch
/* up-date LL-PTR of RL-block */
if (other != 0) {
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block0, BLOCKLEN);
+ gbl_read_block (g, other, block0);
block0[LLPTR] = newblk / 65536;
block0[LLPTR + 1] = newblk % 65536 / 256;
block0[LLPTR + 2] = newblk % 256;
-
- lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block0, BLOCKLEN);
+
+ gbl_write_block (g, other, block0);
}
@@ -3065,9 +3060,6 @@ static void update (global_handle *g, ch
unsigned long blknbr;
char block[BLOCKLEN];
long i, j, k;
- long hdr_offset;
-
- hdr_offset = sizeof (global_header);
while (traceadr[trx] == 0) { /* update of pointer blocks necessary */
@@ -3075,9 +3067,8 @@ static void update (global_handle *g, ch
blknbr = traceblk[trx];
addr = traceadr[trx];
-
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+
+ gbl_read_block (g, blknbr, block);
{
long oldkeyl;
@@ -3088,7 +3079,7 @@ static void update (global_handle *g, ch
j = oldkeyl - keyl;
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
if (j > 0) { /* surplus space */
@@ -3127,13 +3118,10 @@ static void update (global_handle *g, ch
while (i < keyl) block[j++] = ins_key[i++];
/* block pointed to remains the same */
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
-
+ gbl_write_block (g, blknbr, block);
}
-
- lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+
+ gbl_read_block (g, blknbr, block);
}
@@ -3157,19 +3145,15 @@ static void insert (global_handle *g, ch
long needed;
long addr;
register int i, k;
- long hdr_offset;
-
- hdr_offset = sizeof (global_header);
trxsav = trx--;
blk = traceblk[trx];
addr = traceadr[trx];
- lseek (g->fd, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET);
- read (g->fd, block, BLOCKLEN);
+ gbl_read_block (g, blk, block);
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
if (traceadr[trx + 1] != (-1)) {
addr += UNSIGN (block[addr]);
@@ -3202,8 +3186,7 @@ static void insert (global_handle *g, ch
block[i++] = blknbr % 65536 / 256;
block[i] = blknbr % 256;
- lseek (g->fd, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET);
- write (g->fd, block, BLOCKLEN);
+ gbl_write_block (g, blk, block);
trx = trxsav;
@@ -3215,40 +3198,33 @@ static void insert (global_handle *g, ch
* filedes: global file descriptor
* blknbr: block to be freed
*/
-static void b_free (short filedes, unsigned long blknbr)
+static void b_free (global_handle *g, unsigned long blknbr)
{
char block0[BLOCKLEN];
unsigned long free;
unsigned long other;
long i;
long offset;
- long hdr_offset;
-
- hdr_offset = sizeof (global_header);
/* mark block as empty */
- lseek (filedes, hdr_offset + ((long) (blknbr) * BLOCKLEN), SEEK_SET);
- read (filedes, block0, BLOCKLEN);
-
- block0[BTYP] = EMPTY;
+ gbl_read_block (g, blknbr, block0);
- lseek (filedes, hdr_offset + ((long) (blknbr) * BLOCKLEN), SEEK_SET);
- write (filedes, block0, BLOCKLEN);
+ block0[BTYP] = EMPTY;
+
+ gbl_write_block (g, blknbr, block0);
/* do we have a list of free blocks? */
- lseek (filedes, hdr_offset + ROOT, SEEK_SET);
- read (filedes, block0, BLOCKLEN);
+ gbl_read_block (g, ROOT, block0);
if ((free = UNSIGN (block0[FREE]) * 65536 + UNSIGN (block0[FREE + 1]) * 256 + UNSIGN (block0[FREE + 2]))) {
for (;;) {
-
- lseek (filedes, hdr_offset + ((long) free * (long) BLOCKLEN), SEEK_SET);
- read (filedes, block0, BLOCKLEN);
+
+ gbl_read_block (g, free, block0);
other = UNSIGN (block0[RLPTR]) * 65536 +
- UNSIGN (block0[RLPTR + 1]) * 256 +
- UNSIGN (block0[RLPTR + 2]);
+ UNSIGN (block0[RLPTR + 1]) * 256 +
+ UNSIGN (block0[RLPTR + 2]);
if (other == 0) break;
@@ -3264,8 +3240,8 @@ static void b_free (short filedes, unsig
offset -= PLEN;
other = UNSIGN (block0[offset]) * 65536 +
- UNSIGN (block0[offset + 1]) * 256 +
- UNSIGN (block0[offset + 2]);
+ UNSIGN (block0[offset + 1]) * 256 +
+ UNSIGN (block0[offset + 2]);
block0[offset] = 0;
block0[offset + 1] = 0;
@@ -3275,9 +3251,8 @@ static void b_free (short filedes, unsig
block0[RLPTR] = other / 65536;
block0[RLPTR + 1] = other % 65536 / 256;
block0[RLPTR + 2] = other % 256;
-
- lseek (filedes, hdr_offset + ((long) free * (long) BLOCKLEN), SEEK_SET);
- write (filedes, block0, BLOCKLEN);
+
+ gbl_write_block (g, free, block0);
for (i = 0; i < BLOCKLEN; block0[i++] = 0); /* clear block */
@@ -3293,19 +3268,16 @@ static void b_free (short filedes, unsig
}
else {
-
- getnewblk (filedes, &free);
+ getnewblk (g, &free);
/* set FBLK free blocks pointer */
- lseek (filedes, hdr_offset + ROOT, SEEK_SET);
- read (filedes, block0, BLOCKLEN);
+ gbl_read_block (g, ROOT, block0);
block0[FREE] = free / 65536;
block0[FREE + 1] = free % 65536 / 256;
block0[FREE + 2] = free % 256;
-
- lseek (filedes, hdr_offset + ROOT, SEEK_SET);
- write (filedes, block0, BLOCKLEN);
+
+ gbl_write_block (g, ROOT, block0);
for (i = 0; i < BLOCKLEN; block0[i++] = 0); /* clear block */
@@ -3320,8 +3292,7 @@ static void b_free (short filedes, unsig
block0[OFFS] = offset / 256;
block0[OFFS + 1] = offset % 256;
- lseek (filedes, hdr_offset + ((long) free * (long) BLOCKLEN), SEEK_SET);
- write (filedes, block0, BLOCKLEN);
+ gbl_write_block (g, free, block0);
return;
} /* end of b_free() */
@@ -3394,7 +3365,7 @@ static void scandblk (char *block, long
char key0[256];
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
while (i < offset) {
@@ -3441,26 +3412,21 @@ static void scandblk (char *block, long
* filedes: global file descriptor
* blknbr: number of new block
*/
-static void getnewblk (int filedes, unsigned long *blknbr)
+static void getnewblk (global_handle *g, unsigned long *blknbr)
{
char nblock[BLOCKLEN];
unsigned long freeblks, no_of_blks;
long other;
long offset;
- long hdr_offset;
- hdr_offset = sizeof (global_header);
-
- lseek (filedes, hdr_offset + ROOT, SEEK_SET);
- read (filedes, nblock, BLOCKLEN);
+ gbl_read_block (g, ROOT, nblock);
freeblks = UNSIGN (nblock[FREE]) * 65536 + UNSIGN (nblock[FREE + 1]) * 256 + UNSIGN (nblock[FREE + 2]);
no_of_blks = UNSIGN (nblock[NRBLK]) * 65536 + UNSIGN (nblock[NRBLK + 1]) * 256 + UNSIGN (nblock[NRBLK + 2]);
if (freeblks) {
-
- lseek (filedes, hdr_offset + ((long) (freeblks) * BLOCKLEN), SEEK_SET);
- read (filedes, nblock, BLOCKLEN);
+
+ gbl_read_block (g, freeblks, nblock);
offset = UNSIGN (nblock[OFFS]) * 256 + UNSIGN (nblock[OFFS + 1]);
@@ -3472,28 +3438,24 @@ static void getnewblk (int filedes, unsi
/* update RL-block, if any */
if (other) {
- lseek (filedes, hdr_offset + ((long) (other) * BLOCKLEN), SEEK_SET);
- read (filedes, nblock, BLOCKLEN);
+ gbl_read_block (g, other, nblock);
nblock[LLPTR] = 0;
nblock[LLPTR + 1] = 0;
nblock[LLPTR + 2] = 0;
-
- lseek (filedes, hdr_offset + ((long) (other) * BLOCKLEN), SEEK_SET);
- write (filedes, nblock, BLOCKLEN);
+
+ gbl_write_block (g, other, nblock);
}
/* update ROOT block */
- lseek (filedes, hdr_offset + ROOT, SEEK_SET);
- read (filedes, nblock, BLOCKLEN);
+ gbl_read_block (g, ROOT, nblock);
nblock[FREE] = other / 65536;
nblock[FREE + 1] = other % 65536 / 256;
nblock[FREE + 2] = other % 256;
-
- lseek (filedes, hdr_offset + ROOT, SEEK_SET);
- write (filedes, nblock, BLOCKLEN);
+
+ gbl_write_block (g, ROOT, nblock);
return;
@@ -3505,9 +3467,8 @@ static void getnewblk (int filedes, unsi
nblock[offset + 1] = 0;
nblock[OFFS] = offset / 256;
nblock[OFFS + 1] = offset % 256;
-
- lseek (filedes, hdr_offset + ((long) (freeblks) * BLOCKLEN), SEEK_SET);
- write (filedes, nblock, BLOCKLEN);
+
+ gbl_write_block (g, freeblks, nblock);
return;
@@ -3518,24 +3479,12 @@ static void getnewblk (int filedes, unsi
nblock[NRBLK] = no_of_blks / 65536;
nblock[NRBLK + 1] = no_of_blks % 65536 / 256;
nblock[NRBLK + 2] = no_of_blks % 256;
-
- lseek (filedes, hdr_offset + ROOT, SEEK_SET);
- write (filedes, nblock, BLOCKLEN);
+
+ gbl_write_block (g, ROOT, nblock);
*blknbr = no_of_blks;
-
- for (;;) {
-
- errno = 0;
-
- lseek (filedes, hdr_offset + ((long) (no_of_blks) * BLOCKLEN), SEEK_SET);
- write (filedes, nblock, BLOCKLEN);
-
- if (errno == 0) break;
- panic ();
-
- }
+ gbl_write_block (g, no_of_blks, nblock);
return;
@@ -3744,23 +3693,29 @@ void gbl_dump_stat(void)
int hit_pct;
unsigned long access_total;
unsigned long hit_total;
-
+ unsigned long mem_reads_total;
+
+ mem_reads_total = 0;
printf ("\r\nFreeM Global Statistics [PID %d]\r\n\r\n", pid);
- printf ("%-20s%-10s%-12s%-20s%-10s%s\r\n", "GLOBAL", "USECT", "SLOW PTHCT", "AGE", "LAST BLK", "FILE");
- printf ("%-20s%-10s%-12s%-20s%-10s%s\r\n", "======", "=====", "==========", "===", "========", "====");
+ printf ("%-20s%-10s%-10s%-10s%-10s%-12s%-20s%-10s%s\r\n", "GLOBAL", "USECT", "READS", "WRITES", "MEMREADS", "SLOW PTHCT", "AGE", "LAST BLK", "FILE");
+ printf ("%-20s%-10s%-10s%-10s%-10s%-12s%-20s%-10s%s\r\n", "======", "=====", "=====", "======", "========", "==========", "===", "========", "====");
access_total = 0;
ct = 0;
for (g = global_handles_head; g != NULL; g = g->next) {
- printf ("%-20s%-10ld%-12ld%-20ld%-10ld%s\r\n",
+ printf ("%-20s%-10ld%-10ld%-10ld%-10ld%-12ld%-20ld%-10ld%s\r\n",
g->global_name,
g->use_count,
+ g->read_ops,
+ g->write_ops,
+ g->memory_reads,
g->cache_misses,
g->age,
g->last_block,
g->global_path);
ct++;
+ mem_reads_total += g->memory_reads;
access_total += g->use_count;
}
if (!ct) printf ("\r\n");
@@ -3771,5 +3726,7 @@ void gbl_dump_stat(void)
printf ("\r\nTotal accesses: %ld\r\n", access_total);
printf ("Fast path hits %ld\t(%d%%)\r\n", hit_total, hit_pct);
- printf ("Fast path misses: %ld\t(%d%%)\r\n", gbl_cache_misses, miss_pct);
+ printf ("Fast path misses: %ld\t(%d%%)\r\n", gbl_cache_misses, miss_pct);
+ printf ("Disk reads avoided: %ld\r\n", mem_reads_total);
+
}