Changeset 1984 for trunk/src/emx/include

Timestamp:

May 8, 2005, 2:11:22 PM (20 years ago)

Author:

bird

Message:

Ported the BSD SysV Semaphore module.

Location:

trunk/src/emx/include

Files:

• 386/builtin.h (modified) (11 diffs, 1 prop)
• InnoTekLIBC/FastInfoBlocks.h (modified) (1 diff, 1 prop)
• InnoTekLIBC/backend.h (modified) (2 diffs, 1 prop)
• InnoTekLIBC/sharedpm.h (modified) (7 diffs, 1 prop)
• InnoTekLIBC/thread.h (modified) (2 diffs, 1 prop)
• sys/ipc.h (modified) (2 diffs, 1 prop)
• sys/sem.h (modified) (5 diffs, 1 prop)

trunk/src/emx/include/386/builtin.h

@@ -77 +77 @@
 static __inline__ int __atomic_set_bit(__volatile__ void *pv, unsigned uBit)
 {
-    __asm__ __volatile__("lock btsl %2, %1\n\t"
+    __asm__ __volatile__("lock; btsl %2, %1\n\t"
                          "sbbl %0,%0"
                          : "=r" (uBit),
@@ -95 +95 @@
 static __inline__ void __atomic_clear_bit(__volatile__ void *pv, unsigned uBit)
 {
-    __asm__ __volatile__("lock btrl %1, %0"
+    __asm__ __volatile__("lock; btrl %1, %0"
                          : "=m" (*(__volatile__ unsigned *)pv)
                          : "r" (uBit));
@@ -128 +128 @@
 static __inline__ void __atomic_add(__volatile__ unsigned *pu, const unsigned uAdd)
 {
-    __asm__ __volatile__("lock addl %1, %0"
+    __asm__ __volatile__("lock; addl %1, %0"
                          : "=m" (*pu)
-                         : "nr" (uAdd), 
+                         : "nr" (uAdd),
                            "m"  (*pu));
 }
@@ -142 +142 @@
 static __inline__ void __atomic_sub(__volatile__ unsigned *pu, const unsigned uSub)
 {
-    __asm__ __volatile__("lock subl %1, %0"
+    __asm__ __volatile__("lock; subl %1, %0"
                          : "=m" (*pu)
-                         : "nr" (uSub), 
+                         : "nr" (uSub),
                            "m"  (*pu));
 }
@@ -156 +156 @@
 static __inline__ void __atomic_increment(__volatile__ unsigned *pu)
 {
-    __asm__ __volatile__("lock incl %0"
-                         : "=m" (*pu) 
+    __asm__ __volatile__("lock; incl %0"
+                         : "=m" (*pu)
                          : "m"  (*pu));
 }
 
 /**
+ * Atomically increments a 32-bit unsigned value.
+ *
+ * @param   pu32    Pointer to the value to increment.
+ */
+static __inline__ void __atomic_increment_u32(uint32_t __volatile__ *pu32)
+{
+    __asm__ __volatile__("lock; incl %0"
+                         : "=m" (*pu32)
+                         : "m"  (*pu32));
+}
+
+/**
+ * Atomically increments a 16-bit unsigned value.
+ *
+ * @param   pu16    Pointer to the value to increment.
+ */
+static __inline__ void __atomic_increment_u16(uint16_t __volatile__ *pu16)
+{
+    __asm__ __volatile__("lock; incw %0"
+                         : "=m" (*pu16)
+                         : "m"  (*pu16));
+}
+
+/**
  * Atomically decrements a 32-bit unsigned value.
  *
@@ -168 +192 @@
 static __inline__ void __atomic_decrement(__volatile__ unsigned *pu)
 {
-    __asm__ __volatile__("lock decl %0"
-                         : "=m" (*pu) 
+    __asm__ __volatile__("lock; decl %0"
+                         : "=m" (*pu)
                          : "m"  (*pu));
+}
+
+/**
+ * Atomically decrements a 32-bit unsigned value.
+ *
+ * @param   pu      Pointer to the value to decrement.
+ */
+static __inline__ void __atomic_decrement_u32(__volatile__ uint32_t *pu32)
+{
+    __asm__ __volatile__("lock; decl %0"
+                         : "=m" (*pu32)
+                         : "m"  (*pu32));
+}
+
+/**
+ * Atomically decrements a 16-bit unsigned value.
+ *
+ * @param   pu16    Pointer to the value to decrement.
+ */
+static __inline__ void __atomic_decrement_u16(uint16_t __volatile__ *pu16)
+{
+    __asm__ __volatile__("lock; decw %0"
+                         : "=m" (*pu16)
+                         : "m"  (*pu16));
 }
 
@@ -192 +240 @@
                          "2:\n\t"
                          "incl  %0\n\t"
-                         "lock  cmpxchgl %0, %1\n\t"
+                         "lock; cmpxchgl %0, %1\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
@@ -228 +276 @@
                          "2:\n\t"
                          "incw  %w0\n\t"
-                         "lock  cmpxchgw %w0, %2\n\t"
+                         "lock; cmpxchgw %w0, %2\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n\t"
@@ -261 +309 @@
                          "2:\n\t"
                          "decl  %0\n\t"
-                         "lock  cmpxchgl %0, %1\n\t"
+                         "lock; cmpxchgl %0, %1\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
@@ -297 +345 @@
                          "2:\n\t"
                          "decw  %%bx\n\t"
-                         "lock  cmpxchgw %w0, %1\n\t"
+                         "lock; cmpxchgw %w0, %1\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
@@ -321 +369 @@
 static inline unsigned __atomic_cmpxchg32(volatile uint32_t *pu32, uint32_t u32New, uint32_t u32Old)
 {
-    __asm__ __volatile__("lock  cmpxchgl %2, %1\n\t"
+    __asm__ __volatile__("lock; cmpxchgl %2, %1\n\t"
                          "setz  %%al\n\t"
                          "movzx %%al, %%eax\n\t"

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

@@ -130 +130 @@
  * System stuff
  */
+/** Get the current millisecond counter value. */
 #define fibGetMsCount()         (__libc_GpFIBGIS->SIS_MsCount)
+/** Get the Unix timestamp (seconds). */
+#define fibGetUnixSeconds()     (__libc_GpFIBGIS->SIS_BigTime)
 
 

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

@@ -34 +34 @@
 #include <sys/time.h>
 #include <sys/wait.h>
+#include <sys/sem.h>
 #include <signal.h>
 #include <emx/io.h>
@@ -890 +891 @@
 /** @} */
 
+
+/** @defgroup grp_Back_sysvipc LIBC Backend - SysV IPC
+ * @{ */
+/**
+ * semctl syscall
+ */
+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);
+
+/** @} */
+
 __END_DECLS
 

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

@@ -4 +4 @@
  * LIBC Shared Process Management.
  *
- *
+ * Copyright (c) 2004-2005 knut st. osmundsen <bird@anduin.net>
+ * Copyright (c) 2004 nickk
  *
  * This file is part of InnoTek LIBC.
@@ -30 +31 @@
 #include <sys/types.h>
 #include <sys/signal.h>
+#include <sys/ipc.h>
 
 
@@ -553 +555 @@
     unsigned long                       hevNotify;
 
-    /*  116 - The rest of the block, up to cbProcess, is undefined in this version.
+    /** 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.
      * Future versions of LIBC may use this area assuming it's initalized with zeros.
      */
@@ -729 +734 @@
 
 /**
+ * Checks if the calling process is a member of the specified group.
+ *
+ * @returns 0 if member.
+ * @returns -EPERM if not member.
+ * @param   gid     The group id in question.
+ */
+int __libc_spmIsGroupMember(gid_t gid);
+
+/**
+ * Check if the caller can access the SysV IPC object as requested.
+ *
+ * @returns 0 if we can.
+ * @returns -EPERM if we cannot.
+ * @param   pPerm       The IPC permission structure.
+ * @param   Mode        The access request. IPC_M, IPC_W or IPC_R.
+ */
+int __libc_spmCanIPC(struct ipc_perm *pPerm, mode_t Mode);
+
+/**
  * Marks the current process (if we have it around) as zombie
  * or dead freeing all resources associated with it.
@@ -841 +865 @@
  *
  * @returns 0 on success.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
+ *
  * @param   pRegRec     Pointer to the exception handler registration record.
+ * @param   ppSPMHdr    Where to store the pointer to the SPM header. Can be NULL.
+ *
  * @remark  Don't even think of calling this if you're not LIBC!
  */
-int __libc_spmLock(__LIBC_PSPMXCPTREGREC pRegRec);
+int __libc_spmLock(__LIBC_PSPMXCPTREGREC pRegRec, __LIBC_PSPMHEADER *ppSPMHdr);
 
 /**
@@ -851 +878 @@
  *
  * @returns 0 on success.
- * @returns -1 on and errno failure.
+ * @returns Negative error code (errno.h) on failure.
+ *
  * @param   pRegRec     Pointer to the exception handler registration record.
+ *
  * @remark  Don't even think of calling this if you're not LIBC!
  */
@@ -859 +888 @@
 /**
  * Allocate memory from the LIBC shared memory.
+ *
+ * The SPM must be locked using __libc_spmLock() prior to calling this function!
  *
  * @returns Pointer to allocated memory on success.
  * @returns NULL on failure.
+ *
  * @param   cbSize      Size of memory to allocate.
+ *
  * @remark  Don't think of calling this if you're not LIBC!
  */
-void * __libc_spmAlloc(size_t cbSize);
-
-/**
- * Free memory allocated by __libc_SpmAlloc().
+void * __libc_spmAllocLocked(size_t cbSize);
+
+/**
+ * Free memory allocated by __libc_spmAllocLocked() or __libc_spmAlloc().
+ *
+ * The SPM must be locked using __libc_spmLock() prior to calling this function!
  *
  * @returns 0 on success.
  * @returns -1 and errno on failure.
+ *
  * @param   pv      Pointer to memory block returned by __libc_SpmAlloc().
  *                  NULL is allowed.
  * @remark  Don't think of calling this if you're not LIBC!
  */
+int __libc_spmFreeLocked(void *pv);
+
+/**
+ * Allocate memory from the LIBC shared memory.
+ *
+ * @returns Pointer to allocated memory on success.
+ * @returns NULL on failure.
+ *
+ * @param   cbSize      Size of memory to allocate.
+ *
+ * @remark  Don't think of calling this if you're not LIBC!
+ */
+void * __libc_spmAlloc(size_t cbSize);
+
+/**
+ * Free memory allocated by __libc_SpmAlloc().
+ *
+ * @returns 0 on success.
+ * @returns -1 and errno on failure.
+ *
+ * @param   pv      Pointer to memory block returned by __libc_SpmAlloc().
+ *                  NULL is allowed.
+ *
+ * @remark  Don't think of calling this if you're not LIBC!
+ */
 int __libc_spmFree(void *pv);
 
-
-/**
- * Register TCPIP termination handler.
+/**
+ * Register termination handler.
  *
  * This is a manual way of by passing a.out's broken weak symbols.
- * @param   pfnTerm     Pointer to the termination function.
- */
-void    __libc_spmSocketRegTerm(void (*pfnTerm)(void));
+ */
+void __libc_spmRegTerm(void (*pfnTerm)(void));
 
 

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

@@ -73 +73 @@
     volatile int    fDone;
 } __LIBC_THREAD_SIGSUSPEND, *__LIBC_PTHREAD_SIGSUSPEND;
+
+
+/**
+ * Signal notification callback function.
+ *
+ * This is a notification which can be used to correct the state of
+ * a system object before any user code is executed.
+ *
+ * The semaphore lock is hold and signals are all on hold, so be very careful with waitin
+ * on other semphores and stuff like that. Crashing is totally forbidden. :-)
+ *
+ * @param   iSignalNo       The signal number.
+ * @param   pvUser          The user argument.
+ */
+typedef void __LIBC_FNSIGCALLBACK(int iSignalNo, void *pvUser);
+/** Pointer to a signal callback function. */
+typedef __LIBC_FNSIGCALLBACK *__LIBC_PFNSIGCALLBACK;
 
 
@@ -174 +191 @@
      * when ever a thread enters for processing a signal asynchronously. */
     volatile unsigned long      ulSigLastTS;
-
+    /** Callback on signal/exception. */
+    __LIBC_PFNSIGCALLBACK       pfnSigCallback;
+    /** User argument to signal/exception callback. */
+    void                       *pvSigCallbackUser;
 
     /** Thread status, chiefly used for the u member of the thread structure. */

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

@@ -126 +126 @@
 #define IXSEQ_TO_IPCID(ix,perm) (((perm.seq) << 16) | (ix & 0xffff))
 
+#ifdef __EMX__
+int     __libc_back_ipcperm(struct ipc_perm *, int);
+#else /* !__EMX__ */
 struct thread;
 struct proc;
@@ -133 +136 @@
 extern void (*shmfork_hook)(struct proc *, struct proc *);
 extern void (*shmexit_hook)(struct vmspace *);
+#endif /* !__EMX__ */
 
 #else /* ! _KERNEL */

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

@@ -10 +10 @@
 /** @file
  * FreeBSD 5.3
+ * @changed     bird: no padding in semid_ds. seminfo and semexit are static in our 'kernel'.
  */
 
@@ -24 +25 @@
         unsigned short  sem_nsems;      /* number of sems in set */
         time_t          sem_otime;      /* last operation time */
+#ifndef __EMX__ /* space is precious */
         long            sem_pad1;       /* SVABI/386 says I need this here */
+#endif
         time_t          sem_ctime;      /* last change time */
                                         /* Times measured in secs since */
                                         /* 00:00:00 GMT, Jan. 1, 1970 */
+#ifndef __EMX__ /* space is precious */
         long            sem_pad2;       /* SVABI/386 says I need this here */
         long            sem_pad3[4];    /* SVABI/386 says I need this here */
+#endif
 };
 
@@ -87 +92 @@
                 semaem;         /* adjust on exit max value */
 };
+#ifndef __EMX__
 extern struct seminfo   seminfo;
+#endif
 
 /* internal "mode" bits */
@@ -93 +100 @@
 #define SEM_DEST        02000   /* semaphore will be destroyed on last detach */
 
+#ifndef __EMX__
 /*
  * Process sem_undo vectors at proc exit.
  */
 void    semexit(struct proc *p);
+#endif /* !__EMX__ */
 #endif /* _KERNEL */
 
@@ -114 +123 @@
 
 __BEGIN_DECLS
+#ifndef __EMX__
 int semsys(int, ...);
+#endif
 int semctl(int, int, int, ...);
 int semget(key_t, int, int);