[BACK]Return to shmmgr.c CVS log [TXT] [DIR] Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/shmmgr.c between versions 1.10 and 1.15

version 1.10, 2025/04/15 19:26:13 version 1.15, 2025/05/09 19:44:50
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.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   *   Revision 1.10  2025/04/15 19:26:13  snw
  *   Remove extra whitespace   *   Remove extra whitespace
  *   *
Line 87  void shm_daemon_init(void); Line 102  void shm_daemon_init(void);
   
 shm_config_t *shm_config = (shm_config_t *) NULL;  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)  short shm_init(const size_t seg_size)
 {  {
     size_t alloc_map_size;      size_t alloc_map_size;
     long pg_size;      long pg_size;
     key_t shm_sk;      key_t shm_sk;
       
   #if defined(__FreeBSD__)
       struct shmid_ds ctl;
   #endif
       
     shm_sk = ftok (config_file, 5);          shm_sk = ftok (config_file, 5);    
     pg_size = sysconf (_SC_PAGESIZE);      pg_size = sysconf (_SC_PAGESIZE);
           
Line 108  short shm_init(const size_t seg_size) Line 133  short shm_init(const size_t seg_size)
     shm_config->segsiz = seg_size + alloc_map_size + pg_size;      shm_config->segsiz = seg_size + alloc_map_size + pg_size;
     shm_config->key = ftok (config_file, 1);      shm_config->key = ftok (config_file, 1);
     shm_config->pgsiz = pg_size;      shm_config->pgsiz = pg_size;
              
     shm_config->seg_id = shmget (shm_config->key, shm_config->segsiz, 0770 | 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 (shm_config->seg_id == -1) {
         if (errno == 22) {          if (errno == 22) {
             logprintf (FM_LOG_ERROR, "shm_init:  cannot get shared memory segment of %ld bytes", (unsigned long) shm_config->segsiz);              logprintf (FM_LOG_ERROR, "shm_init:  cannot get shared memory segment of %ld bytes", (unsigned long) shm_config->segsiz);
Line 125  short shm_init(const size_t seg_size) Line 150  short shm_init(const size_t seg_size)
 #endif  #endif
           
     if (shm_config->dta == (void *) -1) {           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 */      /* 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;      shm_config->hdr = (shm_hdr_t *) shm_config->dta;
Line 165  short shm_init(const size_t seg_size) Line 190  short shm_init(const size_t seg_size)
                 logprintf (FM_LOG_FATAL, "shm_init:  could not attach to shared memory semaphore [%s]", strerror (errno));                           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) {  
                     logprintf (FM_LOG_FATAL, "shm_init:  detach failed during detach/reattach [shmdt error %s]", strerror (errno));  
                 }  
   
 #if defined(__FreeBSD__)              shm_config->buf = SBM(SHMALIGN(SOM(shm_config->dta) + (sizeof (shm_hdr_t) * shm_config->pgct)));
                 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) {  
                     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;  
   
                 /* 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));  
             }  
                   
         }          }
   
Removed from v.1.10  
changed lines
  Added in v.1.15

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