Diff for /freem/src/shmmgr.h between versions 1.5 and 1.7

version 1.5, 2025/05/08 16:29:18 version 1.7, 2025/05/15 04:14:20
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.7  2025/05/15 04:14:20  snw
    *   Remove old SEMK_ macros since ftok is now used throughout to determine semaphore keys
    *
    *   Revision 1.6  2025/05/09 19:44:50  snw
    *   Begin shm rework
    *
  *   Revision 1.5  2025/05/08 16:29:18  snw   *   Revision 1.5  2025/05/08 16:29:18  snw
  *   Add SOM/SOA/SBM/SBA macros from RSM and modify for FreeM   *   Add SOM/SOA/SBM/SBA macros from RSM and modify for FreeM
  *   *
Line 65 Line 71
 #define SHMS_GET_ERR 0  #define SHMS_GET_ERR 0
 #define SHMS_ATTACH_ERR -1  #define SHMS_ATTACH_ERR -1
   
 #define SEMK_SHM 0xBBDD21  
 #define SEMK_LOCKTAB 0xBBDD22  
 #define SEMK_JOBTAB 0xBBDD23  
 #define SEMK_TP 0xBBDD24  
   
 #define SHMALIGN(a) (void *) (((unsigned long) a + sysconf (_SC_PAGESIZE)) & ~(sysconf (_SC_PAGESIZE) - 1))  #define SHMALIGN(a) (void *) (((unsigned long) a + sysconf (_SC_PAGESIZE)) & ~(sysconf (_SC_PAGESIZE) - 1))
   
 /* The following macros were borrowed from Reference Standard M  /* The following macros were borrowed from Reference Standard M
  *  SOM/SOA:  reading and writing data stored in shared memory   *  SOM/SOA:  reading and writing data stored in shared memory
  *  SBM/SBA:  for modifying pointers in shared memory   *  SBM/SBA:  for modifying pointers in shared memory
    *
    *  Versions ending with 'A' will maintain NULL pointers.
  */   */
 #define SOM(ptr)    ((__typeof__(ptr)) ((char *) (ptr) + ((char *) shm_config->dta - (char *) shm_config->hdr->shmad)))  #define SOM(ptr)    ((__typeof__(ptr)) ((char *) (ptr) + ((char *) shm_config->dta - (char *) shm_config->hdr->shmad)))
 #define SOA(ptr)    ((ptr == NULL) ? NULL : SOM(ptr))  #define SOA(ptr)    ((ptr == NULL) ? NULL : SOM(ptr))

Removed from v.1.5  
changed lines
  Added in v.1.7


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