xnu-792.17.14.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_space.c

diff --git a/osfmk/ipc/ipc_space.c b/osfmk/ipc/ipc_space.c
index c5b207a224b31a880576c050a2593b59ed131725..f44228160d20d081c61862da964d4b8d446c91be 100644 (file)
--- a/osfmk/ipc/ipc_space.c
+++ b/osfmk/ipc/ipc_space.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * 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@
@@ -233,12 +239,8 @@ ipc_space_clean(
         *      out the space died.
         */
        is_write_lock(space);
-       while (space->is_growing) {
-               assert_wait((event_t) space, THREAD_UNINT);
-               is_write_unlock(space);
-               thread_block((void (*)(void)) 0);
-               is_write_lock(space);
-       }
+       while (space->is_growing)
+               is_write_sleep(space);
 
        /*
         *      Now we can futz with it since we have the write lock.
@@ -272,7 +274,6 @@ ipc_space_clean(
        for (tentry = ipc_splay_traverse_start(&space->is_tree);
             tentry != ITE_NULL;
             tentry = ipc_splay_traverse_next(&space->is_tree, TRUE)) {
-               int i;
                mach_port_type_t type;
                mach_port_name_t name = tentry->ite_name;
 
@@ -328,12 +329,8 @@ ipc_space_destroy(
         *      out the space died.
         */
        is_read_lock(space);
-       while (space->is_growing) {
-               assert_wait((event_t) space, THREAD_UNINT);
-               is_read_unlock(space);
-               thread_block((void (*)(void)) 0);
-               is_read_lock(space);
-       }
+       while (space->is_growing)
+               is_read_sleep(space);
 
        is_read_unlock(space);
        /*
@@ -388,3 +385,5 @@ ipc_space_destroy(
         */
        is_release(space);
 }
+
+