Changes in uspace/app/trace/proto.c [4e00f87:ffa2c8ef] in mainline

File:

• uspace/app/trace/proto.c (modified) (4 diffs)

uspace/app/trace/proto.c

@@ -40 +40 @@
 #include "proto.h"
 
-
-/* Maps service number to protocol */
-static hash_table_t srv_proto;
+#define SRV_PROTO_TABLE_CHAINS 32
+#define METHOD_OPER_TABLE_CHAINS 32
+
+hash_table_t srv_proto;
 
 typedef struct {
-        int srv;
+        unsigned srv;
         proto_t *proto;
-        ht_link_t link;
+        link_t link;
 } srv_proto_t;
 
 typedef struct {
-        int method;
+        sysarg_t method;
         oper_t *oper;
-        ht_link_t link;
+        link_t link;
 } method_oper_t;
 
-/* Hash table operations. */
-
-static size_t srv_proto_key_hash(void *key)
-{
-        return *(int *)key;
-}
-
-static size_t srv_proto_hash(const ht_link_t *item)
-{
-        srv_proto_t *sp = hash_table_get_inst(item, srv_proto_t, link);
-        return sp->srv;
-}
-
-static bool srv_proto_key_equal(void *key, const ht_link_t *item)
-{
-        srv_proto_t *sp = hash_table_get_inst(item, srv_proto_t, link);
-        return sp->srv == *(int *)key;
-}
-
-static hash_table_ops_t srv_proto_ops = {
+static hash_index_t srv_proto_hash(unsigned long key[]);
+static int srv_proto_compare(unsigned long key[], hash_count_t keys,
+    link_t *item);
+static void srv_proto_remove_callback(link_t *item);
+
+hash_table_operations_t srv_proto_ops = {
         .hash = srv_proto_hash,
-        .key_hash = srv_proto_key_hash,
-        .key_equal = srv_proto_key_equal,
-        .equal = NULL,
-        .remove_callback = NULL
+        .compare = srv_proto_compare,
+        .remove_callback = srv_proto_remove_callback
 };
 
-
-static size_t method_oper_key_hash(void *key)
-{
-        return *(int *)key;
-}
-
-static size_t method_oper_hash(const ht_link_t *item)
-{
-        method_oper_t *mo = hash_table_get_inst(item, method_oper_t, link);
-        return mo->method;
-}
-
-static bool method_oper_key_equal(void *key, const ht_link_t *item)
-{
-        method_oper_t *mo = hash_table_get_inst(item, method_oper_t, link);
-        return mo->method == *(int *)key;
-}
-
-static hash_table_ops_t method_oper_ops = {
+static hash_index_t method_oper_hash(unsigned long key[]);
+static int method_oper_compare(unsigned long key[], hash_count_t keys,
+    link_t *item);
+static void method_oper_remove_callback(link_t *item);
+
+hash_table_operations_t method_oper_ops = {
         .hash = method_oper_hash,
-        .key_hash = method_oper_key_hash,
-        .key_equal = method_oper_key_equal,
-        .equal = NULL,
-        .remove_callback = NULL
+        .compare = method_oper_compare,
+        .remove_callback = method_oper_remove_callback
 };
 
+static hash_index_t srv_proto_hash(unsigned long key[])
+{
+        return key[0] % SRV_PROTO_TABLE_CHAINS;
+}
+
+static int srv_proto_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+        srv_proto_t *sp;
+
+        sp = hash_table_get_instance(item, srv_proto_t, link);
+
+        return key[0] == sp->srv;
+}
+
+static void srv_proto_remove_callback(link_t *item)
+{
+}
+
+static hash_index_t method_oper_hash(unsigned long key[])
+{
+        return key[0] % METHOD_OPER_TABLE_CHAINS;
+}
+
+static int method_oper_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+        method_oper_t *mo;
+
+        mo = hash_table_get_instance(item, method_oper_t, link);
+
+        return key[0] == mo->method;
+}
+
+static void method_oper_remove_callback(link_t *item)
+{
+}
+
 
 void proto_init(void)
 {
-        /* todo: check return value. */
-        bool ok = hash_table_create(&srv_proto, 0, 0, &srv_proto_ops);
-        assert(ok);
+        hash_table_create(&srv_proto, SRV_PROTO_TABLE_CHAINS, 1,
+            &srv_proto_ops);
 }
 
@@ -125 +132 @@
 {
         srv_proto_t *sp;
+        unsigned long key;
 
         sp = malloc(sizeof(srv_proto_t));
         sp->srv = srv;
         sp->proto = proto;
-
-        hash_table_insert(&srv_proto, &sp->link);
+        key = srv;
+
+        hash_table_insert(&srv_proto, &key, &sp->link);
 }
 
 proto_t *proto_get_by_srv(int srv)
 {
-        ht_link_t *item = hash_table_find(&srv_proto, &srv);
+        unsigned long key;
+        link_t *item;
+        srv_proto_t *sp;
+
+        key = srv;
+        item = hash_table_find(&srv_proto, &key);
         if (item == NULL) return NULL;
 
-        srv_proto_t *sp = hash_table_get_inst(item, srv_proto_t, link);
+        sp = hash_table_get_instance(item, srv_proto_t, link);
         return sp->proto;
 }
@@ -145 +159 @@
 {
         proto->name = name;
-        /* todo: check return value. */
-        bool ok = hash_table_create(&proto->method_oper, 0, 0, &method_oper_ops);
-        assert(ok);
+        hash_table_create(&proto->method_oper, SRV_PROTO_TABLE_CHAINS, 1,
+            &method_oper_ops);
 }
 
@@ -168 +181 @@
 {
         method_oper_t *mo;
+        unsigned long key;
 
         mo = malloc(sizeof(method_oper_t));
         mo->method = method;
         mo->oper = oper;
-
-        hash_table_insert(&proto->method_oper, &mo->link);      
+        key = method;
+
+        hash_table_insert(&proto->method_oper, &key, &mo->link);        
 }
 
 oper_t *proto_get_oper(proto_t *proto, int method)
 {
-        ht_link_t *item = hash_table_find(&proto->method_oper, &method);
+        unsigned long key;
+        link_t *item;
+        method_oper_t *mo;
+
+        key = method;
+        item = hash_table_find(&proto->method_oper, &key);
         if (item == NULL) return NULL;
 
-        method_oper_t *mo = hash_table_get_inst(item, method_oper_t, link);
+        mo = hash_table_get_instance(item, method_oper_t, link);
         return mo->oper;
 }