--- freem/src/symtab_bltin.c 2025/03/09 19:50:47 1.4 +++ freem/src/symtab_bltin.c 2025/05/18 18:15:38 1.15 @@ -1,5 +1,5 @@ /* - * $Id: symtab_bltin.c,v 1.4 2025/03/09 19:50:47 snw Exp $ + * $Id: symtab_bltin.c,v 1.15 2025/05/18 18:15:38 snw Exp $ * FreeM local system table and user-defined special variable table * * @@ -24,6 +24,39 @@ * along with FreeM. If not, see . * * $Log: symtab_bltin.c,v $ + * Revision 1.15 2025/05/18 18:15:38 snw + * Add ZEDIT command for editing routines + * + * Revision 1.14 2025/05/14 12:22:04 snw + * Further work on shared memory + * + * Revision 1.13 2025/04/19 21:52:20 snw + * Remove extraneous symbol table debugging message + * + * Revision 1.12 2025/04/14 19:56:27 snw + * Working towards FreeBSD fix + * + * Revision 1.11 2025/04/13 04:22:43 snw + * Fix snprintf calls + * + * Revision 1.10 2025/04/10 01:24:39 snw + * Remove C++ style comments + * + * Revision 1.9 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * + * Revision 1.8 2025/04/04 12:46:13 snw + * Patch Solaris 8 crash and bump version to 0.63.1-rc1 + * + * Revision 1.7 2025/03/26 15:17:12 snw + * Fall back to global-backed SSVNs when memory-backed globals fail in attempt to fix Tru64 + * + * Revision 1.6 2025/03/24 04:13:11 snw + * Replace action macro dat with fra_dat to avoid symbol conflict on OS/2 + * + * Revision 1.5 2025/03/24 02:01:41 snw + * Work around some OS/2 incompatibilities in symbol table code + * * Revision 1.4 2025/03/09 19:50:47 snw * Second phase of REUSE compliance and header reformat * @@ -44,15 +77,17 @@ #include "merr.h" #include "consttbl.h" #include "shmmgr.h" +#include "log.h" /* Turn this on to get tons of lovely debugging messages about symbol-table calls */ /* #define DEBUG_SYM */ +short st_use_shm = FALSE; short restoring_consts = FALSE; int semid_symtab; -#if !defined(__OpenBSD__) && !defined(__APPLE__) +#if !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__OS2__) union semun { int val; /* Value for SETVAL */ struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */ @@ -108,32 +143,43 @@ void symtab_init (void) shm_config->hdr->PSIZE = DEFPSIZE; shm_config->hdr->argptr = mbpartition; - fprintf (stderr, "symtab_init: initializing memory-backed globals\r\n"); + + logprintf (FM_LOG_INFO, "symtab_init: initializing memory-backed globals"); semid_symtab = semget (symtab_sk, 1, 0666 | IPC_CREAT); if (semid_symtab == -1) { - fprintf (stderr, "symtab_init: failed to create symbol table semaphore\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "symtab_init: failed to create symbol table semaphore"); } else { - fprintf (stderr, "symtab_init: symbol table semaphore created with semid %d\r\n", semid_symtab); + logprintf (FM_LOG_INFO, "symtab_init: symbol table semaphore created with semid %d", semid_symtab); } +#if defined(__sun__) + logprintf (FM_LOG_WARNING, "symtab_init: falling back to global-backed structured system variables"); + shm_config->hdr->use_mb_globals = FALSE; + return; +#endif + + arg.val = 1; if (semctl (semid_symtab, 0, SETVAL, arg) == -1) { - fprintf (stderr, "symtab_init: failed to initialize symbol table semaphore\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "symtab_init: failed to initialize symbol table semaphore"); } else { - fprintf (stderr, "symtab_init: symbol table semaphore initialized\r\n"); + logprintf (FM_LOG_INFO, "symtab_init: symbol table semaphore initialized"); } - fprintf (stderr, "symtab_init: allocating partition for memory-backed globals\r\n"); + logprintf (FM_LOG_INFO, "symtab_init: allocating partition for memory-backed globals"); mbpartition = (char *) shm_alloc ((size_t) PSIZE + 2); - NULLPTRCHK(mbpartition,"symtab_init"); - - shm_config->hdr->partition = mbpartition; + if (mbpartition != NULL) { + shm_config->hdr->use_mb_globals = TRUE; + shm_config->hdr->partition = mbpartition; + } + else { + logprintf (FM_LOG_WARNING, "symtab_init: falling back to global-backed structured system variables"); + shm_config->hdr->use_mb_globals = FALSE; + } if (symtab_get_sem ()) { for (i = 0; i < 128; i++) shm_config->hdr->alphptr[i] = 0L; @@ -145,12 +191,15 @@ void symtab_init (void) semid_symtab = semget (symtab_sk, 1, 0); if (semid_symtab == -1) { - fprintf (stderr, "symtab_init: could not attach to symbol table semaphore\r\n"); + logprintf (FM_LOG_FATAL, "symtab_init: could not attach to symbol table semaphore"); exit (1); } - - mbpartition = shm_config->hdr->partition; + if (shm_config->hdr->use_mb_globals == TRUE) { + mbpartition = SOA(shm_config->hdr->partition); + } + + symtab_release_sem (); } } @@ -176,7 +225,7 @@ short symtab_get_sem(void) sleep (1); } - fprintf (stderr, "symtab_get_sem: fail\r\n"); + logprintf (FM_LOG_ERROR, "symtab_get_sem: fail"); have_symtab_sem = FALSE; return FALSE; @@ -201,6 +250,16 @@ void symtab_shm (short action, char *key unsigned long stptrs[128]; register int i; char *old_partition = partition; + + /* + global (action, key, data); + return; + */ + + if (shm_config->hdr->use_mb_globals == FALSE) { + symtab_bltin (action, key, data); + return; + } partition = mbpartition; writing_mb = TRUE; @@ -254,7 +313,7 @@ void symtab_shm (short action, char *key } else { - fprintf (stderr, "symtab_shm: failed to acquire symbol table sempahore\r\n"); + logprintf (FM_LOG_FATAL, "symtab_shm: failed to acquire symbol table sempahore"); } writing_mb = FALSE; @@ -352,7 +411,7 @@ void symtab_bltin (short action, char *k stcnv_m2c (tt_with); stcnv_m2c (tt_key); - snprintf (key, 100, "%s%s\201\201", tt_with, tt_key); + sprintf (key, "%s%s\201\201", tt_with, tt_key); no_with: @@ -558,7 +617,7 @@ no_with: /* OLD get_sym routine */ if ((i = alphptr[(int) key[0]])) { -// printf ("alphptr match; writing_mb = %d\r\n", writing_mb); +/* printf ("alphptr match; writing_mb = %d\r\n", writing_mb); */ k = 1; j = i + 1; /* first char always matches! */ @@ -607,10 +666,6 @@ no_with: return; - - - - case set_sym: /* store/create variable */ @@ -943,7 +998,7 @@ old0: /* entry from getinc */ /* end of set_sym section */ - case dat: + case fra_dat: /* note: we assume EOL