Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 7907cf9b0f93fc54470f419cd7150c410ed1caa3) +++ uspace/lib/c/generic/async.c (revision c1c0184baf11643c0fc4b19ac1d548092d587c73) @@ -749,4 +749,6 @@ return ENOMEM; } + + _async_sess_init(); return 0; Index: uspace/lib/c/generic/async_sess.c =================================================================== --- uspace/lib/c/generic/async_sess.c (revision 7907cf9b0f93fc54470f419cd7150c410ed1caa3) +++ uspace/lib/c/generic/async_sess.c (revision c1c0184baf11643c0fc4b19ac1d548092d587c73) @@ -107,12 +107,4 @@ #include -#define SESSION_HASH_BUCKETS 16 - -typedef struct { - link_t link; /**< Session hash table link. */ - int sess_phone; /**< The phone serving as session identifier. */ - link_t conn_head; /**< List of open connections. */ -} sess_node_t; - typedef struct { link_t conn_link; /**< Link for the list of connections. */ @@ -132,29 +124,7 @@ /** - * Hash table mapping session phone IDs to session records. - */ -static hash_table_t session_ht; - -static hash_index_t sess_ht_hash(unsigned long *key) -{ - return *key % SESSION_HASH_BUCKETS; -} - -static int sess_ht_compare(unsigned long *key, hash_count_t keys, link_t *item) -{ - sess_node_t *sess = hash_table_get_instance(item, sess_node_t, link); - - return *key == (unsigned long) sess->sess_phone; -} - -static void sess_ht_remove(link_t *item) -{ -} - -static hash_table_operations_t session_hash_ops = { - .hash = sess_ht_hash, - .compare = sess_ht_compare, - .remove_callback = sess_ht_remove -}; + * List of all existing sessions. + */ +//static LIST_INITIALIZE(session_list); /** Initialize the async_sess subsystem. @@ -162,17 +132,20 @@ * Needs to be called prior to any other interface in this file. */ -int async_sess_init(void) +void _async_sess_init(void) { fibril_mutex_initialize(&async_sess_mutex); list_initialize(&inactive_conn_head); - return hash_table_create(&session_ht, SESSION_HASH_BUCKETS, 1, - &session_hash_ops); -} - -static void sess_node_initialize(sess_node_t *sess) -{ - link_initialize(&sess->link); +} + +void async_session_create(async_sess_t *sess, int phone) +{ + sess->sess_phone = phone; + list_initialize(&sess->conn_head); +} + +void async_session_destroy(async_sess_t *sess) +{ sess->sess_phone = -1; - list_initialize(&sess->conn_head); + /* todo */ } @@ -186,42 +159,14 @@ /** Start new transaction in a session. * - * @param sess_phone Phone representing the session. + * @param sess_phone Session. * @return Phone representing the new transaction or a negative error * code. */ -int async_transaction_begin(int sess_phone) -{ - unsigned long key = (unsigned long) sess_phone; - link_t *lnk; - sess_node_t *sess; +int async_transaction_begin(async_sess_t *sess) +{ conn_node_t *conn; int data_phone; fibril_mutex_lock(&async_sess_mutex); - lnk = hash_table_find(&session_ht, &key); - if (!lnk) { - /* - * The session node was not found in the hash table. Try to allocate - * and hash in a new one. - */ - sess = (sess_node_t *) malloc(sizeof(sess_node_t)); - if (!sess) { - /* - * As a possible improvement, we could make a one-time - * attempt to create a phone without trying to add the - * key node into the hash. - */ - fibril_mutex_unlock(&async_sess_mutex); - return ENOMEM; - } - sess_node_initialize(sess); - sess->sess_phone = sess_phone; - hash_table_insert(&session_ht, &key, &sess->link); - } else { - /* - * Found the session node. - */ - sess = hash_table_get_instance(lnk, sess_node_t, link); - } if (!list_empty(&sess->conn_head)) { @@ -242,5 +187,5 @@ */ retry: - data_phone = async_connect_me_to(sess_phone, 0, 0, 0); + data_phone = async_connect_me_to(sess->sess_phone, 0, 0, 0); if (data_phone >= 0) { /* success, do nothing */ @@ -276,18 +221,12 @@ /** Finish a transaction. * - * @param sess_phone Phone representing the session. + * @param sess Session. * @param data_phone Phone representing the transaction within the session. */ -void async_transaction_end(int sess_phone, int data_phone) -{ - unsigned long key = (unsigned long) sess_phone; - sess_node_t *sess; +void async_transaction_end(async_sess_t *sess, int data_phone) +{ conn_node_t *conn; - link_t *lnk; fibril_mutex_lock(&async_sess_mutex); - lnk = hash_table_find(&session_ht, &key); - assert(lnk); - sess = hash_table_get_instance(lnk, sess_node_t, link); conn = (conn_node_t *) malloc(sizeof(conn_node_t)); if (!conn) { Index: uspace/lib/c/generic/libc.c =================================================================== --- uspace/lib/c/generic/libc.c (revision 7907cf9b0f93fc54470f419cd7150c410ed1caa3) +++ uspace/lib/c/generic/libc.c (revision c1c0184baf11643c0fc4b19ac1d548092d587c73) @@ -66,5 +66,4 @@ __heap_init(); __async_init(); - (void) async_sess_init(); fibril_t *fibril = fibril_setup(); __tcb_set(fibril->tcb); Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision 7907cf9b0f93fc54470f419cd7150c410ed1caa3) +++ uspace/lib/c/include/async.h (revision c1c0184baf11643c0fc4b19ac1d548092d587c73) @@ -37,4 +37,5 @@ #include +#include #include #include Index: uspace/lib/c/include/async_sess.h =================================================================== --- uspace/lib/c/include/async_sess.h (revision 7907cf9b0f93fc54470f419cd7150c410ed1caa3) +++ uspace/lib/c/include/async_sess.h (revision c1c0184baf11643c0fc4b19ac1d548092d587c73) @@ -36,7 +36,16 @@ #define LIBC_ASYNC_SESS_H_ -extern int async_sess_init(void); -extern int async_transaction_begin(int); -extern void async_transaction_end(int, int); +#include + +typedef struct { + int sess_phone; /**< Phone for cloning off the connections. */ + link_t conn_head; /**< List of open data connections. */ +} async_sess_t; + +extern void _async_sess_init(void); +extern void async_session_create(async_sess_t *, int); +extern void async_session_destroy(async_sess_t *); +extern int async_transaction_begin(async_sess_t *); +extern void async_transaction_end(async_sess_t *, int); #endif Index: uspace/srv/vfs/vfs.h =================================================================== --- uspace/srv/vfs/vfs.h (revision 7907cf9b0f93fc54470f419cd7150c410ed1caa3) +++ uspace/srv/vfs/vfs.h (revision c1c0184baf11643c0fc4b19ac1d548092d587c73) @@ -34,4 +34,5 @@ #define VFS_VFS_H_ +#include #include #include @@ -54,5 +55,5 @@ fs_handle_t fs_handle; fibril_mutex_t phone_lock; - sysarg_t phone; + async_sess_t session; } fs_info_t; Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision 7907cf9b0f93fc54470f419cd7150c410ed1caa3) +++ uspace/srv/vfs/vfs_register.c (revision c1c0184baf11643c0fc4b19ac1d548092d587c73) @@ -111,4 +111,6 @@ void vfs_register(ipc_callid_t rid, ipc_call_t *request) { + int phone; + dprintf("Processing VFS_REGISTER request received from %p.\n", request->in_phone_hash); @@ -186,5 +188,7 @@ return; } - fs_info->phone = IPC_GET_ARG5(call); + + phone = IPC_GET_ARG5(call); + async_session_create(&fs_info->session, phone); ipc_answer_0(callid, EOK); @@ -200,5 +204,6 @@ list_remove(&fs_info->fs_link); fibril_mutex_unlock(&fs_head_lock); - ipc_hangup(fs_info->phone); + async_session_destroy(&fs_info->session); + ipc_hangup(phone); free(fs_info); ipc_answer_0(callid, EINVAL); @@ -214,5 +219,6 @@ list_remove(&fs_info->fs_link); fibril_mutex_unlock(&fs_head_lock); - ipc_hangup(fs_info->phone); + async_session_destroy(&fs_info->session); + ipc_hangup(phone); free(fs_info); ipc_answer_0(callid, EINVAL); @@ -270,5 +276,5 @@ fibril_mutex_unlock(&fs_head_lock); fibril_mutex_lock(&fs->phone_lock); - phone = async_transaction_begin(fs->phone); + phone = async_transaction_begin(&fs->session); fibril_mutex_unlock(&fs->phone_lock); @@ -296,5 +302,5 @@ fibril_mutex_unlock(&fs_head_lock); fibril_mutex_lock(&fs->phone_lock); - async_transaction_end(fs->phone, phone); + async_transaction_end(&fs->session, phone); fibril_mutex_unlock(&fs->phone_lock); return;