xnu-3248.60.10.tar.gz

[apple/xnu.git] / bsd / sys / signalvar.h

diff --git a/bsd/sys/signalvar.h b/bsd/sys/signalvar.h
index 94e2e1d56c5089e06c957f64572420a28c700579..6d8488807f6c75a8d2858d99b5488c4203cee1fe 100644 (file)
--- a/bsd/sys/signalvar.h
+++ b/bsd/sys/signalvar.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*


@@ -82,7 +87,7 @@ struct        sigacts {
        sigset_t ps_siginfo;            /* signals that want SA_SIGINFO args */
        sigset_t ps_oldmask;            /* saved mask from before sigpause */
        int     ps_flags;               /* signal flags, below */
        sigset_t ps_siginfo;            /* signals that want SA_SIGINFO args */
        sigset_t ps_oldmask;            /* saved mask from before sigpause */
        int     ps_flags;               /* signal flags, below */

-       struct user_sigaltstack ps_sigstk;      /* sp, length & flags */
+       struct kern_sigaltstack ps_sigstk;      /* sp, length & flags */

        int     ps_sig;                 /* for core dump/debugger XXX */
        int     ps_code;                /* for core dump/debugger XXX */
        int     ps_addr;                /* for core dump/debugger XXX */
        int     ps_sig;                 /* for core dump/debugger XXX */
        int     ps_code;                /* for core dump/debugger XXX */
        int     ps_addr;                /* for core dump/debugger XXX */


@@ -99,18 +104,9 @@ struct      sigacts {
  * values should be non-intersecting with values defined in signal.h, e.g.:
  * SIG_IGN, SIG_DFL, SIG_ERR, SIG_IGN.
  */
  * values should be non-intersecting with values defined in signal.h, e.g.:
  * SIG_IGN, SIG_DFL, SIG_ERR, SIG_IGN.
  */

-#define        KERN_SIG_CATCH  (void (*)(int))2
-#define        KERN_SIG_HOLD   (void (*)(int))3
-#define        KERN_SIG_WAIT   (void (*)(int))4
-
-#define pgsigio(pgid, sig, notused) \
-       { \
-       struct proc *p; \
-       if (pgid < 0) \
-               gsignal(-(pgid), sig);\
-       else if (pgid > 0 && (p = pfind(pgid)) != 0) \
-               psignal(p, sig); \
-}
+#define        KERN_SIG_CATCH  CAST_USER_ADDR_T(2)
+#define        KERN_SIG_HOLD   CAST_USER_ADDR_T(3)
+#define        KERN_SIG_WAIT   CAST_USER_ADDR_T(4)

 
 /*
  * get signal action for process and signal; currently only for current process
 
 /*
  * get signal action for process and signal; currently only for current process


@@ -123,7 +119,7 @@ struct      sigacts {
 #define SHOULDissignal(p,uthreadp) \
         (((uthreadp)->uu_siglist)      \
          & ~((((uthreadp)->uu_sigmask) \
 #define SHOULDissignal(p,uthreadp) \
         (((uthreadp)->uu_siglist)      \
          & ~((((uthreadp)->uu_sigmask) \

-              | (((p)->p_flag & P_TRACED) ? 0 : (p)->p_sigignore)) \
+              | (((p)->p_lflag & P_LTRACED) ? 0 : (p)->p_sigignore)) \

              & ~sigcantmask))
 
 /*
              & ~sigcantmask))
 
 /*


@@ -192,47 +188,63 @@ int sigprop[NSIG + 1] = {
 
 #define        sigcantmask     (sigmask(SIGKILL) | sigmask(SIGSTOP))
 
 
 #define        sigcantmask     (sigmask(SIGKILL) | sigmask(SIGSTOP))
 

+#define SIGRESTRICTMASK (sigmask(SIGILL) | sigmask(SIGTRAP) | sigmask(SIGABRT) | \
+                         sigmask(SIGFPE) | sigmask(SIGBUS)  | sigmask(SIGSEGV) | \
+                         sigmask(SIGSYS))
+
+extern unsigned sigrestrict_arg;
+

 /*
  * Machine-independent functions:
  */
 /*
  * Machine-independent functions:
  */

-int    signal_lock(struct proc *);
-int    signal_unlock(struct proc *);
-int    coredump(struct proc *p);
+

 void   execsigs(struct proc *p, thread_t thread);
 void   gsignal(int pgid, int sig);
 void   execsigs(struct proc *p, thread_t thread);
 void   gsignal(int pgid, int sig);

-int    issignal(struct proc *p);
+int    issignal_locked(struct proc *p);

 int    CURSIG(struct proc *p);
 int    CURSIG(struct proc *p);

-int clear_procsiglist(struct proc *p, int bit);
-int clear_procsigmask(struct proc *p, int bit);
+int clear_procsiglist(struct proc *p, int bit, int in_signalstart);

 int set_procsigmask(struct proc *p, int bit);
 int set_procsigmask(struct proc *p, int bit);

-void   tty_pgsignal(struct pgrp *pgrp, int sig);
-void   postsig(int sig);
+void   postsig_locked(int sig);

 void   siginit(struct proc *p);
 void   trapsignal(struct proc *p, int sig, unsigned code);
 void   pt_setrunnable(struct proc *p);
 void   siginit(struct proc *p);
 void   trapsignal(struct proc *p, int sig, unsigned code);
 void   pt_setrunnable(struct proc *p);

+int    hassigprop(int sig, int prop);
+int setsigvec(proc_t, thread_t, int signum, struct __kern_sigaction *, boolean_t in_sigstart);

 
 /*
  * Machine-dependent functions:
  */
 void   sendsig(struct proc *, /*sig_t*/ user_addr_t  action, int sig,
 
 /*
  * Machine-dependent functions:
  */
 void   sendsig(struct proc *, /*sig_t*/ user_addr_t  action, int sig,

-       int returnmask, u_long code);
+       int returnmask, uint32_t code);

 
 void   psignal(struct proc *p, int sig);
 
 void   psignal(struct proc *p, int sig);

+void   psignal_locked(struct proc *, int);

 void   pgsignal(struct pgrp *pgrp, int sig, int checkctty);
 void   pgsignal(struct pgrp *pgrp, int sig, int checkctty);

-void   threadsignal(thread_t sig_actthread, int signum, u_long code);
+void   tty_pgsignal(struct tty * tp, int sig, int checkctty);
+void   threadsignal(thread_t sig_actthread, int signum, 
+               mach_exception_code_t code);

 int    thread_issignal(proc_t p, thread_t th, sigset_t mask);
 int    thread_issignal(proc_t p, thread_t th, sigset_t mask);

-void   psignal_vfork(struct proc *p, task_t new_task, thread_t thr_act,
+void   psignal_vfork(struct proc *p, task_t new_task, thread_t thread,

                int signum);
                int signum);

-void   psignal_vtalarm(struct proc *);
-void   psignal_xcpu(struct proc *);
-void   psignal_sigprof(struct proc *);
-void   psignal_lock(struct proc *, int, int);

 void   signal_setast(thread_t sig_actthread);
 void   signal_setast(thread_t sig_actthread);

+void   pgsigio(pid_t pgid, int signalnum);

 
 

-/* XXX not really very "inline"... */
-__inline__ void sig_lock_to_exit(struct proc *p);
-__inline__ int sig_try_locked(struct proc *p);
+void sig_lock_to_exit(struct proc *p);
+int sig_try_locked(struct proc *p);

 
 #endif /* BSD_KERNEL_PRIVATE */
 
 
 #endif /* BSD_KERNEL_PRIVATE */
 

+
+#ifdef XNU_KERNEL_PRIVATE
+
+/* Functions exported to Mach as well */
+
+#define COREDUMP_IGNORE_ULIMIT  0x0001 /* Ignore the process's core file ulimit. */
+#define COREDUMP_FULLFSYNC      0x0002 /* Run F_FULLFSYNC on the core file's vnode */
+
+int    coredump(struct proc *p, uint32_t reserve_mb, int coredump_flags);
+
+#endif  /* XNU_KERNEL_PRIVATE */
+
+

 #endif /* !_SYS_SIGNALVAR_H_ */
 #endif /* !_SYS_SIGNALVAR_H_ */