Changeset 1986 for trunk/src/emx/include

Timestamp:

May 9, 2005, 7:02:45 AM (20 years ago)

Author:

bird

Message:

SysV Shared Memory.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (2 diffs, 1 prop)
• InnoTekLIBC/logstrict.h (modified) (1 diff, 1 prop)
• InnoTekLIBC/sharedpm.h (modified) (1 diff, 1 prop)
• sys/shm.h (modified) (7 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -894 +894 @@
 /** @defgroup grp_Back_sysvipc LIBC Backend - SysV IPC
  * @{ */
+
+/**
+ * sysget syscall.
+ */
+int __libc_Back_sysvSemGet(key_t key, int nsems, int semflg);
+
+/**
+ * semop syscall.
+ */
+int __libc_Back_sysvSemOp(int semid, struct sembuf *sops_user, size_t nsops);
+
 /**
  * semctl syscall
@@ -899 +910 @@
 int __libc_Back_sysvSemCtl(int semid, int semnum, int cmd, union semun real_arg);
 
-/**
- * sysget syscall.
- */
-int __libc_Back_sysvSemGet(key_t key, int nsems, int semflg);
-
-/**
- * semop syscall.
- */
-int __libc_Back_sysvSemOp(int semid, struct sembuf *sops_user, size_t nsops);
+
+/**
+ * shmget.
+ */
+int __libc_Back_sysvShmGet(key_t key, size_t size, int shmflg);
+
+/**
+ * shmat.
+ */
+int __libc_Back_sysvShmAt(int shmid, const void *shmaddr, int shmflg, void **ppvActual);
+
+/**
+ * shmdt.
+ */
+int __libc_Back_sysvShmDt(const void *shmaddr);
+
+/**
+ * shmctl.
+ */
+int __libc_Back_sysvShmCtl(int shmid, int cmd, struct shmid_ds *bufptr);
+
+/** @} */
+
+
+/** @defgroup grp_Back_safesem LIBC Backend - Internal Signal-Safe Semaphores.
+ * @{ */
+
+/**
+ * Creates a safe mutex sem.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   phmtx       Where to store the semaphore handle.
+ * @param   fShared     Set if the semaphore should be sharable between processes.
+ */
+int __libc_Back_safesemMtxCreate(uintptr_t *phmtx, int fShared);
+
+/**
+ * Opens a shared safe mutex sem.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   hmtx        The semaphore handle.
+ */
+int __libc_Back_safesemMtxOpen(uintptr_t hmtx);
+
+/**
+ * Closes a shared safe mutex sem.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   hmtx        The semaphore handle.
+ */
+int __libc_Back_safesemMtxClose(uintptr_t hmtx);
+
+/**
+ * Locks a mutex semaphore.
+ *
+ * @returns 0 on success.
+ * @returns Negative errno on failure.
+ * @param   hmtx    Handle to the mutex.
+ */
+int __libc_Back_safesemMtxLock(uintptr_t hmtx);
+
+/**
+ * Unlocks a mutex semaphore.
+ *
+ * @returns 0 on success.
+ * @returns Negative errno on failure.
+ * @param   hmtx    Handle to the mutex.
+ */
+int __libc_Back_safesemMtxUnlock(uintptr_t hmtx);
+
+/**
+ * Creates a safe event sem.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   phev        Where to store the semaphore handle.
+ * @param   fShared     Set if the semaphore should be sharable between processes.
+ */
+int __libc_Back_safesemEvCreate(uintptr_t *phev, int fShared);
+
+/**
+ * Opens a shared safe event sem.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   hev         The semaphore handle.
+ */
+int __libc_Back_safesemEvOpen(uintptr_t hev);
+
+/**
+ * Closes a shared safe mutex sem.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   hev         The semaphore handle.
+ */
+int __libc_Back_safesemEvClose(uintptr_t hev);
+
+/**
+ * Sleep on a semaphore.
+ *
+ * This is the most difficult thing we're doing in this file.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ *
+ * @param   hev         The semaphore to sleep on.
+ * @param   hmtx        The semaphore protecting hev and which is to be unlocked while
+ *                      sleeping and reaquired upon waking up.
+ * @param   pfnComplete Function to execute on signal and on wait completion.
+ * @param   pvUser      User argument to pfnComplete.
+ */
+int __libc_Back_safesemEvSleep(uintptr_t hev, uintptr_t hmtx, void (*pfnComplete)(void *pvUser), void *pvUser);
+
+/**
+ * Wakes up all threads sleeping on a given event semaphore.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   hev         Event semaphore to post.
+ */
+int __libc_Back_safesemEvWakeup(uintptr_t hev);
+
 
 /** @} */

trunk/src/emx/include/InnoTekLIBC/logstrict.h

@@ -184 +184 @@
 #define __LIBC_LOG_GRP_MMAN         16
 
+/** Backend SysV IPC APIs. */
+#define __LIBC_LOG_GRP_BACK_IPC     17
 /** Backend Thread APIs. */
 #define __LIBC_LOG_GRP_BACK_THREAD  18

trunk/src/emx/include/InnoTekLIBC/sharedpm.h

@@ -557 +557 @@
     /** 116 - Pointer to SysV Sempahore globals. */
     struct __libc_SysV_Sem             *pSysVSem;
-
-    /*  120 - The rest of the block, up to cbProcess, is undefined in this version.
+    /** 120 - Pointer to SysV Shared Memory globals. */
+    struct __libc_SysV_Shm             *pSysVShm;
+    /** 124 - Pointer to SysV Message Queue globals. */
+    struct __libc_SysV_Msg             *pSysVMsg;
+
+    /*  128 - The rest of the block, up to cbProcess, is undefined in this version.
      * Future versions of LIBC may use this area assuming it's initalized with zeros.
      */

trunk/src/emx/include/sys/shm.h

@@ -39 +39 @@
 /** @file
  * FreeBSD 5.3
+ * @changed the SHMLBA to 64KB.
  */
 
@@ -48 +49 @@
 #define SHM_RDONLY  010000  /* Attach read-only (else read-write) */
 #define SHM_RND     020000  /* Round attach address to SHMLBA */
-#define SHMLBA      PAGE_SIZE /* Segment low boundary address multiple */
+#define SHMLBA      (0x10000) /* Segment low boundary address multiple */
 
 /* "official" access mode definitions; somewhat braindead since you have
@@ -63 +64 @@
 #define SHM_INFO        14
 
+#ifdef __EMX__
+typedef __uint32_t shmatt_t;
+#endif
+
 struct shmid_ds {
         struct ipc_perm shm_perm;       /* operation permission structure */
+#ifdef __EMX__
+        size_t          shm_segsz;      /* size of segment in bytes */
+#else
         int             shm_segsz;      /* size of segment in bytes */
+#endif
         pid_t           shm_lpid;   /* process ID of last shared memory op */
         pid_t           shm_cpid;       /* process ID of creator */
-        short           shm_nattch;     /* number of current attaches */
+#ifdef __EMX__
+        shmatt_t        shm_nattch;     /* number of current attaches */
+#else
+        short           shm_nattch;     /* number of current attaches */
+#endif
         time_t          shm_atime;      /* time of last shmat() */
         time_t          shm_dtime;      /* time of last shmdt() */
@@ -88 +101 @@
                 shmall;         /* max amount of shared memory (pages) */
 };
+#ifndef __EMX__
 extern struct shminfo   shminfo;
 extern struct shmid_ds  *shmsegs;
+#endif
 
 struct shm_info {
@@ -100 +115 @@
 };
 
+#ifndef __EMX__
 struct thread;
 struct proc;
@@ -106 +122 @@
 void    shmexit(struct vmspace *);
 void    shmfork(struct proc *, struct proc *);
+#endif /* !__EMX__ */
 #else /* !_KERNEL */
 
@@ -116 +133 @@
 
 __BEGIN_DECLS
+#ifndef __EMX__
 int shmsys(int, ...);
+#endif
 void *shmat(int, const void *, int);
 int shmget(key_t, size_t, int);