--- freem/src/global_bltin.c 2025/04/08 20:00:56 1.10 +++ freem/src/global_bltin.c 2025/04/08 21:41:13 1.11 @@ -1,5 +1,5 @@ /* - * $Id: global_bltin.c,v 1.10 2025/04/08 20:00:56 snw Exp $ + * $Id: global_bltin.c,v 1.11 2025/04/08 21:41:13 snw Exp $ * freem database engine * * @@ -24,6 +24,9 @@ * along with FreeM. If not, see . * * $Log: global_bltin.c,v $ + * Revision 1.11 2025/04/08 21:41:13 snw + * Make insert, update, and splitp global handler functions take a ptr to a global_handle instead of a file descriptor + * * Revision 1.10 2025/04/08 20:00:56 snw * Global handler now uses a header file and maintains the last journaling transaction ID * @@ -65,9 +68,9 @@ global_handle *global_handles_head; static void b_free (short filedes, unsigned long blknbr); -static void splitp (short filedes, char *block, long *addr, long *offs, unsigned long *blknbr); -static void update (short filedes, char *ins_key, long keyl); -static void insert (int filedes, char *ins_key, long key_len, 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); @@ -1360,7 +1363,7 @@ s10: { lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); write (g->fd, block, BLOCKLEN); - if (traceadr[trx] == 0) update (g->fd, compactkey, keyl); + if (traceadr[trx] == 0) update (g, compactkey, keyl); break; } @@ -2171,7 +2174,7 @@ p_empty: /* entry if pointer block goes if (addr == 0) { /* update of pointer */ traceadr[trx] = 0; - update (g->fd, &block[2], (long) UNSIGN (block[0])); + update (g, &block[2], (long) UNSIGN (block[0])); } trx = trxsav; @@ -2217,7 +2220,7 @@ p_empty: /* entry if pointer block goes write (g->fd, block, BLOCKLEN); if (addr < 3) { /* update of pointer */ traceadr[trx] = 0; - update (g->fd, &block[2], (long) UNSIGN (block[0])); + update (g, &block[2], (long) UNSIGN (block[0])); } } @@ -2580,7 +2583,7 @@ splitd: /* split data block in two se addr = 0; blknbr = newblk; - insert (g->fd, compactkey, keyl, newblk); + insert (g, compactkey, keyl, newblk); /* up-date LL-PTR of RL-block */ if ((other = right * 65536 + right1 * 256 + right2)) { @@ -2626,12 +2629,12 @@ splitd: /* split data block in two se blknbr = newblk; traceadr[trx] = (-1); /* inhibit second update of pointers */ - insert (g->fd, compactkey, keyl, newblk); + insert (g, compactkey, keyl, newblk); if (addr < 3) { /* update of pointer */ traceadr[trx] = 0; - update (g->fd, compactkey, keyl); + update (g, compactkey, keyl); } /* other is ***always*** zero !!! @@ -2745,7 +2748,7 @@ splitd: /* split data block in two se offset = limit; /* insert new block in pointer structure */ - insert (g->fd, &block0[2], (long) UNSIGN (block0[0]), newblk); + insert (g, &block0[2], (long) UNSIGN (block0[0]), newblk); /* up-date LL-PTR of RL-block */ if (other != 0) { @@ -2787,7 +2790,7 @@ splitd: /* split data block in two se traceblk[trx] = (blknbr = newblk); /* insert new block in pointer structure */ - insert (g->fd, &block0[2], (long) UNSIGN (block0[0]), newblk); + insert (g, &block0[2], (long) UNSIGN (block0[0]), newblk); /* up-date LL-PTR of RL-block */ if (other != 0) { @@ -2827,7 +2830,7 @@ spltex: * 'addr' there I would like to insert, if possible (which is not) * 'offset' filled up to this limit */ -static void splitp (short filedes, char *block, long *addr, long *offs, unsigned long *blknbr) +static void splitp (global_handle *g, char *block, long *addr, long *offs, unsigned long *blknbr) { char block0[BLOCKLEN]; @@ -2840,7 +2843,7 @@ static void splitp (short filedes, char hdr_offset = sizeof (global_header); - getnewblk (filedes, &newblk); /* get a new block */ + getnewblk (g->fd, &newblk); /* get a new block */ if (*blknbr == ROOT) { /* ROOT overflow is special */ @@ -2875,8 +2878,8 @@ static void splitp (short filedes, char block0[NRBLK + 2] = i % 256; block0[BTYP] = POINTER; - lseek (filedes, hdr_offset + ROOT, SEEK_SET); - write (filedes, block0, BLOCKLEN); + lseek (g->fd, hdr_offset + ROOT, SEEK_SET); + write (g->fd, block0, BLOCKLEN); /* shift trace_stack */ j = trx++; @@ -2893,7 +2896,7 @@ static void splitp (short filedes, char traceblk[1] = newblk; *blknbr = newblk; - getnewblk (filedes, &newblk); /* get a new block */ + getnewblk (g->fd, &newblk); /* get a new block */ } @@ -2947,25 +2950,25 @@ static void splitp (short filedes, char block0[LLPTR + 1] = (*blknbr) % 65536 / 256; block0[LLPTR + 2] = (*blknbr) % 256; - lseek (filedes, hdr_offset + ((long) (newblk) * (long) (BLOCKLEN)), SEEK_SET); - write (filedes, block0, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) (newblk) * (long) (BLOCKLEN)), SEEK_SET); + write (g->fd, block0, BLOCKLEN); (*offs) = limit; - insert (filedes, &block0[2], (long) UNSIGN (block0[0]), newblk); + insert (g, &block0[2], (long) UNSIGN (block0[0]), newblk); /* up-date LL-PTR of RL-block */ if (other != 0) { - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - read (filedes, block0, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + read (g->fd, block0, BLOCKLEN); block0[LLPTR] = newblk / 65536; block0[LLPTR + 1] = newblk % 65536 / 256; block0[LLPTR + 2] = newblk % 256; - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - write (filedes, block0, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + write (g->fd, block0, BLOCKLEN); } @@ -2990,26 +2993,26 @@ static void splitp (short filedes, char (*addr) -= limit; (*offs) -= limit; - lseek (filedes, hdr_offset + ((long) (*blknbr) * (long) (BLOCKLEN)), SEEK_SET); - write (filedes, block, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) (*blknbr) * (long) (BLOCKLEN)), SEEK_SET); + write (g->fd, block, BLOCKLEN); stcpy0 (block, block0, (long) BLOCKLEN); (*blknbr) = newblk; - insert (filedes, &block0[2], (long) UNSIGN (block0[0]), newblk); + insert (g, &block0[2], (long) UNSIGN (block0[0]), newblk); /* up-date LL-PTR of RL-block */ if (other != 0) { - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - read (filedes, block0, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + read (g->fd, block0, BLOCKLEN); block0[LLPTR] = newblk / 65536; block0[LLPTR + 1] = newblk % 65536 / 256; block0[LLPTR + 2] = newblk % 256; - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - write (filedes, block0, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + write (g->fd, block0, BLOCKLEN); } @@ -3024,7 +3027,7 @@ static void splitp (short filedes, char * ins_key: key to be inserted * keyl: length of that key */ -static void update (short filedes, char *ins_key, long keyl) +static void update (global_handle *g, char *ins_key, long keyl) { long offset; long addr; @@ -3042,8 +3045,8 @@ static void update (short filedes, char blknbr = traceblk[trx]; addr = traceadr[trx]; - lseek (filedes, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (filedes, block, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); + read (g->fd, block, BLOCKLEN); { long oldkeyl; @@ -3070,7 +3073,7 @@ static void update (short filedes, char else if (j < 0) { /* we need more space */ /* block too small */ - if ((offset - j) > DATALIM) splitp (filedes, block, &addr, &offset, &blknbr); + if ((offset - j) > DATALIM) splitp (g, block, &addr, &offset, &blknbr); i = offset; offset -= j; @@ -3093,13 +3096,13 @@ static void update (short filedes, char while (i < keyl) block[j++] = ins_key[i++]; /* block pointed to remains the same */ - lseek (filedes, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - write (filedes, block, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); + write (g->fd, block, BLOCKLEN); } - lseek (filedes, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (filedes, block, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); + read (g->fd, block, BLOCKLEN); } @@ -3114,7 +3117,7 @@ static void update (short filedes, char * key_len: length of that key * blknbr: key points to this block */ -static void insert (int filedes, char *ins_key, long key_len, unsigned long blknbr) /* insert pointer */ +static void insert (global_handle *g, char *ins_key, long key_len, unsigned long blknbr) /* insert pointer */ { unsigned long blk; char block[BLOCKLEN]; @@ -3131,8 +3134,8 @@ static void insert (int filedes, char *i blk = traceblk[trx]; addr = traceadr[trx]; - lseek (filedes, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET); - read (filedes, block, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET); + read (g->fd, block, BLOCKLEN); offset = UNSIGN (block[OFFS]) * 256 + UNSIGN (block[OFFS + 1]); @@ -3144,7 +3147,7 @@ static void insert (int filedes, char *i needed = key_len + 2 + PLEN; - if ((offset + needed) > DATALIM) splitp (filedes, block, &addr, &offset, &blk); + if ((offset + needed) > DATALIM) splitp (g, block, &addr, &offset, &blk); /* insert key */ i = (offset += needed); @@ -3168,8 +3171,8 @@ static void insert (int filedes, char *i block[i++] = blknbr % 65536 / 256; block[i] = blknbr % 256; - lseek (filedes, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET); - write (filedes, block, BLOCKLEN); + lseek (g->fd, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET); + write (g->fd, block, BLOCKLEN); trx = trxsav;