xnu-4903.241.1.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 1c5eb1bcf3129afc868de3f4a98e8c6ee1554151..2b092bbca9dce2c292345a25812fac908b67336d 100644 (file)
--- a/osfmk/ipc/ipc_table.h
+++ b/osfmk/ipc/ipc_table.h
@@ -106,69 +106,46 @@ struct ipc_table_size {
 };
 
 extern ipc_table_size_t ipc_table_entries;
 };
 
 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 */
 
 /* Initialize IPC capabilities table storage */

-extern void ipc_table_init(void) __attribute__((section("__TEXT, initcode")));
+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.
  *     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);
 
  */
 
 /* 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);
 
 /* 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)                                                  \
 #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)                                     \
 
 #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)))
 
        ((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))
 
        ipc_table_free((its)->its_size *                                \
                       sizeof(struct ipc_port_request),                 \
                       (void *)(table))
 

+extern unsigned int ipc_table_max_entries(void);
+extern unsigned int ipc_table_max_requests(void);
+

 #endif /* _IPC_IPC_TABLE_H_ */
 #endif /* _IPC_IPC_TABLE_H_ */