Changeset a2cd194 in mainline for libc/generic/async.c

Timestamp:

2006-05-22T11:14:25Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8bc924e

Parents:

6862338

Message:

Added some cleanups.

File:

• libc/generic/async.c (modified) (8 diffs)

libc/generic/async.c

@@ -74 +74 @@
  *       ....
  * }
+ *
+ * TODO: Detaching/joining dead psthreads? */
  */
 #include <futex.h>
@@ -100 +102 @@
         pstid_t ptid;                /**< Thread associated with this connection */
         int active;                     /**< If this thread is currently active */
-        int opened;                    /* If the connection was accepted */
         /* Structures for connection opening packet */
         ipc_callid_t callid;
@@ -110 +111 @@
 /* Hash table functions */
 
-#define ASYNC_HASH_TABLE_CHAINS 32
+#define CONN_HASH_TABLE_CHAINS  32
 
 static hash_index_t conn_hash(unsigned long *key)
 {
         assert(key);
-        return ((*key) >> 4) % ASYNC_HASH_TABLE_CHAINS;
+        return ((*key) >> 4) % CONN_HASH_TABLE_CHAINS;
 }
 
@@ -175 +176 @@
 }
 
+/** Return new incoming message for current(thread-local) connection */
 ipc_callid_t async_get_call(ipc_call_t *call)
 {
@@ -200 +202 @@
 }
 
+/** Thread function that gets created on new connection
+ *
+ * This function is defined as a weak symbol - to be redefined in
+ * user code.
+ */
 void client_connection(ipc_callid_t callid, ipc_call_t *call)
 {
-        printf("Got connection - no handler.\n");
-        _exit(1);
-}
-
+        ipc_answer_fast(callid, ENOENT, 0, 0);
+}
+
+/** Wrapper for client connection thread
+ *
+ * When new connection arrives, thread with this function is created.
+ * It calls client_connection and does final cleanup.
+ *
+ * @parameter arg Connection structure pointer
+ */
 static int connection_thread(void  *arg)
 {
+        unsigned long key;
+        msg_t *msg;
+
         /* Setup thread local connection pointer */
         PS_connection = (connection_t *)arg;
         client_connection(PS_connection->callid, &PS_connection->call);
 
+        /* Remove myself from connection hash table */
         futex_down(&conn_futex);
-        /* TODO: remove myself from connection hash table */
+        key = PS_connection->in_phone_hash;
+        hash_table_remove(&conn_hash_table, &key, 1);
         futex_up(&conn_futex);
-        /* TODO: answer all unanswered messages in queue with
-         *       EHANGUP */
+        /* Answer all remaining messages with ehangup */
+        while (!list_empty(&PS_connection->msg_queue)) {
+                msg = list_get_instance(PS_connection->msg_queue.next, msg_t, link);
+                list_remove(&msg->link);
+                ipc_answer_fast(msg->callid, EHANGUP, 0, 0);
+                free(msg);
+        }
 }
 
@@ -239 +262 @@
         conn->in_phone_hash = IPC_GET_ARG3(*call);
         list_initialize(&conn->msg_queue);
-        conn->opened = 0;
         conn->ptid = psthread_create(connection_thread, conn);
         conn->callid = callid;
@@ -298 +320 @@
 }
 
+/** Function to start async_manager as a standalone thread 
+ * 
+ * When more kernel threads are used, one async manager should
+ * exist per thread. The particular implementation may change,
+ * currently one async_manager is started automatically per kernel
+ * thread except main thread. 
+ */
 static int async_manager_thread(void *arg)
 {
@@ -323 +352 @@
 int _async_init(void)
 {
-        if (!hash_table_create(&conn_hash_table, ASYNC_HASH_TABLE_CHAINS, 1, &conn_hash_table_ops)) {
+        if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_CHAINS, 1, &conn_hash_table_ops)) {
                 printf("%s: cannot create hash table\n", "async");
                 return ENOMEM;