--- freem/src/shmmgr.c 2025/03/24 02:56:50 1.5
+++ freem/src/shmmgr.c 2025/05/12 14:26:15 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: shmmgr.c,v 1.5 2025/03/24 02:56:50 snw Exp $
+ * $Id: shmmgr.c,v 1.16 2025/05/12 14:26:15 snw Exp $
* shared memory manager
*
*
@@ -24,6 +24,39 @@
* along with FreeM. If not, see .
*
* $Log: shmmgr.c,v $
+ * Revision 1.16 2025/05/12 14:26:15 snw
+ * Revert bad change in shared memory manager
+ *
+ * Revision 1.15 2025/05/09 19:44:50 snw
+ * Begin shm rework
+ *
+ * Revision 1.14 2025/05/08 14:47:26 snw
+ * Break everything to begin shared memory rewrite
+ *
+ * Revision 1.13 2025/04/16 17:36:12 snw
+ * Add FreeBSD shm cleanup script
+ *
+ * Revision 1.12 2025/04/15 21:57:10 snw
+ * Fix SysV IPC bugs on FreeBSD
+ *
+ * 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
*
@@ -46,6 +79,7 @@
#include "shmmgr.h"
#include "mpsdef.h"
#include "locktab.h"
+#include "log.h"
#include
#include
@@ -71,14 +105,22 @@ void shm_daemon_init(void);
shm_config_t *shm_config = (shm_config_t *) NULL;
+#if defined(__FreeBSD__)
+# define FM_SHM_PERMS 0777
+#else
+# define FM_SHM_PERMS 0770
+#endif
+
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;
-
+
+#if defined(__FreeBSD__)
+ struct shmid_ds ctl;
+#endif
+
shm_sk = ftok (config_file, 5);
pg_size = sysconf (_SC_PAGESIZE);
@@ -94,12 +136,12 @@ short shm_init(const size_t seg_size)
shm_config->segsiz = seg_size + alloc_map_size + pg_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, FM_SHM_PERMS | 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;
}
@@ -111,7 +153,7 @@ short shm_init(const size_t seg_size)
#endif
if (shm_config->dta == (void *) -1) {
- return SHMS_ATTACH_ERR;
+ logprintf (FM_LOG_FATAL, "shm_init: shmat() failed (error code %d [%s])", errno, strerror (errno));
}
/* view the first sizeof (shm_hdr_t) bytes of the data area as an shm_hdr_t */
shm_config->hdr = (shm_hdr_t *) shm_config->dta;
@@ -134,7 +176,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;
@@ -148,39 +190,12 @@ 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! */
- /* (again, borrowed from RSM) */
- if (shm_config->hdr->shmad != shm_config->dta) {
-
- /* grab the pointers we need */
- void *old_addr = shm_config->dta;
- void *new_addr = shm_config->hdr->shmad;
-
- /* 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);
- }
-
- shm_config->dta = shmat (shm_config->seg_id, new_addr, 0);
- 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);
- }
-
- shm_config->hdr = (shm_hdr_t *) shm_config->dta;
+ shm_config->buf = SHMALIGN(shm_config->dta + (sizeof (shm_hdr_t) * shm_config->pgct));
- /* allocator buffer at the next page-aligned address after the header and allocation map */
- shm_config->buf = SHMALIGN(shm_config->dta + (sizeof (shm_hdr_t) * shm_config->pgct));
- }
- else {
- shm_config->buf = SHMALIGN(shm_config->dta + (sizeof (shm_hdr_t) * shm_config->pgct));
- }
}
@@ -197,7 +212,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;
@@ -205,14 +219,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 */
@@ -231,7 +243,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;
@@ -249,7 +261,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;
}
@@ -258,7 +270,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;
}
@@ -344,8 +356,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");
}
@@ -420,18 +431,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");
}
@@ -473,7 +482,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);