Changeset 9d12059 in mainline

Timestamp:

2011-01-09T12:16:00Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0c70f7e, a676574

Parents:

bc5ffeb

Message:

Pass arg1 directly to async_session_create(). arg1 will be used often, so make it easy to use. Also when arg1 is used as portid, (phone, portid) is a port reference, so the two fields belong together and could be potentially fused together in the future.

Location:

uspace

Files:

• lib/c/generic/async_sess.c (modified) (2 diffs)
• lib/c/include/async_sess.h (modified) (1 diff)
• srv/vfs/vfs_register.c (modified) (1 diff)

uspace/lib/c/generic/async_sess.c

@@ -150 +150 @@
  * @param sess  Session structure provided by caller, will be filled in.
  * @param phone Phone connected to the desired server task.
- */
-void async_session_create(async_sess_t *sess, int phone)
+ * @param arg1  Value to pass as first argument upon creating a new
+ *              connection. Typical use is to identify a resource within
+ *              the server that the caller wants to access (port ID,
+ *              interface ID, device ID, etc.).
+ */
+void async_session_create(async_sess_t *sess, int phone, sysarg_t arg1)
 {
         sess->sess_phone = phone;
-        sess->connect_arg1 = 0;
+        sess->connect_arg1 = arg1;
         list_initialize(&sess->conn_head);
         
@@ -160 +164 @@
         fibril_mutex_lock(&async_sess_mutex);
         list_append(&sess->sess_link, &session_list_head);
-        fibril_mutex_unlock(&async_sess_mutex);
-}
-
-void async_session_set_connect_args(async_sess_t *sess, sysarg_t arg1)
-{
-        fibril_mutex_lock(&async_sess_mutex);
-        sess->connect_arg1 = arg1;
         fibril_mutex_unlock(&async_sess_mutex);
 }

uspace/lib/c/include/async_sess.h

@@ -46 +46 @@
 
 extern void _async_sess_init(void);
-extern void async_session_create(async_sess_t *, int);
-extern void async_session_set_connect_args(async_sess_t *, sysarg_t);
+extern void async_session_create(async_sess_t *, int, sysarg_t);
 extern void async_session_destroy(async_sess_t *);
 extern int async_exchange_begin(async_sess_t *);

uspace/srv/vfs/vfs_register.c

@@ -188 +188 @@
         
         phone = IPC_GET_ARG5(call);
-        async_session_create(&fs_info->session, phone);
+        async_session_create(&fs_info->session, phone, 0);
         ipc_answer_0(callid, EOK);