--- freem/src/global_bltin.c 2025/04/11 14:21:03 1.17
+++ freem/src/global_bltin.c 2025/04/11 20:55:49 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: global_bltin.c,v 1.17 2025/04/11 14:21:03 snw Exp $
+ * $Id: global_bltin.c,v 1.21 2025/04/11 20:55:49 snw Exp $
* freem database engine
*
*
@@ -24,6 +24,18 @@
* 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
*
@@ -139,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)
@@ -323,7 +335,7 @@ int gbl_write_header(global_handle *g, g
return FALSE;
}
- if (g->locked == FALSE) gbl_lock (g, 1);
+ gbl_lock (g, 1);
old_position = lseek (g->fd, 0, SEEK_CUR);
lseek (g->fd, 0, SEEK_SET);
@@ -333,7 +345,7 @@ int gbl_write_header(global_handle *g, g
}
lseek (g->fd, old_position, SEEK_SET);
- if (g->locked == TRUE) gbl_unlock (g);
+ gbl_unlock (g);
gbl_read_header (g, &g->header);
@@ -445,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 {
@@ -479,6 +495,7 @@ short gbl_open(global_handle *g, short a
int gbl_read_block(global_handle *g, unsigned long blocknum, char *block)
{
+ struct stat gstat;
unsigned long hdr_offset;
hdr_offset = sizeof (global_header);
@@ -486,13 +503,36 @@ int gbl_read_block(global_handle *g, uns
return FALSE;
}
- gbl_lock (g, 1);
- lseek (g->fd, hdr_offset + ((long) blocknum * (long) (g->header.block_size)), SEEK_SET);
- read (g->fd, block, g->header.block_size);
- g->last_block = blocknum;
g->use_count++;
- g->read_ops++;
- gbl_unlock (g);
+
+ 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() */
@@ -507,9 +547,7 @@ int gbl_write_block(global_handle *g, un
return FALSE;
}
- if (!g->locked) {
- gbl_lock (g, 1);
- }
+ gbl_lock (g, 1);
for (;;) {
@@ -528,11 +566,8 @@ int gbl_write_block(global_handle *g, un
}
- gbl_update_tid (g);
-
- if (g->locked) {
- gbl_unlock (g);
- }
+ gbl_update_tid (g);
+ gbl_unlock (g);
return TRUE;
}
@@ -578,6 +613,7 @@ 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;
@@ -586,6 +622,9 @@ global_handle *gbl_handle(char *key)
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);
@@ -704,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;
@@ -713,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++;
}
}
+
}
}
@@ -852,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);
@@ -932,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;
}
@@ -1123,7 +1123,7 @@ reopen:
if (action == get_sym) {
- tfast0:
+tfast0:
gbl_lock (g, 3);
if (g->fast_path > 0) goto tfast1; /* try again last block */
@@ -1133,7 +1133,7 @@ reopen:
for (;;) {
- tfast1:
+tfast1:
gbl_read_block (g, blknbr, block);
/* temporarily disabled
@@ -1227,15 +1227,15 @@ reopen:
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;
- }
+ 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 */
@@ -1319,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 */
@@ -1345,7 +1345,8 @@ k_again: /* entry point for repeated
}
-s10: {
+s10:
+ {
long len; /* insert key */
char key0[256];
@@ -1496,7 +1497,7 @@ s10: {
goto splitd;
}
-s20:
+ s20:
i = offset;
k = addr + olddatal;
@@ -1556,7 +1557,7 @@ 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) {
@@ -1691,7 +1692,7 @@ s20:
while (i < keyl) if (compactkey[i++] & 01)
- j1++;
+ j1++;
i = 0;
j = 0;
k = 0;
@@ -1724,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) {
@@ -1804,7 +1805,7 @@ s20:
addr = 0;
offset = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
}
}
@@ -1871,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) {
@@ -1948,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) {
@@ -1993,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;
@@ -2038,15 +2039,15 @@ killo: /* entry from killone section
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]);
}
@@ -2055,7 +2056,7 @@ killo: /* entry from killone section
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);
@@ -2144,17 +2145,17 @@ 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) {
@@ -2195,7 +2196,7 @@ p_empty: /* entry if pointer block goes
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 */
@@ -2268,19 +2269,19 @@ 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;
@@ -2298,7 +2299,7 @@ p_empty: /* entry if pointer block goes
break;
-zinv:
+ zinv:
{
long len;
@@ -2316,7 +2317,7 @@ zinv:
gbl_read_block (g, blknbr, block);
addr = UNSIGN (block[OFFS]) * 256 +
- UNSIGN (block[OFFS + 1]);
+ UNSIGN (block[OFFS + 1]);
}
@@ -2391,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) {
@@ -2437,166 +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 */
+ }
- gbl_read_block (g, blknbr, block);
+ 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:
@@ -2628,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]);
@@ -2702,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;
@@ -2794,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];
@@ -2831,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];
@@ -2925,8 +2902,8 @@ 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;
@@ -2992,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];
@@ -3028,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];
@@ -3102,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 */
@@ -3176,7 +3153,7 @@ static void insert (global_handle *g, ch
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]);
@@ -3246,8 +3223,8 @@ static void b_free (global_handle *g, un
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;
@@ -3263,8 +3240,8 @@ static void b_free (global_handle *g, un
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;
@@ -3388,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) {
@@ -3716,25 +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%-10s%-10s%-12s%-20s%-10s%s\r\n", "GLOBAL", "USECT", "READS", "WRITES", "SLOW PTHCT", "AGE", "LAST BLK", "FILE");
- printf ("%-20s%-10s%-10s%-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%-10ld%-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");
@@ -3745,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);
+
}