--- freem/src/shmmgr.c 2025/03/09 15:20:18 1.3 +++ freem/src/shmmgr.c 2025/04/15 21:08:51 1.11 @@ -1,23 +1,11 @@ /* - * * - * * * - * * * - * *************** - * * * * * - * * MUMPS * - * * * * * - * *************** - * * * - * * * - * * - * - * shmmgr.c + * $Id: shmmgr.c,v 1.11 2025/04/15 21:08:51 snw Exp $ * shared memory manager * * * Author: Serena Willis * Copyright (C) 1998 MUG Deutschland - * Copyright (C) 2020 Coherent Logic Development LLC + * Copyright (C) 2020, 2025 Coherent Logic Development LLC * * * This file is part of FreeM. @@ -35,6 +23,34 @@ * You should have received a copy of the GNU Affero Public License * along with FreeM. If not, see . * + * $Log: shmmgr.c,v $ + * Revision 1.11 2025/04/15 21:08:51 snw + * Add some useful debug output + * + * Revision 1.10 2025/04/15 19:26:13 snw + * Remove extra whitespace + * + * Revision 1.9 2025/04/15 16:49:36 snw + * Make use of logprintf throughout codebase + * + * Revision 1.8 2025/04/14 19:46:18 snw + * Add SHM_REMAP flag to shmat on FreeBSD + * + * Revision 1.7 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * + * Revision 1.6 2025/04/04 19:43:18 snw + * Switch to using environment catalog to determine user and group for environment, and remove -u and -g flags from freem + * + * Revision 1.5 2025/03/24 02:56:50 snw + * Shared memory compatibility fixes for OS/2 + * + * Revision 1.4 2025/03/09 19:50:47 snw + * Second phase of REUSE compliance and header reformat + * + * + * SPDX-FileCopyrightText: (C) 2025 Coherent Logic Development LLC + * SPDX-License-Identifier: AGPL-3.0-or-later **/ #include @@ -48,12 +64,13 @@ #include "shmmgr.h" #include "mpsdef.h" #include "locktab.h" +#include "log.h" #include #include #include -#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 */ @@ -75,10 +92,8 @@ shm_config_t *shm_config = (shm_config_t short shm_init(const size_t seg_size) { - union semun arg; size_t alloc_map_size; long pg_size; - register int i; key_t shm_sk; shm_sk = ftok (config_file, 5); @@ -97,11 +112,11 @@ short shm_init(const size_t seg_size) shm_config->key = ftok (config_file, 1); shm_config->pgsiz = pg_size; - shm_config->seg_id = shmget (shm_config->key, shm_config->segsiz, 0660 | IPC_CREAT); + shm_config->seg_id = shmget (shm_config->key, shm_config->segsiz, 0770 | IPC_CREAT); if (shm_config->seg_id == -1) { if (errno == 22) { - fprintf (stderr, "shm_init: cannot get shared memory segment of %ld bytes\r\n\r\n", (unsigned long) shm_config->segsiz); - fprintf (stderr, "You may need to tune your kernel parameters, or manually set a smaller shared memory segment size in both the FreeM daemon and each interpreter process by using the `-S` command-line flag.\r\n\r\nPlease refer to the FreeM Platform Notes for your operating system for details.\r\n\r\n"); + logprintf (FM_LOG_ERROR, "shm_init: cannot get shared memory segment of %ld bytes", (unsigned long) shm_config->segsiz); + fprintf (stderr, "\r\nYou may need to tune your kernel parameters, or manually set a smaller shared memory segment size in both the FreeM daemon and each interpreter process by using the `-S` command-line flag.\r\n\r\nPlease refer to the FreeM Platform Notes for your operating system for details.\r\n"); } return SHMS_GET_ERR; } @@ -136,7 +151,7 @@ short shm_init(const size_t seg_size) if (daemon_chk == -1 && errno == ESRCH) { - fprintf (stderr, "shm_init: recovering from crashed daemon pid %d\r\n", shm_config->hdr->first_process); + logprintf (FM_LOG_WARNING, "shm_init: recovering from crashed daemon pid %ld", shm_config->hdr->first_process); first_process = TRUE; @@ -150,8 +165,7 @@ short shm_init(const size_t seg_size) semid_shm = semget (shm_sk, 1, 0); if (semid_shm == -1) { - fprintf (stderr, "shm_init: could not attach to shared memory semaphore\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "shm_init: could not attach to shared memory semaphore [%s]", strerror (errno)); } /* we are NOT the initial process. if addresses don't match, re-attach! */ @@ -161,18 +175,22 @@ short shm_init(const size_t seg_size) /* grab the pointers we need */ void *old_addr = shm_config->dta; void *new_addr = shm_config->hdr->shmad; + + logprintf (FM_LOG_INFO, "shmmgr: moving shared memory from %p to %p", old_addr, new_addr); /* detach and reattach */ if (shmdt (old_addr) == -1) { - fprintf (stderr, "shm_init: detach failed during detach/reattach [shmdt error %s]\r\n", strerror (errno)); - exit (1); + logprintf (FM_LOG_FATAL, "shm_init: detach failed during detach/reattach [shmdt error %s]", strerror (errno)); } - + +#if defined(__FreeBSD__) + shm_config->dta = shmat (shm_config->seg_id, new_addr, SHM_REMAP); +#else shm_config->dta = shmat (shm_config->seg_id, new_addr, 0); +#endif if (shm_config->dta == (void *) -1) { - fprintf (stderr, "shm_init: fatal error attaching shared memory segment [shmat error '%s']\r\n", strerror (errno)); - exit (1); + logprintf (FM_LOG_FATAL, "shm_init: fatal error attaching shared memory segment [shmat error '%s']", strerror (errno)); } shm_config->hdr = (shm_hdr_t *) shm_config->dta; @@ -199,7 +217,6 @@ short shm_init(const size_t seg_size) void shm_daemon_init(void) { union semun arg; - size_t alloc_map_size; key_t shm_sk; register int i; @@ -207,14 +224,12 @@ void shm_daemon_init(void) semid_shm = semget (shm_sk, 1, 0660 | IPC_CREAT); if (semid_shm == -1) { - fprintf (stderr, "shm_init: failed to create shared memory semaphore\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "shm_init: failed to create shared memory semaphore [%s]", strerror (errno)); } arg.val = 1; if (semctl (semid_shm, 0, SETVAL, arg) == -1) { - fprintf (stderr, "shm_init: failed to initialize shared memory semaphore\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "shm_init: failed to initialize shared memory semaphore [%s]", strerror (errno)); } /* zero out the segment */ @@ -233,7 +248,7 @@ void shm_daemon_init(void) shm_config->alloc_map = (shm_page_t *) (shm_config->dta + sizeof (shm_hdr_t)); */ shm_config->buf = SHMALIGN(shm_config->dta + (sizeof (shm_hdr_t) * shm_config->pgct)); - printf ("shm_daemon_init: allocator buffer aligned at %p (system page size %ld)\r\n", shm_config->buf, sysconf (_SC_PAGESIZE)); + logprintf (FM_LOG_INFO, "shm_daemon_init: allocator buffer aligned at %p (system page size %ld)", shm_config->buf, sysconf (_SC_PAGESIZE)); for (i = 0; i < shm_config->pgct; i++) { shm_config->hdr->alloc_map[i].is_first = FALSE; @@ -251,7 +266,7 @@ short shm_exit(void) res = shmdt (shm_config->dta); if (res == -1) { - fprintf (stderr, "shm_exit: failure in shmdt()\r\n"); + logprintf (FM_LOG_ERROR, "shm_exit: failure in shmdt() [%s]", strerror (errno)); return FALSE; } @@ -260,7 +275,7 @@ short shm_exit(void) res = shmctl (shm_config->seg_id, IPC_RMID, 0); if (res == -1) { - fprintf (stderr, "shm_exit: failure in shmctl()\r\n"); + logprintf (FM_LOG_ERROR, "shm_exit: failure in shmctl() [%s]", strerror (errno)); return FALSE; } @@ -346,8 +361,7 @@ void *shm_alloc_pages(const int page_cou shm_page_t *pg; if (shm_get_sem () == FALSE) { - fprintf (stderr, "shm_alloc_pages: could not get exclusive access to shared memory\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "shm_alloc_pages: could not get exclusive access to shared memory"); } @@ -422,18 +436,16 @@ void shm_free_page(const int page_number shm_page_t *a = shm_get_alloc_map_entry (page_number); if (a->is_first == FALSE) { - fprintf (stderr, "shm_free_page: attempt to free page in the middle of allocation chain\r\n"); + logprintf (FM_LOG_ERROR, "shm_free_page: attempt to free page in the middle of allocation chain"); return; } if (a->pg_state == PG_FREE) { - fprintf (stderr, "shm_free_page: double free attempted in page %d\r\n", page_number); - exit (1); + logprintf (FM_LOG_FATAL, "shm_free_page: double free attempted in page %d", page_number); } if (shm_get_sem () == FALSE) { - fprintf (stderr, "shm_free_page: could not get exclusive access to shared memory\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "shm_free_page: could not get exclusive access to shared memory"); } @@ -475,7 +487,7 @@ void shm_dump(void) printf ("SHARED MEMORY CONFIGURATION\r\n"); printf (" pgsiz %ld\r\n", (unsigned long) shm_config->pgsiz); printf (" pgct %d\r\n", shm_config->pgct); - printf (" key %ld\r\n", shm_config->key); + printf (" key %d\r\n", shm_config->key); printf (" segid %d\r\n", shm_config->seg_id); printf (" sizeof shm_page_t %ld\r\n", (long) sizeof (shm_page_t)); printf (" segsiz %ld\r\n", (long) shm_config->segsiz);