freem/src/global_bltin.c - diff

Return to global_bltin.c CVS log

Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/global_bltin.c between versions 1.21 and 1.23

version 1.21, 2025/04/11 20:55:49	version 1.23, 2025/04/17 14:34:27
Line 24	Line 24
* along with FreeM. If not, see <https://www.gnu.org/licenses/>.	* along with FreeM. If not, see <https://www.gnu.org/licenses/>.
*	*
* $Log$	* $Log$
	* Revision 1.23 2025/04/17 14:34:27 snw
	* Further logging improvements
	*
	* Revision 1.22 2025/04/13 04:22:43 snw
	* Fix snprintf calls
	*
* Revision 1.21 2025/04/11 20:55:49 snw	* Revision 1.21 2025/04/11 20:55:49 snw
* Disable -Wunused-result where possible	* Disable -Wunused-result where possible
*	*
Line 94	Line 100
#include "mpsdef.h"	#include "mpsdef.h"
#include "journal.h"	#include "journal.h"
#include "global_bltin.h"	#include "global_bltin.h"
	#include "log.h"

global_handle *global_handles_head;	global_handle *global_handles_head;
unsigned long gbl_cache_misses = 0;	unsigned long gbl_cache_misses = 0;
Line 111 short g_numeric (char *str);	Line 118 short g_numeric (char *str);
void close_all_globals(void);	void close_all_globals(void);
static void panic (void);	static void panic (void);

#define ROOT 0L

/* end of line symbol in global module is 30, which is a code not */
/* otherwise used in subscripts */
#define g_EOL 30

#define EOL1 EOL

/* numerics (('.'<<1)&037)==28 ; (('-'<<1)&037)==26; */
#define POINT 28
#define MINUS 26

/* ALPHA and OMEGA are dummy subscripts in $order processing */
/* ALPHA sorts before all other subscripts */
/* OMEGA sorts after all other subscripts */
/* e.g. ("abc") -> "abc",OMEGA ; ("abc","") -> "abc",ALPHA */
#define OMEGA 29
#define ALPHA 31

/* length of blocks. status bytes defined as offset to blocklength */
/* BLOCKLEN 1024 is defined in mpsdef0 include file */
#define DATALIM (BLOCKLEN-11)
#define LLPTR (BLOCKLEN-10)
#define NRBLK LLPTR
#define COLLA (BLOCKLEN- 7)
#define RLPTR (BLOCKLEN- 6)
#define FREE RLPTR
#define BTYP (BLOCKLEN- 3)
#define OFFS (BLOCKLEN- 2)

/* length of blockpointers in bytes */
#define PLEN 3

#define EMPTY 0
#define FBLK 1
#define POINTER 2
#define BOTTOM 6
#define DATA 8

#if !defined(__OpenBSD__) && !defined(_AIX) && !defined(__osf__) && !defined(MSDOS) && !defined(__vax__) && !defined(__OS2__)	#if !defined(__OpenBSD__) && !defined(_AIX) && !defined(__osf__) && !defined(MSDOS) && !defined(__vax__) && !defined(__OS2__)
long time ();	long time ();
#endif	#endif
Line 315 int gbl_write_initial_header(global_hand	Line 283 int gbl_write_initial_header(global_hand
lseek (g->fd, 0, SEEK_SET);	lseek (g->fd, 0, SEEK_SET);

if (write (g->fd, &hdr, sizeof (global_header)) == -1) {	if (write (g->fd, &hdr, sizeof (global_header)) == -1) {
snprintf (msg, sizeof (msg), "error %d writing global header for %s", errno, g->global_name);	snprintf (msg, sizeof (msg) - 1, "error %d writing global header for %s", errno, g->global_name);
m_fatal (msg);	m_fatal (msg);
}	}

Line 340 int gbl_write_header(global_handle *g, g	Line 308 int gbl_write_header(global_handle *g, g
lseek (g->fd, 0, SEEK_SET);	lseek (g->fd, 0, SEEK_SET);

if (write (g->fd, hdr, sizeof (global_header)) == -1) {	if (write (g->fd, hdr, sizeof (global_header)) == -1) {
snprintf (msg, sizeof (msg), "error %d writing global header for %s", errno, g->global_name);	snprintf (msg, sizeof (msg) - 1, "error %d writing global header for %s", errno, g->global_name);
m_fatal (msg);	m_fatal (msg);
}	}

Line 473 short gbl_open(global_handle *g, short a	Line 441 short gbl_open(global_handle *g, short a
switch (result) {	switch (result) {

case GBL_HDR_BADMAGIC:	case GBL_HDR_BADMAGIC:
fprintf (stderr, "gbl_open: bad magic value in %s [FATAL]\n", g->global_name);	logprintf (FM_LOG_FATAL, "gbl_open: bad magic value in %s", g->global_name);
exit (1);
break;	break;

case GBL_HDR_BADVERSION:	case GBL_HDR_BADVERSION:
fprintf (stderr, "gbl_open: global version is %d in %s (must be %d) [FATAL]\n", g->header.format_version, g->global_name, GBL_FORMAT_VERSION);	logprintf (FM_LOG_FATAL, "gbl_open: global version is %d in %s (must be %d)", g->header.format_version, g->global_name, GBL_FORMAT_VERSION);
exit (1);
break;	break;

}	}
Line 554 int gbl_write_block(global_handle *g, un	Line 520 int gbl_write_block(global_handle *g, un
errno = 0;	errno = 0;

lseek (g->fd, hdr_offset + (blocknum * g->header.block_size), SEEK_SET);	lseek (g->fd, hdr_offset + (blocknum * g->header.block_size), SEEK_SET);
write (g->fd, block, BLOCKLEN);	write (g->fd, block, g->header.block_size);
errsav = errno;	errsav = errno;
g->last_block = blocknum;	g->last_block = blocknum;
g->use_count++;	g->use_count++;
Line 1008 void global_bltin (short action, char *k	Line 974 void global_bltin (short action, char *k

reopen:	reopen:

gbl_open (g, action);	if (!gbl_open (g, action)) {
if (g->fd == -1) {

/* file not found */	/* file not found */
if (action != set_sym) {	if (action != set_sym) {
Line 1092 reopen:	Line 1057 reopen:
block[BTYP] = DATA; /* type */	block[BTYP] = DATA; /* type */
block[OFFS] = i / 256;	block[OFFS] = i / 256;
block[OFFS + 1] = i % 256;	block[OFFS + 1] = i % 256;

for (;;) {

errno = 0;
write (g->fd, block, BLOCKLEN);

if (errno == 0) break;

lseek (g->fd, hdr_offset + ((ROOT + 1L) * BLOCKLEN), SEEK_SET);
panic ();

}

	gbl_write_block (g, ROOT + 1, block);

gbl_close (g);	gbl_close (g);
gbl_unlock (g);	gbl_unlock (g);
gbl_open (g, action);	gbl_open (g, action);
Line 1126 reopen:	Line 1081 reopen:
tfast0:	tfast0:
gbl_lock (g, 3);	gbl_lock (g, 3);

if (g->fast_path > 0) goto tfast1; /* try again last block */	if (g->fast_path > 0) {
	goto tfast1; /* try again last block */
	}

blknbr = g->last_block = ROOT; /* start with ROOT block */	blknbr = g->last_block = ROOT; /* start with ROOT block */

for (;;) {	for (;;) {
	tfast1:

tfast1:
gbl_read_block (g, blknbr, block);	gbl_read_block (g, blknbr, block);

/* temporarily disabled	/* temporarily disabled
tfast2:	tfast2:
*/	*/
if ((typ = block[BTYP]) == DATA) { /* scan data block: here we test for equality only */	if ((typ = block[BTYP]) == DATA) { /* scan data block: here we test for equality only */

offset = UNSIGN (block[OFFS]) * 256 +	offset = UNSIGN (block[OFFS]) * 256 +
UNSIGN (block[OFFS + 1]);	UNSIGN (block[OFFS + 1]);
j = UNSIGN (block[0]);	j = UNSIGN (block[0]);
Line 1149 tfast1:	Line 1103 tfast1:
stcpy0 (key1, &block[2], j); /* get first key */	stcpy0 (key1, &block[2], j); /* get first key */

ch = keyl; /* ch is a register! */	ch = keyl; /* ch is a register! */
	while (i < offset) {
while (i < offset) {

j = UNSIGN (block[i++]); /* length of key - offset */	j = UNSIGN (block[i++]); /* length of key - offset */
k = UNSIGN (block[i++]); /* offset into previous entry */	k = UNSIGN (block[i++]); /* offset into previous entry */

Line 1159 tfast1:	Line 1111 tfast1:

while (k < j) key1[k++] = block[i++]; /* get key */	while (k < j) key1[k++] = block[i++]; /* get key */

if (j != ch) { /* keys have different length */	if (j != ch) { /* keys have different length */

i += UNSIGN (block[i]);	i += UNSIGN (block[i]);
i++;	i++;

continue;	continue;

}	}

j = ch;	j = ch;
Line 1173 tfast1:	Line 1123 tfast1:
do {	do {
j--;	j--;
} while (compactkey[j] == key1[j]); /* compare keys */	} while (compactkey[j] == key1[j]); /* compare keys */

	if (j < 0) {
if (j < 0) {

k = UNSIGN (block[i++]);	k = UNSIGN (block[i++]);
stcpy0 (data, &block[i], k); /* get value */	stcpy0 (data, &block[i], k); /* get value */
data[k] = EOL1; /* append EOL */	data[k] = EOL1; /* append EOL */

goto quit;	goto quit;

}	}

i += UNSIGN (block[i]);	i += UNSIGN (block[i]);
i++; /* skip data */	i++; /* skip data */

}	}

/* fast access failed. try normal path */	/* fast access failed. try normal path */
Line 3662 void close_all_globals (void)	Line 3608 void close_all_globals (void)
gbl_close_all ();	gbl_close_all ();

return;	return;
} /* end close_all_globals() */	} /* close_all_globals() */

static void panic (void)	static void panic (void)
{	{
printf ("write failed\r\n");	logprintf (FM_LOG_ERROR, "global_bltin: could not write to full disk");

printf ("\033[s\033[25H\033[5;7mwrite needs more disk space immediately\007");
sleep (1);
printf ("\033[m\007\033[2K\033[u");

/* restore screen 'cause system messed up screen */

#ifdef NOWRITEM

write_m ("\033[4~\201");

#endif /* NOWRITEM */

return;	return;
	} /* panic() */
} /* end panic() */


void gbl_dump_stat(void)	void gbl_dump_stat(void)

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.21
changed lines
	Added in v.1.23