xnu-4903.231.4.tar.gz

[apple/xnu.git] / osfmk / kern / ipc_mig.h

diff --git a/osfmk/kern/ipc_mig.h b/osfmk/kern/ipc_mig.h
index 3ddfc945d5f15198ba7e46aa8cb333c5a680cd9c..cf1af4da48ff83e76ebabb0a62da2269b4026ac7 100644 (file)
--- a/osfmk/kern/ipc_mig.h
+++ b/osfmk/kern/ipc_mig.h
@@ -50,7 +50,8 @@
 #ifdef _MIG_TRACE_PARAMETERS_
 
 #define __BeforeRcvCallTrace(msgid,arg1,arg2,arg3,arg4)                                      \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_START,                   \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                             KDBG_MIGCODE(msgid) | DBG_FUNC_START,   \
                              (unsigned int)(arg1),                                   \
                              (unsigned int)(arg2),                                   \
                              (unsigned int)(arg3),                                   \
@@ -58,7 +59,8 @@
                              (unsigned int)(0));
 
 #define __AfterRcvCallTrace(msgid,arg1,arg2,arg3,arg4)                               \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_END,                     \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                             KDBG_MIGCODE(msgid) | DBG_FUNC_END,     \
                              (unsigned int)(arg1),                                   \
                              (unsigned int)(arg2),                                   \
                              (unsigned int)(arg3),                                   \
@@ -66,7 +68,8 @@
                              (unsigned int)(0));
 
 #define __BeforeSimpleCallTrace(msgid,arg1,arg2,arg3,arg4)                           \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_START,                   \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                             KDBG_MIGCODE(msgid) | DBG_FUNC_START,   \
                              (unsigned int)(arg1),                                   \
                              (unsigned int)(arg2),                                   \
                              (unsigned int)(arg3),                                   \
@@ -74,7 +77,8 @@
                              (unsigned int)(0));
 
 #define __AfterSimpleCallTrace(msgid,arg1,arg2,arg3,arg4)                            \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_END,                     \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                     KDBG_MIGCODE(msgid) | DBG_FUNC_END,     \
                              (unsigned int)(arg1),                                   \
                              (unsigned int)(arg2),                                   \
                              (unsigned int)(arg3),                                   \
@@ -84,7 +88,8 @@
 #else /* !_MIG_TRACE_PARAMETERS_ */
 
 #define        __BeforeRcvRpc(msgid, _NAME_)                                                 \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_START,                   \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                             KDBG_MIGCODE(msgid) | DBG_FUNC_START,   \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
@@ -92,7 +97,8 @@
                              (unsigned int)(0));
 
 #define        __AfterRcvRpc(msgid, _NAME_)                                                  \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_END,                     \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                     KDBG_MIGCODE(msgid) | DBG_FUNC_END,     \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
@@ -101,7 +107,8 @@
 
 
 #define        __BeforeRcvSimple(msgid, _NAME_)                                              \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_START,                   \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                             KDBG_MIGCODE(msgid) | DBG_FUNC_START,   \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
@@ -109,7 +116,8 @@
                              (unsigned int)(0));
 
 #define        __AfterRcvSimple(msgid, _NAME_)                                               \
-       KERNEL_DEBUG_CONSTANT(KDBG_MIGCODE(msgid) | DBG_FUNC_END,                     \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                             KDBG_MIGCODE(msgid) | DBG_FUNC_END,     \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
@@ -119,7 +127,8 @@
 #endif /* !_MIG_TRACE_PARAMETERS_ */
 
 #define _MIG_MSGID_INVALID(msgid)                                                    \
-       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_MSGID_INVALID, (msgid)),          \
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,          \
+                             MACHDBG_CODE(DBG_MACH_MSGID_INVALID, (msgid)),  \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
                              (unsigned int)(0),                                      \
@@ -131,16 +140,35 @@
 __BEGIN_DECLS
 
 /* Send a message from the kernel */
-extern mach_msg_return_t mach_msg_send_from_kernel(
+
+extern mach_msg_return_t mach_msg_send_from_kernel_proper(
        mach_msg_header_t       *msg,
        mach_msg_size_t         send_size);
 
+#define mach_msg_send_from_kernel mach_msg_send_from_kernel_proper
 
-extern mach_msg_return_t mach_msg_rpc_from_kernel(
+extern mach_msg_return_t
+mach_msg_rpc_from_kernel_proper(
        mach_msg_header_t       *msg,
        mach_msg_size_t         send_size,
        mach_msg_size_t         rcv_size);
 
+#define mach_msg_rpc_from_kernel mach_msg_rpc_from_kernel_proper
+
+extern void
+mach_msg_destroy_from_kernel_proper(
+       mach_msg_header_t       *msg);
+
+#define mach_msg_destroy_from_kernel mach_msg_destroy_from_kernel_proper
+
+#ifdef XNU_KERNEL_PRIVATE
+extern mach_msg_return_t mach_msg_send_from_kernel_with_options_legacy(
+       mach_msg_header_t       *msg,
+       mach_msg_size_t         send_size,
+       mach_msg_option_t       option,
+       mach_msg_timeout_t      timeout_val);
+#endif /* XNU_KERNEL_PRIVATE */
+
 extern mach_msg_return_t mach_msg_send_from_kernel_with_options(
        mach_msg_header_t       *msg,
        mach_msg_size_t         send_size,
@@ -154,7 +182,7 @@ __END_DECLS
 extern void mach_msg_receive_continue(void);
 
 /* Initialize kernel server dispatch table */
-extern void            mig_init(void) __attribute__((section("__TEXT, initcode")));
+extern void            mig_init(void);
 
 /*
  * Kernel implementation of the MIG object base class