Changeset 1617 for trunk/src/emx/include

Timestamp:

Nov 7, 2004, 10:33:03 AM (21 years ago)

Author:

bird

Message:

Debugging signals.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (2 diffs, 1 prop)
• InnoTekLIBC/logstrict.h (modified) (2 diffs, 1 prop)
• InnoTekLIBC/sharedpm.h (modified) (3 diffs, 1 prop)
• InnoTekLIBC/signals.h (deleted)
• sys/_sigset.h (modified) (3 diffs, 1 prop)
• sys/cdefs.h (modified) (21 diffs, 1 prop)
• sys/signal.h (modified) (6 diffs, 1 prop)

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

@@ -30 +30 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
+#include <signal.h>
 #include <emx/io.h>
+
 
 __BEGIN_DECLS
@@ -446 +448 @@
 
 
+/** @defgroup   __libc_Back_signal      LIBC Backend - Signals
+ * @{
+ */
+
+/** @defgroup __libc_Back_signalRaise_return    __libc_back_signalRaise() returns.
+ * These are only valid for positive return values.
+ * @{ */
+/** Try restart any interrupted system call. */
+#define __LIBC_BSRR_RESTART     0x01
+/** Go ahead interrupt system call in progress. */
+#define __LIBC_BSRR_INTERRUPT   0x02
+/** If set execution should be resumed. */
+#define __LIBC_BSRR_CONTINUE    0x10
+/** If set execution should not be resumed but the signal should be passed
+ * on to the system. */
+#define __LIBC_BSRR_PASSITON    0x20
+/** If set the passed in SIGQUEUED structure was used. */
+#define __LIBC_BSRR_USED_QUEUED 0x40
+/** @} */
+
+/** @defgroup __libc_back_signalRaise_flags     __libc_back_signalRaise() flags.
+ * @{ */
+/** The signal is thread specific and must be delivered to the current thread. */
+#define __LIBC_BSRF_THREAD      0x01
+/** The signal was send from an unknown process. */
+#define __LIBC_BSRF_EXTERNAL    0x02
+/** The signal was generated by the hardware (i.e. CPUs and such). */
+#define __LIBC_BSRF_HARDWARE    0x04
+/** The signal should be queued. */
+#define __LIBC_BSRF_QUEUED      0x08
+/** @} */
+
+
+/**
+ * Raises a signal in the current process.
+ *
+ * @returns On success a flag mask out of the __LIBC_BSRR_* #defines is returned.
+ * @returns On failure a negative error code (errno.h) is returned.
+ * @param   iSignalNo           Signal to raise.
+ * @param   pSigInfo            Pointer to signal info for this signal.
+ *                              NULL is allowed.
+ * @param   pvXcptOrQueued      Exception handler parameter list.
+ *                              Or if __LIBC_BSRF_QUEUED is set, a pointer to locally malloced
+ *                              SIGQUEUED node.
+ * @param   fFlags              Flags of the #defines __LIBC_BSRF_* describing how to
+ *                              deliver the signal.
+ *
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int __libc_Back_signalRaise(int iSignalNo, siginfo_t *pSigInfo, void *pvXcptOrQueued, unsigned fFlags);
+
+/**
+ * Worker called after __libc_Back_signalRaise() was called with a
+ * preallocated signal queue entry. This function will make sure
+ * we're not ending up with too many heap allocated packets in the
+ * free list.
+ */
+void __libc_Back_signalFreeWorker(void);
+
+/**
+ * Send a signal to a process.
+ *
+ * @returns 0 on if signal sent.
+ * @returns -errno on failure.
+ *
+ * @param   pid         Process Id of the process which the signal is to be sent to.
+ * @param   iSignalNo   The signal to send.
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int __libc_Back_signalSendPid(pid_t pid, int iSignalNo);
+
+/**
+ * Verify the existance of another process and that the current process
+ * is allowed to signal it.
+ *
+ * @return 0 on success.
+ * @return -ESRCH if pid doesn't exist.
+ * @return -EPERM if we aren't allowed to signal the pid.
+ * @param   pid     Process Id for the process which we wanna signal.
+ * @todo    Do EPERM check, no ideas here yet.
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int __libc_Back_signalVerifyPid(pid_t pid);
+
+/**
+ * Not implemented.
+ *
+ * @returns -ENOSYS.
+ * @param   pgrp        Process group (positive).
+ *                      0 means the process group of this process.
+ *                      1 means all process in the system.
+ * @param   iSignalNo   Signal to send to all the processes in the group.
+ */
+int __libc_Back_signalSendPGrp(pid_t pgrp, int iSignalNo);
+
+/**
+ * Verify the existance of a process group and that the current process
+ * is allowed to signal it.
+ *
+ * @return 0 on success.
+ * @return -ESRCH if pgid doesn't exist.
+ * @return -EPERM if we aren't allowed to signal the pgid.
+ * @param   pgid    Process group id which the current process intend to signal.
+ * @todo    Do EPERM check, no ideas here yet.
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int __libc_Back_signalVerifyPGrp(pid_t pgid);
+
+/**
+ * sigaction worker; queries and/or sets the action for a signal.
+ *
+ * @returns 0 on success.
+ * @returns -Negative errno on failure.
+ * @param   iSignalNo   Signal number.
+ * @param   pSigAct     Pointer to new signal action.
+ *                      If NULL no update is done.
+ * @param   pSigActOld  Where to store the old signal action.
+ *                      If NULL nothing is attempted stored.
+ */
+int __libc_Back_signalAction(int iSignalNo, const struct sigaction *pSigAct, struct sigaction *pSigActOld);
+
+/**
+ * Changes and/or queries the alternative signal stack settings of a thread.
+ *
+ * @returns 0 on success.
+ * @returns Negative error number (errno.h) on failure.
+ * @param   pThrd       Thread which signal stack to change and/or query.
+ * @param   pStack      New stack settings. (Optional)
+ * @param   pOldStack   Old stack settings. (Optional)
+ */
+int __libc_Back_signalStack(__LIBC_PTHREAD pThrd, const stack_t *pStack, stack_t *pOldStack);
+
+/**
+ * Block or unblock signal deliveries of a thread.
+ *
+ * @returns 0 on success.
+ * @returns -1 and errno set to EINVAL on failure.
+ * @param   pThrd       Thread to apply this to.
+ * @param   iHow        Describes the action taken if pSigSetNew not NULL. Recognized
+ *                      values are SIG_BLOCK, SIG_UNBLOCK or SIG_SETMASK.
+ *
+ *                      SIG_BLOCK means to or the sigset pointed to by pSigSetNew with
+ *                          the signal mask for the current thread.
+ *                      SIG_UNBLOCK means to and the 0 complement of the sigset pointed
+ *                          to by pSigSetNew with the signal mask of the current thread.
+ *                      SIG_SETMASK means to set the signal mask of the current thread
+ *                          to the sigset pointed to by pSigSetNew.
+ *
+ * @param   pSigSetNew  Pointer to signal set which will be applied to the current
+ *                      threads signal mask according to iHow. If NULL no change
+ *                      will be made the the current threads signal mask.
+ * @param   pSigSetOld  Where to store the current threads signal mask prior to applying
+ *                      pSigSetNew to it. This parameter can be NULL.
+ */
+int __libc_Back_signalMask(__LIBC_PTHREAD pThrd, int iHow, const sigset_t * __restrict pSigSetNew, sigset_t * __restrict pSigSetOld);
+
+/** @} */
+
 __END_DECLS
 

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

@@ -177 +177 @@
 /** Mutex Semaphores. */
 #define __LIBC_LOG_GRP_MUTEX        13
-/** Signal APIs and events. */
+/** Signal APIs and Events. */
 #define __LIBC_LOG_GRP_SIGNAL       14
 /** Environment APIs. */
@@ -184 +184 @@
 #define __LIBC_LOG_GRP_MMAN         16
 
+/** Backend Signal APIs and Events. */
+#define __LIBC_LOG_GRP_BACK_SIGNAL  20
 /** Backend Memory Mananger APIs. */
 #define __LIBC_LOG_GRP_BACK_MMAN    21

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

@@ -279 +279 @@
     /** Creation timestamp. */
     unsigned                    uTimestamp;
-    /** Incoming signal queue.
-     * This is a LIFO for speed and size. The receiving process will
-     * process them in the correct order of course.
+    /** Incoming signal queue (FIFO).
      * For signals which aren't queable only one signal can be queued.
      */
@@ -289 +287 @@
      */
     volatile unsigned           cSigsSent;
+    /** Indicates that the process is a full featured LIBC process.
+     * Untill this flag is set (atomically) it's not a good idea to
+     * queue signals on the process since it won't have a signal handler
+     * installed, and thus won't get to know about them.
+     */
+    volatile unsigned           fExeInited;
 
     /** Reserved pool pointer field with default value 0. */
@@ -649 +653 @@
 
 /**
+ * Marks the process as a full LIBC process.
+ *
+ * Up to this point it was just a process which LIBC happend to be loaded into.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pSignal     Signal to queue.
+ * @param   pid         Pid to queue it on.
+ * @param   fQueued     Set if the signal type is queued.
+ */
+void    __libc_spmExeInited(void);
+
+/**
  * Queues a signal on another process.
  *

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

@@ -35 +35 @@
  * @{
  */
+#define __SIGSET_CLONGS     2           /** Space for 64 signals. */
 #if __BSD_VISIBLE
-#define __SIGSET_CLONGS     2           /** Space for 64 signals. */
 #define __SIGSET_MAXSIGNALS 64          /** Maximum signals. */
 /** Check if the signal is valid. */
@@ -70 +70 @@
         (result)->__bitmap[1] = (set1)->__bitmap[1] | (set2)->__bitmap[1]; \
     } while (0)
-#endif
 /** @} */
+#endif /* BSD_VISIBLE */
 
 /**
@@ -83 +83 @@
 
 #endif
+

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

@@ -14 +14 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
@@ -35 +31 @@
  *
  *      @(#)cdefs.h     8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.69 2003/04/18 18:59:34 bde Exp $
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.81 2004/04/07 04:19:49 imp Exp $
  */
 
 /** @file
- * FreeBSD 5.1
+ * FreeBSD 5.2
  *
  * @changed bird: Toolkit compatibility (_CDEFS_H_ and __TCPROTO()).
@@ -58 +54 @@
 #define __BEGIN_DECLS
 #define __END_DECLS
+#endif
+
+/*
+ * Macro to test if we're using a specific version of gcc or later.
+ */
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#define __GNUC_PREREQ__(ma, mi) \
+        (__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi))
+#else
+#define __GNUC_PREREQ__(ma, mi) 0
 #endif
 
@@ -85 +91 @@
 #define __inline        inline          /* convert to C++ keyword */
 #else
-#ifndef __GNUC__
+#if !(defined(__GNUC__) || defined(__INTEL_COMPILER))
 #define __inline                        /* delete GCC keyword */
-#endif /* !__GNUC__ */
+#endif /* !(__GNUC__ || __INTEL_COMPILER) */
 #endif /* !__cplusplus */
 
@@ -95 +101 @@
 #define __STRING(x)     "x"
 
-#ifndef __GNUC__
+#if !(defined(__GNUC__) || defined(__INTEL_COMPILER))
 #define __const                         /* delete pseudo-ANSI C keywords */
 #define __inline
@@ -114 +120 @@
 #define volatile
 #endif  /* !NO_ANSI_KEYWORDS */
-#endif  /* !__GNUC__ */
+#endif  /* !(__GNUC__ || __INTEL_COMPILER) */
 #endif  /* !(__STDC__ || __cplusplus) */
 
@@ -134 +140 @@
 #define __section(x)
 #else
-#if __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 5
+#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
 #define __dead2
 #define __pure2
 #define __unused
 #endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
+#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 && !defined(__INTEL_COMPILER)
 #define __dead2         __attribute__((__noreturn__))
 #define __pure2         __attribute__((__const__))
@@ -145 +151 @@
 /* XXX Find out what to do for __packed, __aligned and __section */
 #endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ == 3
+#if __GNUC_PREREQ__(2, 7)
 #define __dead2         __attribute__((__noreturn__))
 #define __pure2         __attribute__((__const__))
@@ -153 +159 @@
 #define __section(x)    __attribute__((__section__(x)))
 #endif
+#if defined(__INTEL_COMPILER)
+#define __dead2         __attribute__((__noreturn__))
+#define __pure2         __attribute__((__const__))
+#define __unused        __attribute__((__unused__))
+#define __packed        __attribute__((__packed__))
+#define __aligned(x)    __attribute__((__aligned__(x)))
+#define __section(x)    __attribute__((__section__(x)))
+#endif
+#endif
+
+#if __GNUC_PREREQ__(3, 1) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
+#define __always_inline __attribute__((__always_inline__))
+#else
+#define __always_inline
+#endif
+
+#if __GNUC_PREREQ__(3, 3)
+#define __nonnull(x)    __attribute__((__nonnull__(x)))
+#else
+#define __nonnull(x)
 #endif
 
 /* XXX: should use `#if __STDC_VERSION__ < 199901'. */
-#if !(__GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3)
+#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
 #define __func__        NULL
 #endif
 
-#if __GNUC__ >= 2 && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
+#if (defined(__INTEL_COMPILER) || (defined(__GNUC__) && __GNUC__ >= 2)) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
 #define __LONG_LONG_SUPPORTED
 #endif
@@ -171 +197 @@
  */
 #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 /* bird: check if not defined. (-pedantic) */
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901
 #define __restrict
 #else
 #define __restrict      restrict
 #endif
+#endif
+
+/*
+ * GNU C version 2.96 adds explicit branch prediction so that
+ * the CPU back-end can hint the processor and also so that
+ * code blocks can be reordered such that the predicted path
+ * sees a more linear flow, thus improving cache behavior, etc.
+ *
+ * The following two macros provide us with a way to utilize this
+ * compiler feature.  Use __predict_true() if you expect the expression
+ * to evaluate to true, and __predict_false() if you expect the
+ * expression to evaluate to false.
+ *
+ * A few notes about usage:
+ *
+ *      * Generally, __predict_false() error condition checks (unless
+ *        you have some _strong_ reason to do otherwise, in which case
+ *        document it), and/or __predict_true() `no-error' condition
+ *        checks, assuming you want to optimize for the no-error case.
+ *
+ *      * Other than that, if you don't know the likelihood of a test
+ *        succeeding from empirical or other `hard' evidence, don't
+ *        make predictions.
+ *
+ *      * These are meant to be used in places that are run `a lot'.
+ *        It is wasteful to make predictions in code that is run
+ *        seldomly (e.g. at subsystem initialization time) as the
+ *        basic block reordering that this affects can often generate
+ *        larger code.
+ */
+#if __GNUC_PREREQ__(2, 96)
+#define __predict_true(exp)     __builtin_expect((exp), 1)
+#define __predict_false(exp)    __builtin_expect((exp), 0)
+#else
+#define __predict_true(exp)     (exp)
+#define __predict_false(exp)    (exp)
 #endif
 
@@ -190 +252 @@
  * didn't permit keeping the keywords out of the application namespace).
  */
-#if __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 7
+#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
 #define __printflike(fmtarg, firstvararg)
 #define __scanflike(fmtarg, firstvararg)
@@ -201 +263 @@
 
 /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
-#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 /* bird: check if defined to avoid -Wundef messages */
+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && defined(__GNUC__) && !defined(__INTEL_COMPILER) /* bird: check if defined to avoid -Wundef messages */
 #define __printf0like(fmtarg, firstvararg) \
             __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
@@ -208 +270 @@
 #endif
 
-#if 0 /* def __GNUC__ - bird: ELF specific, so skip everything */
+#if 0 /* defined(__GNUC__) || defined(__INTEL_COMPILER) - bird: ELF specific, so skip everything */
+#ifndef __INTEL_COMPILER
 #define __strong_reference(sym,aliassym)        \
         extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
+#endif
 #ifdef __STDC__
 #define __weak_reference(sym,alias)     \
@@ -228 +292 @@
         __asm__(".previous")
 #endif  /* __STDC__ */
-#endif  /* __GNUC__ */
-
-#if 0 /*def __GNUC__ - ELF specific. */
+#endif  /* __GNUC__ || __INTEL_COMPILER */
+
+#if 0 /* defined(__GNUC__) || defined(__INTEL_COMPILER) - ELF specific. */
 #define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"")
 #else
 /*
- * This doesn't work in header files. But it may be better than nothing.
- * The alternative is: #define __IDSTRING(name,string)  [nothing]
+ * The following definition might not work well if used in header files,
+ * but it should be better than nothing.  If you want a "do nothing"
+ * version, then it should generate some harmless declaration, such as:
+ *    #define __IDSTRING(name,string)   struct __hack
  */
 #define __IDSTRING(name,string) static const char name[] __unused = string
@@ -244 +310 @@
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *      __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.69 2003/04/18 18:59:34 bde Exp $");
+ *      __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.81 2004/04/07 04:19:49 imp Exp $");
  */
 #ifndef __FBSDID
@@ -258 +324 @@
 #define __RCSID(s)      __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
 #else
-#define __RCSID(s)
+#define __RCSID(s)      struct __hack
 #endif
 #endif
@@ -266 +332 @@
 #define __RCSID_SOURCE(s)       __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
 #else
-#define __RCSID_SOURCE(s)
+#define __RCSID_SOURCE(s)       struct __hack
 #endif
 #endif
@@ -274 +340 @@
 #define __SCCSID(s)     __IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
 #else
-#define __SCCSID(s)
+#define __SCCSID(s)     struct __hack
 #endif
 #endif
@@ -282 +348 @@
 #define __COPYRIGHT(s)  __IDSTRING(__CONCAT(__copyright_,__LINE__),s)
 #else
-#define __COPYRIGHT(s)
+#define __COPYRIGHT(s)  struct __hack
 #endif
 #endif
@@ -321 +387 @@
 
 /* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1 /* bird: check if defined to avoid -Wundef message. */
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1
 #undef _POSIX_C_SOURCE          /* Probably illegal, but beyond caring now. */
 #define _POSIX_C_SOURCE         199009
@@ -327 +393 @@
 
 /* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2 /* bird: check if defined to avoid -Wundef message. */
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE         199209

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

@@ -52 +52 @@
 #endif
 #define SIGILL    4     /** ANSI: Illegal instruction */
-#if __XSI_VISIBLE
+#if __XSI_VISIBLE  || __POSIX_VISIBLE >= 200112
 #define SIGTRAP   5     /** POSIX: Single step (debugging) */
 #endif
@@ -68 +68 @@
 #endif
 #define SIGSEGV  11     /** ANSI: Segmentation fault */
-#if __BSD_VISIBLE
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
 #define SIGSYS   12     /** Invalid argument to system call */
 #endif
@@ -92 +92 @@
 #endif
 #if __XSI_VISIBLE
+#define SIGPOLL  23     /** ??: Input/output possible signal. (Same as SIGIO.) */
+#endif
+#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
 #define SIGXCPU  24     /** BSD 4.2: Exceeded CPU time limit. */
 #define SIGXFSZ  25     /** BSD 4.2: Exceeded file size limit. */
+#endif
+#if __XSI_VISIBLE
 #define SIGVTALRM 26    /** BSD 4.2: Virtual time alarm. */
+#endif
+#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
 #define SIGPROF  27     /** BSD 4.2: Profiling time alarm. */
 #endif
@@ -188 +195 @@
  * @{
  */
-/** Deliver signal on alternate stack. */
+/** Current on alternative stack. */
 #define SS_ONSTACK          0x00000001
 /** Do not take signal on alternate stack. */
@@ -422 +429 @@
 /** If set the signal was queue. */
 #define __LIBC_SI_QUEUED        0x00000001
+/** Internal signal generated by LIBC. */
+#define __LIBC_SI_INTERNAL      0x00000002
 /** @} */
 #endif
@@ -452 +461 @@
 };
 #define sa_handler      __sigaction_u.__sa_handler
+#define sa_sigaction    __sigaction_u.__sa_sigaction
 #endif