summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2012-01-09 10:01:56 +0000
committerRichard Braun <rbraun@sceen.net>2012-01-09 10:01:56 +0000
commit3496138ca428a7b2b69fe08e69fb544006a9a2cc (patch)
tree38a675ce4e9ec23ed283e66ce7e4c7e5d8355efb
parent88382234bb540544a3550d1ddfb84e0d17eec971 (diff)
Improve ipc hash/marequest init readability
Use macros instead of raw numeric values. * ipc/ipc_hash.h (IPC_HASH_GLOBAL_SIZE): New macro. * ipc/ipc_hash.c (ipc_hash_init): Directly set the global hash table size to IPC_HASH_GLOBAL_SIZE. * ipc/ipc_marequest.h (IPC_MAREQUEST_SIZE): New macro. * ipc/ipc_marequest.c (ipc_marequest_init): Directly set the marequest hash table size to IPC_MAREQUEST_SIZE.
-rw-r--r--ipc/ipc_hash.c5
-rw-r--r--ipc/ipc_hash.h2
-rw-r--r--ipc/ipc_marequest.c5
-rw-r--r--ipc/ipc_marequest.h1
4 files changed, 7 insertions, 6 deletions
diff --git a/ipc/ipc_hash.c b/ipc/ipc_hash.c
index a1ca225d..ad05016c 100644
--- a/ipc/ipc_hash.c
+++ b/ipc/ipc_hash.c
@@ -535,10 +535,9 @@ ipc_hash_init(void)
{
ipc_hash_index_t i;
- /* if not configured, initialize ipc_hash_global_size */
+ /* initialize ipc_hash_global_size */
- if (ipc_hash_global_size == 0)
- ipc_hash_global_size = 256;
+ ipc_hash_global_size = IPC_HASH_GLOBAL_SIZE;
/* make sure it is a power of two */
diff --git a/ipc/ipc_hash.h b/ipc/ipc_hash.h
index 58c56ca8..929ba77d 100644
--- a/ipc/ipc_hash.h
+++ b/ipc/ipc_hash.h
@@ -67,6 +67,8 @@ ipc_hash_delete(ipc_space_t space, ipc_object_t obj,
* and the local primitives, for table entries.
*/
+#define IPC_HASH_GLOBAL_SIZE 256
+
extern boolean_t
ipc_hash_global_lookup(ipc_space_t space, ipc_object_t obj,
mach_port_t *namep, ipc_tree_entry_t *entryp);
diff --git a/ipc/ipc_marequest.c b/ipc/ipc_marequest.c
index 6036967f..06c53eb4 100644
--- a/ipc/ipc_marequest.c
+++ b/ipc/ipc_marequest.c
@@ -98,10 +98,9 @@ ipc_marequest_init(void)
{
ipc_marequest_index_t i;
- /* if not configured, initialize ipc_marequest_size */
+ /* initialize ipc_marequest_size */
- if (ipc_marequest_size == 0)
- ipc_marequest_size = 16;
+ ipc_marequest_size = IPC_MAREQUEST_SIZE;
/* make sure it is a power of two */
diff --git a/ipc/ipc_marequest.h b/ipc/ipc_marequest.h
index eb3746d2..4f6f7584 100644
--- a/ipc/ipc_marequest.h
+++ b/ipc/ipc_marequest.h
@@ -70,6 +70,7 @@ typedef struct ipc_marequest {
#define IMAR_NULL ((ipc_marequest_t) 0)
+#define IPC_MAREQUEST_SIZE 16
extern void
ipc_marequest_init(void);