X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..a1c7dba18ef36983396c282fe85292db066e39db:/osfmk/ipc/ipc_entry.h

diff --git a/osfmk/ipc/ipc_entry.h b/osfmk/ipc/ipc_entry.h
index e1c01d154..4a34f110d 100644
--- a/osfmk/ipc/ipc_entry.h
+++ b/osfmk/ipc/ipc_entry.h
@@ -80,9 +80,6 @@
  *	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.
@@ -100,19 +97,17 @@
 struct ipc_entry {
 	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 table;
-		struct ipc_tree_entry *tree;
-	} hash;
 };
 
 #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)
@@ -120,9 +115,6 @@ 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_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)
@@ -138,24 +130,6 @@ struct ipc_entry {
 
 #define	IE_BITS_RIGHT_MASK	0x007fffff	/* relevant to the right */
 
-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;
-};
-
-#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, (ite))
-
 /*
  * Exported interfaces
  */
@@ -165,6 +139,17 @@ extern ipc_entry_t ipc_entry_lookup(
 	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,
@@ -189,6 +174,12 @@ extern void ipc_entry_dealloc(
 	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(
 	ipc_space_t		space,