--- freem/src/shmmgr.c 2025/04/09 19:52:02 1.7
+++ freem/src/shmmgr.c 2025/04/15 16:49:36 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: shmmgr.c,v 1.7 2025/04/09 19:52:02 snw Exp $
+ * $Id: shmmgr.c,v 1.9 2025/04/15 16:49:36 snw Exp $
* shared memory manager
*
*
@@ -24,6 +24,12 @@
* along with FreeM. If not, see .
*
* $Log: shmmgr.c,v $
+ * 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
*
@@ -52,6 +58,7 @@
#include "shmmgr.h"
#include "mpsdef.h"
#include "locktab.h"
+#include "log.h"
#include
#include
@@ -102,8 +109,8 @@ short shm_init(const size_t seg_size)
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;
}
@@ -138,7 +145,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;
@@ -152,8 +159,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! */
@@ -166,15 +172,19 @@ short shm_init(const size_t seg_size)
/* 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;
@@ -208,14 +218,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 */
@@ -234,7 +242,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;
@@ -252,7 +260,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;
}
@@ -261,7 +269,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;
}
@@ -347,8 +355,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");
}
@@ -423,18 +430,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");
}