Index: uspace/app/mkexfat/mkexfat.c =================================================================== --- uspace/app/mkexfat/mkexfat.c (revision 01e397acac46a189b96f74763361894391bdf729) +++ uspace/app/mkexfat/mkexfat.c (revision c8fccf5b75e9757a8b5d17f388f8c4e32b8d1a07) @@ -49,4 +49,5 @@ #include #include +#include #include "exfat.h" #include "upcase.h" @@ -87,5 +88,4 @@ #define FIRST_FREE_CLUSTER 2 -#define min(x, y) ((x) < (y) ? (x) : (y)) typedef struct exfat_cfg { Index: uspace/app/trace/ipcp.c =================================================================== --- uspace/app/trace/ipcp.c (revision 01e397acac46a189b96f74763361894391bdf729) +++ uspace/app/trace/ipcp.c (revision c8fccf5b75e9757a8b5d17f388f8c4e32b8d1a07) @@ -38,4 +38,5 @@ #include #include +#include #include "ipc_desc.h" #include "proto.h" @@ -52,5 +53,5 @@ ipc_callid_t call_hash; - link_t link; + ht_link_t link; } pending_call_t; @@ -64,6 +65,5 @@ int have_conn[MAX_PHONE]; -#define PCALL_TABLE_CHAINS 32 -hash_table_t pending_calls; +static hash_table_t pending_calls; /* @@ -73,38 +73,32 @@ 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 = 0, + .remove_callback = 0 }; - - -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,5 +171,6 @@ } - 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,5 +185,4 @@ pending_call_t *pcall; proto_t *proto; - unsigned long key[1]; oper_t *oper; sysarg_t *args; @@ -254,7 +248,5 @@ pcall->oper = oper; - key[0] = hash; - - hash_table_insert(&pending_calls, key, &pcall->link); + hash_table_insert(&pending_calls, &pcall->link); } @@ -334,7 +326,6 @@ 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,7 +338,6 @@ 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,6 +347,6 @@ */ - 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); Index: uspace/app/trace/proto.c =================================================================== --- uspace/app/trace/proto.c (revision 01e397acac46a189b96f74763361894391bdf729) +++ uspace/app/trace/proto.c (revision c8fccf5b75e9757a8b5d17f388f8c4e32b8d1a07) @@ -40,117 +40,103 @@ #include "proto.h" -#define SRV_PROTO_TABLE_CHAINS 32 -#define METHOD_OPER_TABLE_CHAINS 32 - -hash_table_t srv_proto; + +/* Maps service number to protocol */ +static hash_table_t srv_proto; typedef struct { - unsigned srv; + int srv; proto_t *proto; - link_t link; + ht_link_t link; } srv_proto_t; typedef struct { - sysarg_t method; + int method; oper_t *oper; - link_t link; + ht_link_t link; } method_oper_t; -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 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 = { .hash = srv_proto_hash, - .compare = srv_proto_compare, - .remove_callback = srv_proto_remove_callback + .key_hash = srv_proto_key_hash, + .key_equal = srv_proto_key_equal, + .equal = 0, + .remove_callback = 0 }; -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 = { + +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 = { .hash = method_oper_hash, - .compare = method_oper_compare, - .remove_callback = method_oper_remove_callback + .key_hash = method_oper_key_hash, + .key_equal = method_oper_key_equal, + .equal = 0, + .remove_callback = 0 }; -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) + +void proto_init(void) +{ + /* todo: check return value. */ + bool ok = hash_table_create(&srv_proto, 0, 0, &srv_proto_ops); + assert(ok); +} + +void proto_cleanup(void) +{ + hash_table_destroy(&srv_proto); +} + +void proto_register(int srv, proto_t *proto) { 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) -{ - hash_table_create(&srv_proto, SRV_PROTO_TABLE_CHAINS, 1, - &srv_proto_ops); -} - -void proto_cleanup(void) -{ - hash_table_destroy(&srv_proto); -} - -void proto_register(int srv, proto_t *proto) -{ - srv_proto_t *sp; - unsigned long key; sp = malloc(sizeof(srv_proto_t)); sp->srv = srv; sp->proto = proto; - key = srv; - - hash_table_insert(&srv_proto, &key, &sp->link); + + hash_table_insert(&srv_proto, &sp->link); } proto_t *proto_get_by_srv(int srv) { - unsigned long key; - link_t *item; - srv_proto_t *sp; - - key = srv; - item = hash_table_find(&srv_proto, &key); + ht_link_t *item = hash_table_find(&srv_proto, &srv); if (item == NULL) return NULL; - sp = hash_table_get_instance(item, srv_proto_t, link); + srv_proto_t *sp = hash_table_get_inst(item, srv_proto_t, link); return sp->proto; } @@ -159,6 +145,7 @@ { proto->name = name; - hash_table_create(&proto->method_oper, SRV_PROTO_TABLE_CHAINS, 1, - &method_oper_ops); + /* todo: check return value. */ + bool ok = hash_table_create(&proto->method_oper, 0, 0, &method_oper_ops); + assert(ok); } @@ -181,25 +168,18 @@ { method_oper_t *mo; - unsigned long key; mo = malloc(sizeof(method_oper_t)); mo->method = method; mo->oper = oper; - key = method; - - hash_table_insert(&proto->method_oper, &key, &mo->link); + + hash_table_insert(&proto->method_oper, &mo->link); } oper_t *proto_get_oper(proto_t *proto, int method) { - unsigned long key; - link_t *item; - method_oper_t *mo; - - key = method; - item = hash_table_find(&proto->method_oper, &key); + ht_link_t *item = hash_table_find(&proto->method_oper, &method); if (item == NULL) return NULL; - mo = hash_table_get_instance(item, method_oper_t, link); + method_oper_t *mo = hash_table_get_inst(item, method_oper_t, link); return mo->oper; } Index: uspace/app/trace/proto.h =================================================================== --- uspace/app/trace/proto.h (revision 01e397acac46a189b96f74763361894391bdf729) +++ uspace/app/trace/proto.h (revision c8fccf5b75e9757a8b5d17f388f8c4e32b8d1a07) @@ -62,6 +62,4 @@ } proto_t; -/* Maps service number to protocol */ -extern hash_table_t srv_proto; extern void proto_init(void);