Changes in uspace/lib/c/generic/async_sess.c [8b5c8ae:8cd21d16] in mainline

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 connections. */
+        link_t global_link;     /**< Link for the global list of inactive connectinos. */
         int data_phone;         /**< Connected data phone. */
 } conn_node_t;
 
 /**
- * Mutex protecting the inactive_conn_head list, the session list and the
- * avail_phone condition variable.
+ * Mutex protecting the inactive_conn_head list and the session list.
  */
 static fibril_mutex_t async_sess_mutex;
@@ -129 +128 @@
  */
 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.
@@ -156 +150 @@
  * @param sess  Session structure provided by caller, will be filled in.
  * @param phone Phone connected to the desired server task.
- * @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)
+ */
+void async_session_create(async_sess_t *sess, int phone)
 {
         sess->sess_phone = phone;
-        sess->connect_arg1 = arg1;
         list_initialize(&sess->conn_head);
         
@@ -203 +192 @@
                 free(conn);
         }
-        
-        fibril_condvar_broadcast(&avail_phone_cv);
 }
 
@@ -244 +231 @@
                  */
 retry:
-                data_phone = async_connect_me_to(sess->sess_phone,
-                    sess->connect_arg1, 0, 0);
+                data_phone = async_connect_me_to(sess->sess_phone, 0, 0, 0);
                 if (data_phone >= 0) {
                         /* success, do nothing */
@@ -264 +250 @@
                 } else {
                         /*
-                         * Wait for a phone to become available.
+                         * 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).
                          */
-                        fibril_condvar_wait(&avail_phone_cv, &async_sess_mutex);
-                        goto retry;
+                        data_phone = ELIMIT;
                 }
         }
@@ -285 +273 @@
 
         fibril_mutex_lock(&async_sess_mutex);
-        fibril_condvar_signal(&avail_phone_cv);
         conn = (conn_node_t *) malloc(sizeof(conn_node_t));
         if (!conn) {
@@ -292 +279 @@
                  * means that we simply hang up.
                  */
+                fibril_mutex_unlock(&async_sess_mutex);
                 ipc_hangup(data_phone);
-                fibril_mutex_unlock(&async_sess_mutex);
                 return;
         }