xnu-2782.10.72.tar.gz

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

diff --git a/osfmk/ipc/ipc_entry.h b/osfmk/ipc/ipc_entry.h
index 57e393c6e1e6effe77c2c84e1d3cae6ca10eada9..4a34f110dd03c2c36a5de7c09ee5ee07bb66b763 100644 (file)
--- a/osfmk/ipc/ipc_entry.h
+++ b/osfmk/ipc/ipc_entry.h
@@ -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,
  * 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@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -61,20 +67,19 @@
 #ifndef        _IPC_IPC_ENTRY_H_
 #define _IPC_IPC_ENTRY_H_
 
 #ifndef        _IPC_IPC_ENTRY_H_
 #define _IPC_IPC_ENTRY_H_
 

+#include <mach/mach_types.h>

 #include <mach/port.h>
 #include <mach/kern_return.h>
 #include <mach/port.h>
 #include <mach/kern_return.h>

+
+#include <kern/kern_types.h>

 #include <kern/zalloc.h>
 #include <kern/zalloc.h>

-#include <ipc/port.h>
-#include <ipc/ipc_table.h>
+

 #include <ipc/ipc_types.h>
 
 /*
  *     Spaces hold capabilities for ipc_object_t's.
  *     Each ipc_entry_t records a capability.  Most capabilities have
  *     small names, and the entries are elements of a table.
 #include <ipc/ipc_types.h>
 
 /*
  *     Spaces hold capabilities for ipc_object_t's.
  *     Each ipc_entry_t records a capability.  Most capabilities have
  *     small names, and the entries are elements of a table.

- *     Capabilities can have large names, and a splay tree holds
- *     those entries.  The cutoff point between the table and the tree
- *     is adjusted dynamically to minimize memory consumption.

  *
  *     The ie_index field of entries in the table implements
  *     a ordered hash table with open addressing and linear probing.
  *
  *     The ie_index field of entries in the table implements
  *     a ordered hash table with open addressing and linear probing.


@@ -89,27 +94,20 @@
  *     It is used as the head of the free list.
  */
 
  *     It is used as the head of the free list.
  */
 

-typedef natural_t ipc_entry_bits_t;
-typedef ipc_table_elems_t ipc_entry_num_t;     /* number of entries */
-
-typedef struct ipc_entry {
+struct ipc_entry {

        struct ipc_object *ie_object;
        ipc_entry_bits_t ie_bits;
        struct ipc_object *ie_object;
        ipc_entry_bits_t ie_bits;

+       mach_port_index_t ie_index;

        union {
                mach_port_index_t next;         /* next in freelist, or...  */
                ipc_table_index_t request;      /* dead name request notify */
        } index;
        union {
                mach_port_index_t next;         /* next in freelist, or...  */
                ipc_table_index_t request;      /* dead name request notify */
        } index;

-       union {
-               mach_port_index_t table;
-               struct ipc_tree_entry *tree;
-       } hash;
-} *ipc_entry_t;
-
-#define        IE_NULL         ((ipc_entry_t) 0)
+};

 
 #define        ie_request      index.request
 #define        ie_next         index.next
 
 #define        ie_request      index.request
 #define        ie_next         index.next

-#define        ie_index        hash.table
+
+#define IE_REQ_NONE            0               /* no request */

 
 #define        IE_BITS_UREFS_MASK      0x0000ffff      /* 16 bits of user-reference */
 #define        IE_BITS_UREFS(bits)     ((bits) & IE_BITS_UREFS_MASK)
 
 #define        IE_BITS_UREFS_MASK      0x0000ffff      /* 16 bits of user-reference */
 #define        IE_BITS_UREFS(bits)     ((bits) & IE_BITS_UREFS_MASK)


@@ -117,9 +115,6 @@ typedef struct ipc_entry {
 #define        IE_BITS_TYPE_MASK       0x001f0000      /* 5 bits of capability type */
 #define        IE_BITS_TYPE(bits)      ((bits) & IE_BITS_TYPE_MASK)
 
 #define        IE_BITS_TYPE_MASK       0x001f0000      /* 5 bits of capability type */
 #define        IE_BITS_TYPE(bits)      ((bits) & IE_BITS_TYPE_MASK)
 

-#define        IE_BITS_COLLISION       0x00800000      /* 1 bit for collisions */
-
-

 #ifndef NO_PORT_GEN
 #define        IE_BITS_GEN_MASK        0xff000000      /* 8 bits for generation */
 #define        IE_BITS_GEN(bits)       ((bits) & IE_BITS_GEN_MASK)
 #ifndef NO_PORT_GEN
 #define        IE_BITS_GEN_MASK        0xff000000      /* 8 bits for generation */
 #define        IE_BITS_GEN(bits)       ((bits) & IE_BITS_GEN_MASK)


@@ -135,26 +130,6 @@ typedef struct ipc_entry {
 
 #define        IE_BITS_RIGHT_MASK      0x007fffff      /* relevant to the right */
 
 
 #define        IE_BITS_RIGHT_MASK      0x007fffff      /* relevant to the right */
 

-typedef struct ipc_tree_entry {
-       struct ipc_entry ite_entry;
-       mach_port_name_t ite_name;
-       struct ipc_space *ite_space;
-       struct ipc_tree_entry *ite_lchild;
-       struct ipc_tree_entry *ite_rchild;
-} *ipc_tree_entry_t;
-
-#define        ITE_NULL        ((ipc_tree_entry_t) 0)
-
-#define        ite_bits        ite_entry.ie_bits
-#define        ite_object      ite_entry.ie_object
-#define        ite_request     ite_entry.ie_request
-#define        ite_next        ite_entry.hash.tree
-
-extern zone_t ipc_tree_entry_zone;
-
-#define ite_alloc()    ((ipc_tree_entry_t) zalloc(ipc_tree_entry_zone))
-#define        ite_free(ite)   zfree(ipc_tree_entry_zone, (vm_offset_t) (ite))
-

 /*
  * Exported interfaces
  */
 /*
  * Exported interfaces
  */


@@ -164,6 +139,17 @@ extern ipc_entry_t ipc_entry_lookup(
        ipc_space_t             space,
        mach_port_name_t        name);
 
        ipc_space_t             space,
        mach_port_name_t        name);
 

+/* Hold a number of entries in a locked space */
+extern kern_return_t ipc_entries_hold(
+       ipc_space_t             space,
+       natural_t               count);
+
+/* claim and initialize a held entry in a locked space */
+extern kern_return_t ipc_entry_claim(
+       ipc_space_t             space,
+       mach_port_name_t        *namep,
+       ipc_entry_t             *entryp);
+

 /* Allocate an entry in a space */
 extern kern_return_t ipc_entry_get(
        ipc_space_t             space,
 /* Allocate an entry in a space */
 extern kern_return_t ipc_entry_get(
        ipc_space_t             space,


@@ -188,9 +174,15 @@ extern void ipc_entry_dealloc(
        mach_port_name_t        name,
        ipc_entry_t             entry);
 
        mach_port_name_t        name,
        ipc_entry_t             entry);
 

+/* Mark and entry modified in a space */
+extern void ipc_entry_modified(
+       ipc_space_t             space,
+       mach_port_name_t        name,
+       ipc_entry_t             entry);
+

 /* Grow the table in a space */
 extern kern_return_t ipc_entry_grow_table(
 /* Grow the table in a space */
 extern kern_return_t ipc_entry_grow_table(

-       ipc_space_t     space,
-       int             target_size);
+       ipc_space_t             space,
+       ipc_table_elems_t       target_size);

 
 #endif /* _IPC_IPC_ENTRY_H_ */
 
 #endif /* _IPC_IPC_ENTRY_H_ */