xnu-2422.115.4.tar.gz

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

diff --git a/osfmk/ipc/ipc_table.h b/osfmk/ipc/ipc_table.h
index 2b7ff246cb2f255c08a36ed549bcd3e378886d6b..66a2d3d5a44f0c989c35cad439f7822d47229630 100644 (file)
--- a/osfmk/ipc/ipc_table.h
+++ b/osfmk/ipc/ipc_table.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@
@@ -101,67 +106,41 @@ struct ipc_table_size {
 };
 
 extern ipc_table_size_t ipc_table_entries;
-extern ipc_table_size_t ipc_table_dnrequests;
+extern ipc_table_size_t ipc_table_requests;
 
 /* Initialize IPC capabilities table storage */
 extern void ipc_table_init(void);
 
 /*
- *     Note that ipc_table_alloc, ipc_table_realloc, and ipc_table_free
- *     all potentially use the VM system.  Hence simple locks can't
+ *     Note that ipc_table_alloc and ipc_table_free
+ *     potentially use the VM system.  Hence simple locks can't
  *     be held across them.
- *
- *     We can't use a copying realloc, because the realloc happens
- *     with the data unlocked.  ipc_table_realloc remaps the data,
- *     so it is OK.
  */
 
 /* Allocate a table */
 extern void * ipc_table_alloc(
        vm_size_t       size);
 
-/* Reallocate a big table */
-extern void * ipc_table_realloc(
-       vm_size_t       old_size,
-       void *          old_table,
-       vm_size_t       new_size);
-
 /* Free a table */
 extern void ipc_table_free(
        vm_size_t       size,
        void *          table);
 
-#define it_entries_reallocable(its)                                    \
-       ((its)->its_size * sizeof(struct ipc_entry) >= PAGE_SIZE)
-
 #define        it_entries_alloc(its)                                           \
        ((ipc_entry_t)                                                  \
-       ipc_table_alloc(it_entries_reallocable(its) ?                   \
-           round_page((its)->its_size * sizeof(struct ipc_entry)) :    \
-           (its)->its_size * sizeof(struct ipc_entry)                  \
-       ))
-
-#define        it_entries_realloc(its, table, nits)                            \
-       ((ipc_entry_t)                                                  \
-       ipc_table_realloc(                                              \
-           round_page((its)->its_size * sizeof(struct ipc_entry)),     \
-           (void *)(table),                                    \
-           round_page((nits)->its_size * sizeof(struct ipc_entry))     \
-       ))
+        ipc_table_alloc((its)->its_size * sizeof(struct ipc_entry)))
 
 #define        it_entries_free(its, table)                                     \
-       ipc_table_free(it_entries_reallocable(its) ?                    \
-           round_page((its)->its_size * sizeof(struct ipc_entry)) :    \
-           (its)->its_size * sizeof(struct ipc_entry),                 \
-           (void *)(table)                                     \
-       )
+       ipc_table_free((its)->its_size * sizeof(struct ipc_entry),      \
+                      (void *)(table))
+
 
-#define        it_dnrequests_alloc(its)                                        \
+#define        it_requests_alloc(its)                                          \
        ((ipc_port_request_t)                                           \
         ipc_table_alloc((its)->its_size *                              \
                         sizeof(struct ipc_port_request)))
 
-#define        it_dnrequests_free(its, table)                                  \
+#define        it_requests_free(its, table)                                    \
        ipc_table_free((its)->its_size *                                \
                       sizeof(struct ipc_port_request),                 \
                       (void *)(table))