--- freem/src/global_bltin.c 2025/04/09 14:34:30 1.13 +++ freem/src/global_bltin.c 2025/04/11 00:52:40 1.16 @@ -1,5 +1,5 @@ /* - * $Id: global_bltin.c,v 1.13 2025/04/09 14:34:30 snw Exp $ + * $Id: global_bltin.c,v 1.16 2025/04/11 00:52:40 snw Exp $ * freem database engine * * @@ -24,6 +24,15 @@ * along with FreeM. If not, see . * * $Log: global_bltin.c,v $ + * 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 + * + * Revision 1.14 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * * Revision 1.13 2025/04/09 14:34:30 snw * Further work on global_bltin.c refactor * @@ -83,7 +92,6 @@ static void scanpblk (char *block, long static void scandblk (char *block, long *adr, long *fnd); static void getnewblk (int filedes, unsigned long *blknbr); static short int g_collate (char *t); -//static short int g_numeric (char *str); short g_numeric (char *str); void close_all_globals(void); static void panic (void); @@ -134,19 +142,14 @@ static void panic (void); inline long gbl_path(char *key, char *buf) { long savj; - long savch; /* saved j and ch for multiple pathes */ register long int i; register long int j; register long int k; register long int ch; - long pathscan; /* flag for repeated scan of pathlist setting an undef global */ /* construct full UNIX filename */ savj = 0; - savch = ch = EOL; - pathscan = TRUE; -nextpath: k = 0; j = savj; @@ -170,8 +173,6 @@ nextpath: } } - - if (savj == 0 && ch == EOL) pathscan = FALSE; /* one path only: inhibit search */ if (k > 0) { @@ -184,7 +185,6 @@ nextpath: } - savch = ch; savj = j; i = 0; j = 0; @@ -238,6 +238,8 @@ int gbl_lock(global_handle *g, int type) locking (g->fd, type, 0L); g->locked = TRUE; + + return TRUE; } /* gbl_lock() */ int gbl_unlock(global_handle *g) @@ -248,6 +250,8 @@ int gbl_unlock(global_handle *g) locking (g->fd, 0, 0L); g->locked = FALSE; + + return TRUE; } /* gbl_unlock() */ void gbl_close(global_handle *g) @@ -470,13 +474,31 @@ short gbl_open(global_handle *g, short a } /* gbl_open() */ +int gbl_read_block(global_handle *g, unsigned long blocknum, char *block) +{ + unsigned long hdr_offset; + hdr_offset = sizeof (global_header); + + if (g->opened == FALSE) { + 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); + + return TRUE; +} + global_handle *gbl_handle(char *key) { global_handle *g; char global_name[256]; int i; - long path_len; - char block[BLOCKLEN]; struct stat dinf; i = 0; @@ -519,6 +541,8 @@ global_handle *gbl_handle(char *key) g->fast_path = -1; g->cache_misses = 0; g->cache_hits = 0; + g->read_ops = 0; + g->write_ops = 0; strcpy (g->global_name, global_name); gbl_path (key, g->global_path); @@ -613,7 +637,6 @@ void global_bltin (short action, char *k unsigned long hdr_offset; /* these must be static variables */ - static short filedes; /* filedescr for global access */ static char filnam[256]; /* name of global/unix file */ /* the following vars may be */ @@ -642,16 +665,13 @@ void global_bltin (short action, char *k int iresult; - struct stat dinf; /* get modification date */ - - long savj; - long savch; /* saved j and ch for multiple pathes */ register long int i; register long int j; register long int k; register long int ch; - long pathscan; /* flag for repeated scan of pathlist setting an undef global */ + j = 0; + hdr_offset = sizeof (global_header); /* process optional limitations */ @@ -1064,7 +1084,9 @@ reopen: /* odd numbered actions get read access (get_sym,data,fra_order) 3 */ /* even ones read/write access (set_sym,kill_sym) 1 */ +/* temporarily disabled lock: +*/ if (action == get_sym) { @@ -1079,13 +1101,11 @@ tfast0: tfast1: + gbl_read_block (g, blknbr, block); - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); - - +/* temporarily disabled tfast2: - +*/ if ((typ = block[BTYP]) == DATA) { /* scan data block: here we test for equality only */ offset = UNSIGN (block[OFFS]) * 256 + @@ -1158,7 +1178,6 @@ tfast2: if (typ == EMPTY) { if (blknbr == ROOT) { - //close (filedes); gbl_close (g); goto reopen; } @@ -1225,10 +1244,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) { @@ -1516,9 +1533,8 @@ s20: 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; @@ -1599,9 +1615,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); } @@ -1757,8 +1772,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; offset = UNSIGN (block[OFFS]) * 256 + @@ -1781,8 +1795,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; } @@ -1991,9 +2004,8 @@ 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 */ @@ -2012,8 +2024,7 @@ killo: /* entry from killone section 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]); @@ -2119,8 +2130,7 @@ p_empty: /* entry if pointer block goes 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]; @@ -2132,9 +2142,8 @@ p_empty: /* entry if pointer block goes } 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]; @@ -2158,8 +2167,7 @@ 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]); freecnt = UNSIGN (block[addr]) + 2 + PLEN; @@ -2277,9 +2285,8 @@ 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]); @@ -2458,8 +2465,7 @@ zinv: 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 + @@ -2625,8 +2631,7 @@ 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; @@ -2788,8 +2793,7 @@ 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; @@ -2830,8 +2834,7 @@ 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; @@ -3668,7 +3671,6 @@ static short int g_collate (char *t) /* * test whether 'str' is canonical */ -//static short int g_numeric (char *str) short g_numeric (char *str) { register int ptr = 0, ch; @@ -3758,7 +3760,7 @@ void gbl_dump_stat(void) access_total = 0; ct = 0; for (g = global_handles_head; g != NULL; g = g->next) { - printf ("%-20s%-10d%-12d%-20d%-10d%s\r\n", + printf ("%-20s%-10ld%-12ld%-20ld%-10ld%s\r\n", g->global_name, g->use_count, g->cache_misses,