Changeset 8b5690f in mainline for uspace/lib/c/generic/async_sess.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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:

Merge mainline changes.

File:

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

uspace/lib/c/generic/async_sess.c

@@ -99 +99 @@
 
 #include <async_sess.h>
-#include <ipc/ipc.h>
 #include <fibril_synch.h>
 #include <adt/list.h>
@@ -106 +105 @@
 #include <errno.h>
 #include <assert.h>
+#include "private/async_sess.h"
 
 /** An inactive open connection. */
 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;
@@ -129 +130 @@
 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.
  *
  * Needs to be called prior to any other interface in this file.
- */
-void _async_sess_init(void)
+ *
+ */
+void __async_sess_init(void)
 {
         fibril_mutex_initialize(&async_sess_mutex);
@@ -194 +201 @@
                 list_remove(&conn->global_link);
                 
-                ipc_hangup(conn->data_phone);
+                async_hangup(conn->data_phone);
                 free(conn);
         }
+        
+        fibril_condvar_broadcast(&avail_phone_cv);
 }
 
@@ -252 +261 @@
                         data_phone = conn->data_phone;
                         free(conn);
-                        ipc_hangup(data_phone);
+                        async_hangup(data_phone);
                         goto retry;
                 } 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;
                 }
         }
@@ -279 +286 @@
 
         fibril_mutex_lock(&async_sess_mutex);
+        fibril_condvar_signal(&avail_phone_cv);
         conn = (conn_node_t *) malloc(sizeof(conn_node_t));
         if (!conn) {
@@ -285 +293 @@
                  * means that we simply hang up.
                  */
+                async_hangup(data_phone);
                 fibril_mutex_unlock(&async_sess_mutex);
-                ipc_hangup(data_phone);
                 return;
         }