Changeset 9f4067b6 in mainline for uspace/app/trace/ipcp.c

Timestamp:

2012-10-09T21:16:13Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6659037, 7d248e3

Parents:

d1ef4a1 (diff), 97b199b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/gsoc2012-uspace-hash-table-from-adam.

File:

• uspace/app/trace/ipcp.c (modified) (10 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"
@@ -52 +53 @@
         ipc_callid_t call_hash;
 
-        link_t link;
+        ht_link_t link;
 } pending_call_t;
 
@@ -64 +65 @@
 int have_conn[MAX_PHONE];
 
-#define PCALL_TABLE_CHAINS 32
-hash_table_t pending_calls;
+static hash_table_t pending_calls;
 
 /*
@@ -73 +73 @@
 proto_t *proto_unknown;         /**< Protocol with no known methods. */
 
-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 = {
+
+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 = {
         .hash = pending_call_hash,
-        .compare = pending_call_compare,
-        .remove_callback = pending_call_remove_callback
+        .key_hash = pending_call_key_hash,
+        .key_equal = pending_call_key_equal,
+        .equal = NULL,
+        .remove_callback = NULL
 };
-
-
-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");
-}
 
 
@@ -177 +171 @@
         }
 
-        hash_table_create(&pending_calls, PCALL_TABLE_CHAINS, 1, &pending_call_ops);
+        bool ok = hash_table_create(&pending_calls, 0, 0, &pending_call_ops);
+        assert(ok);
 }
 
@@ -190 +185 @@
         pending_call_t *pcall;
         proto_t *proto;
-        unsigned long key[1];
         oper_t *oper;
         sysarg_t *args;
@@ -254 +248 @@
         pcall->oper = oper;
 
-        key[0] = hash;
-
-        hash_table_insert(&pending_calls, key, &pcall->link);
+        hash_table_insert(&pending_calls, &pcall->link);
 }
 
@@ -334 +326 @@
 void ipcp_call_in(ipc_call_t *call, ipc_callid_t hash)
 {
-        link_t *item;
+        ht_link_t *item;
         pending_call_t *pcall;
-        unsigned long key[1];
         
         if ((hash & IPC_CALLID_ANSWERED) == 0 && hash != IPCP_CALLID_SYNC) {
@@ -347 +338 @@
         
         hash = hash & ~IPC_CALLID_ANSWERED;
-        key[0] = hash;
-        
-        item = hash_table_find(&pending_calls, key);
+        
+        item = hash_table_find(&pending_calls, &hash);
         if (item == NULL)
                 return; /* No matching question found */
@@ -357 +347 @@
          */
         
-        pcall = hash_table_get_instance(item, pending_call_t, link);
-        hash_table_remove(&pending_calls, key, 1);
+        pcall = hash_table_get_inst(item, pending_call_t, link);
+        hash_table_remove(&pending_calls, &hash);
         
         parse_answer(hash, pcall, call);