xnu-2782.10.72.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 75d9c396e431361c3f62520879276c56a73695fa..67086488c13f56f17407655e85b712c5a8f4eaeb 100644 (file)
--- a/osfmk/ipc/ipc_table.c
+++ b/osfmk/ipc/ipc_table.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_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.  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 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -92,8 +90,8 @@ extern vm_map_t kalloc_map;
 ipc_table_size_t ipc_table_entries;
 unsigned int ipc_table_entries_size = 512;
 
-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
 ipc_table_fill(
@@ -113,7 +111,7 @@ ipc_table_fill(
             (index < num) && (size < PAGE_SIZE);
             size <<= 1) {
                if (size >= minsize) {
-                       its[index].its_size = size / elemsize;
+                       its[index].its_size = (ipc_table_elems_t)(size / elemsize);
                        index++;
                }
        }
@@ -127,11 +125,11 @@ ipc_table_fill(
                     (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++;
                        }
                }
-               if (incrsize < (PAGE_SIZE << 3))
+               if (incrsize < (vm_size_t)(PAGE_SIZE << 3))
                        incrsize <<= 1;
        }
 }
@@ -153,17 +151,17 @@ ipc_table_init(void)
                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) *
-                      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 */
 
-       ipc_table_dnrequests[ipc_table_dnrequests_size - 1].its_size = 0;
+       ipc_table_requests[ipc_table_requests_size - 1].its_size = 0;
 }
 
 /*
@@ -189,33 +187,6 @@ ipc_table_alloc(
        return (void *)table;
 }
 
-/*
- *     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