xnu-3248.60.10.tar.gz

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

diff --git a/osfmk/ipc/ipc_table.c b/osfmk/ipc/ipc_table.c
index 337e4d1fa7c6d8f255730d307b9011ca1ccb2021..b65071b28bdb49768e7bb54b2a6fe36d03f85357 100644 (file)
--- a/osfmk/ipc/ipc_table.c
+++ b/osfmk/ipc/ipc_table.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 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@

  * 
  * 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
  * 
  * 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
  * 
  * 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.
  * 
  * 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@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -66,29 +71,13 @@
 #include <kern/kalloc.h>
 #include <vm/vm_kern.h>
 
 #include <kern/kalloc.h>
 #include <vm/vm_kern.h>
 

-/*
- * Forward declarations
- */
-void ipc_table_fill(
-       ipc_table_size_t        its,
-       unsigned int            num,
-       unsigned int            min,
-       vm_size_t               elemsize);
-
-/*
- *     We borrow the kalloc map, rather than creating
- *     yet another submap of the kernel map.
- */
-
-extern vm_map_t kalloc_map;
-

 ipc_table_size_t ipc_table_entries;
 ipc_table_size_t ipc_table_entries;

-unsigned int ipc_table_entries_size = 512;
+unsigned int ipc_table_entries_size = CONFIG_IPC_TABLE_ENTRIES_STEPS;

 
 

-ipc_table_size_t ipc_table_dnrequests;
-unsigned int ipc_table_dnrequests_size = 64;
+ipc_table_size_t ipc_table_requests;
+unsigned int ipc_table_requests_size = 64;

 
 

-void
+static void

 ipc_table_fill(
        ipc_table_size_t        its,         /* array to fill */
        unsigned int            num,         /* size of array */
 ipc_table_fill(
        ipc_table_size_t        its,         /* array to fill */
        unsigned int            num,         /* size of array */


@@ -103,28 +92,28 @@ ipc_table_fill(
        /* first use powers of two, up to the page size */
 
        for (index = 0, size = 1;
        /* first use powers of two, up to the page size */
 
        for (index = 0, size = 1;

-            (index < num) && (size < PAGE_SIZE);
+            (index < num) && (size < PAGE_MAX_SIZE);

             size <<= 1) {
                if (size >= minsize) {
             size <<= 1) {
                if (size >= minsize) {

-                       its[index].its_size = size / elemsize;
+                       its[index].its_size = (ipc_table_elems_t)(size / elemsize);

                        index++;
                }
        }
 
        /* then increments of a page, then two pages, etc. */
 
                        index++;
                }
        }
 
        /* then increments of a page, then two pages, etc. */
 

-       for (incrsize = PAGE_SIZE; index < num;) {
+       for (incrsize = PAGE_MAX_SIZE; index < num;) {

                unsigned int period;
 
                for (period = 0;
                     (period < 15) && (index < num);
                     period++, size += incrsize) {
                        if (size >= minsize) {
                unsigned int period;
 
                for (period = 0;
                     (period < 15) && (index < num);
                     period++, size += incrsize) {
                        if (size >= minsize) {

-                               its[index].its_size = size / elemsize;
+                               its[index].its_size = (ipc_table_elems_t)(size / elemsize);

                                index++;
                        }
                }
                                index++;
                        }
                }

-               if (incrsize < (PAGE_SIZE << 3))
+               if (incrsize < (vm_size_t)(PAGE_MAX_SIZE << 3))

                        incrsize <<= 1;
        }
 }
                        incrsize <<= 1;
        }
 }


@@ -146,17 +135,17 @@ ipc_table_init(void)
                ipc_table_entries[ipc_table_entries_size - 2].its_size;
 
 
                ipc_table_entries[ipc_table_entries_size - 2].its_size;
 
 

-       ipc_table_dnrequests = (ipc_table_size_t)
+       ipc_table_requests = (ipc_table_size_t)

                kalloc(sizeof(struct ipc_table_size) *
                kalloc(sizeof(struct ipc_table_size) *

-                      ipc_table_dnrequests_size);
-       assert(ipc_table_dnrequests != ITS_NULL);
+                      ipc_table_requests_size);
+       assert(ipc_table_requests != ITS_NULL);

 
 

-       ipc_table_fill(ipc_table_dnrequests, ipc_table_dnrequests_size - 1,
+       ipc_table_fill(ipc_table_requests, ipc_table_requests_size - 1,

                       2, sizeof(struct ipc_port_request));
 
        /* the last element should have zero size */
 
                       2, sizeof(struct ipc_port_request));
 
        /* the last element should have zero size */
 

-       ipc_table_dnrequests[ipc_table_dnrequests_size - 1].its_size = 0;
+       ipc_table_requests[ipc_table_requests_size - 1].its_size = 0;

 }
 
 /*
 }
 
 /*


@@ -171,50 +160,14 @@ void *
 ipc_table_alloc(
        vm_size_t       size)
 {
 ipc_table_alloc(
        vm_size_t       size)
 {

-       vm_offset_t table;
-
-       if (size < PAGE_SIZE)
-               return kalloc(size);
-
-       if (kmem_alloc(kalloc_map, &table, size) != KERN_SUCCESS)
-               table = 0;
-
-       return (void *)table;
+       return kalloc(size);

 }
 
 }
 

-/*
- *     Routine:        ipc_table_realloc
- *     Purpose:
- *             Reallocate a big table.
- *
- *             The new table remaps the old table,
- *             so copying is not necessary.
- *     Conditions:
- *             Only works for page-size or bigger tables.
- *             May block.
- */
-
-void *
-ipc_table_realloc(
-       vm_size_t       old_size,
-       void *          old_table,
-       vm_size_t       new_size)
-{
-       vm_offset_t new_table;
-
-       if (kmem_realloc(kalloc_map,
-                        (vm_offset_t) old_table, old_size,
-                        &new_table, new_size) != KERN_SUCCESS)
-               new_table = 0;
-
-       return (void *)new_table;
-}

 
 /*
  *     Routine:        ipc_table_free
  *     Purpose:
 
 /*
  *     Routine:        ipc_table_free
  *     Purpose:

- *             Free a table allocated with ipc_table_alloc or
- *             ipc_table_realloc.
+ *             Free a table allocated with ipc_table_alloc.

  *     Conditions:
  *             May block.
  */
  *     Conditions:
  *             May block.
  */


@@ -224,8 +177,5 @@ ipc_table_free(
        vm_size_t       size,
        void *          table)
 {
        vm_size_t       size,
        void *          table)
 {

-       if (size < PAGE_SIZE)
-               kfree(table, size);
-       else
-               kmem_free(kalloc_map, (vm_offset_t)table, size);
+       kfree(table, size);

 }
 }