Changeset f401312 in mainline for uspace/lib/c/generic/async_sess.c

Timestamp:

2011-01-14T12:34:42Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

45019865

Parents:

b2a6fcfe (diff), 6610565b (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:

Merged development into lelian/hidd

File:

• uspace/lib/c/generic/async_sess.c (modified) (8 diffs)

uspace/lib/c/generic/async_sess.c

@@ -110 +110 @@
 typedef struct {
         link_t sess_link;       /**< Link for the session list of inactive connections. */
-        link_t global_link;     /**< Link for the global list of inactive connectinos. */
+        link_t global_link;     /**< Link for the global list of inactive connections. */
         int data_phone;         /**< Connected data phone. */
 } conn_node_t;
 
 /**
- * Mutex protecting the inactive_conn_head list and the session list.
+ * Mutex protecting the inactive_conn_head list, the session list and the
+ * avail_phone condition variable.
  */
 static fibril_mutex_t async_sess_mutex;
@@ -128 +129 @@
  */
 static LIST_INITIALIZE(session_list_head);
+
+/**
+ * Condition variable used to wait for a phone to become available.
+ */
+static FIBRIL_CONDVAR_INITIALIZE(avail_phone_cv);
 
 /** Initialize the async_sess subsystem.
@@ -150 +156 @@
  * @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 = arg1;
         list_initialize(&sess->conn_head);
         
@@ -192 +203 @@
                 free(conn);
         }
+        
+        fibril_condvar_broadcast(&avail_phone_cv);
 }
 
@@ -231 +244 @@
                  */
 retry:
-                data_phone = async_connect_me_to(sess->sess_phone, 0, 0, 0);
+                data_phone = async_connect_me_to(sess->sess_phone,
+                    sess->connect_arg1, 0, 0);
                 if (data_phone >= 0) {
                         /* success, do nothing */
@@ -250 +264 @@
                 } else {
                         /*
-                         * This is unfortunate. We failed both to find a cached
-                         * connection or to create a new one even after cleaning up
-                         * the cache. This is most likely due to too many
-                         * open sessions (connected session phones).
+                         * Wait for a phone to become available.
                          */
-                        data_phone = ELIMIT;
+                        fibril_condvar_wait(&avail_phone_cv, &async_sess_mutex);
+                        goto retry;
                 }
         }
@@ -273 +285 @@
 
         fibril_mutex_lock(&async_sess_mutex);
+        fibril_condvar_signal(&avail_phone_cv);
         conn = (conn_node_t *) malloc(sizeof(conn_node_t));
         if (!conn) {
@@ -279 +292 @@
                  * means that we simply hang up.
                  */
+                ipc_hangup(data_phone);
                 fibril_mutex_unlock(&async_sess_mutex);
-                ipc_hangup(data_phone);
                 return;
         }