xnu-2782.10.72.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_pset.h

diff --git a/osfmk/ipc/ipc_pset.h b/osfmk/ipc/ipc_pset.h
index de3b628a045396b627f4a5543fe7e53a48f26ac5..5dd8af59352531915f46d43043e84127d1bfac32 100644 (file)
--- a/osfmk/ipc/ipc_pset.h
+++ b/osfmk/ipc/ipc_pset.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 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
- * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -69,8 +74,6 @@
 #include <ipc/ipc_object.h>
 #include <ipc/ipc_mqueue.h>
 
-#include <mach_kdb.h>
-
 struct ipc_pset {
 
        /*
@@ -81,14 +84,13 @@ struct ipc_pset {
 };
 
 #define        ips_references          ips_object.io_references
-#define ips_local_name         ips_object.io_receiver_name
+#define ips_local_name         ips_messages.imq_local_name
 
 
 #define        ips_active(pset)        io_active(&(pset)->ips_object)
 #define        ips_lock(pset)          io_lock(&(pset)->ips_object)
 #define        ips_lock_try(pset)      io_lock_try(&(pset)->ips_object)
 #define        ips_unlock(pset)        io_unlock(&(pset)->ips_object)
-#define        ips_check_unlock(pset)  io_check_unlock(&(pset)->ips_object)
 #define        ips_reference(pset)     io_reference(&(pset)->ips_object)
 #define        ips_release(pset)       io_release(&(pset)->ips_object)
 
@@ -107,7 +109,8 @@ extern kern_return_t ipc_pset_alloc_name(
 /* Add a port to a port set */
 extern kern_return_t ipc_pset_add(
        ipc_pset_t      pset,
-       ipc_port_t      port);
+       ipc_port_t      port,
+       wait_queue_link_t wql);
 
 /* determine if port is a member of set */
 extern boolean_t ipc_pset_member(
@@ -117,25 +120,16 @@ extern boolean_t ipc_pset_member(
 /* Remove a port from a port set */
 extern kern_return_t ipc_pset_remove(
        ipc_pset_t      pset,
-       ipc_port_t      port);
+       ipc_port_t      port,
+       wait_queue_link_t *wqlp);
 
 /* Remove a port from all its current port sets */
 extern kern_return_t ipc_pset_remove_from_all(
-       ipc_port_t      port);
+       ipc_port_t      port,
+       queue_t         links);
 
 /* Destroy a port_set */
 extern void ipc_pset_destroy(
        ipc_pset_t      pset);
 
-#define        ipc_pset_reference(pset)        \
-               ipc_object_reference(&(pset)->ips_object)
-
-#define        ipc_pset_release(pset)          \
-               ipc_object_release(&(pset)->ips_object)
-
-
-#if    MACH_KDB
-int ipc_list_count(struct ipc_kmsg *base);
-#endif /* MACH_KDB */
-
 #endif /* _IPC_IPC_PSET_H_ */