Changes in uspace/app/trace/ipcp.c [a3b339b4:c0699467] in mainline

File:

• uspace/app/trace/ipcp.c (modified) (11 diffs)

uspace/app/trace/ipcp.c

@@ -38 +38 @@
 #include <sys/typefmt.h>
 #include <abi/ipc/methods.h>
-#include <macros.h>
 #include "ipc_desc.h"
 #include "proto.h"
@@ -53 +52 @@
         ipc_callid_t call_hash;
 
-        ht_link_t link;
+        link_t link;
 } pending_call_t;
 
@@ -65 +64 @@
 int have_conn[MAX_PHONE];
 
-static hash_table_t pending_calls;
+#define PCALL_TABLE_CHAINS 32
+hash_table_t pending_calls;
 
 /*
@@ -73 +73 @@
 proto_t *proto_unknown;         /**< Protocol with no known methods. */
 
-
-static size_t pending_call_key_hash(void *key)
-{
-        ipc_callid_t *call_id = (ipc_callid_t *)key;
-        return *call_id;
-}
-
-static size_t pending_call_hash(const ht_link_t *item)
-{
-        pending_call_t *hs = hash_table_get_inst(item, pending_call_t, link);
-        return hs->call_hash;
-}
-
-static bool pending_call_key_equal(void *key, const ht_link_t *item)
-{
-        ipc_callid_t *call_id = (ipc_callid_t *)key;
-        pending_call_t *hs = hash_table_get_inst(item, pending_call_t, link);
-
-        return *call_id == hs->call_hash;
-}
-
-static hash_table_ops_t pending_call_ops = {
+static hash_index_t pending_call_hash(unsigned long key[]);
+static int pending_call_compare(unsigned long key[], hash_count_t keys,
+    link_t *item);
+static void pending_call_remove_callback(link_t *item);
+
+hash_table_operations_t pending_call_ops = {
         .hash = pending_call_hash,
-        .key_hash = pending_call_key_hash,
-        .key_equal = pending_call_key_equal,
-        .equal = NULL,
-        .remove_callback = NULL
+        .compare = pending_call_compare,
+        .remove_callback = pending_call_remove_callback
 };
+
+
+static hash_index_t pending_call_hash(unsigned long key[])
+{
+//      printf("pending_call_hash\n");
+        return key[0] % PCALL_TABLE_CHAINS;
+}
+
+static int pending_call_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+        pending_call_t *hs;
+
+//      printf("pending_call_compare\n");
+        hs = hash_table_get_instance(item, pending_call_t, link);
+
+        // FIXME: this will fail if sizeof(long) < sizeof(void *).
+        return key[0] == hs->call_hash;
+}
+
+static void pending_call_remove_callback(link_t *item)
+{
+//      printf("pending_call_remove_callback\n");
+}
 
 
@@ -140 +146 @@
 void ipcp_init(void)
 {
+        ipc_m_desc_t *desc;
+        oper_t *oper;
+
         val_type_t arg_def[OPER_MAX_ARGS] = {
                 V_INTEGER,
@@ -159 +168 @@
         proto_system = proto_new("system");
 
-        for (size_t i = 0; i < ipc_methods_len; i++) {
-                oper_t *oper = oper_new(ipc_methods[i].name, OPER_MAX_ARGS,
-                    arg_def, V_INTEGER, OPER_MAX_ARGS, arg_def);
-                proto_add_oper(proto_system, ipc_methods[i].number, oper);
-        }
-
-        bool ok = hash_table_create(&pending_calls, 0, 0, &pending_call_ops);
-        assert(ok);
+        desc = ipc_methods;
+        while (desc->number != 0) {
+                oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER,
+                        OPER_MAX_ARGS, arg_def);
+                proto_add_oper(proto_system, desc->number, oper);
+
+                ++desc;
+        }
+
+        hash_table_create(&pending_calls, PCALL_TABLE_CHAINS, 1, &pending_call_ops);
 }
 
@@ -179 +190 @@
         pending_call_t *pcall;
         proto_t *proto;
+        unsigned long key[1];
         oper_t *oper;
         sysarg_t *args;
@@ -242 +254 @@
         pcall->oper = oper;
 
-        hash_table_insert(&pending_calls, &pcall->link);
+        key[0] = hash;
+
+        hash_table_insert(&pending_calls, key, &pcall->link);
 }
 
@@ -320 +334 @@
 void ipcp_call_in(ipc_call_t *call, ipc_callid_t hash)
 {
-        ht_link_t *item;
+        link_t *item;
         pending_call_t *pcall;
+        unsigned long key[1];
         
         if ((hash & IPC_CALLID_ANSWERED) == 0 && hash != IPCP_CALLID_SYNC) {
@@ -332 +347 @@
         
         hash = hash & ~IPC_CALLID_ANSWERED;
-        
-        item = hash_table_find(&pending_calls, &hash);
+        key[0] = hash;
+        
+        item = hash_table_find(&pending_calls, key);
         if (item == NULL)
                 return; /* No matching question found */
@@ -341 +357 @@
          */
         
-        pcall = hash_table_get_inst(item, pending_call_t, link);
-        hash_table_remove(&pending_calls, &hash);
+        pcall = hash_table_get_instance(item, pending_call_t, link);
+        hash_table_remove(&pending_calls, key, 1);
         
         parse_answer(hash, pcall, call);