Changeset 6675c70 in mainline

Timestamp:

2007-09-20T16:38:46Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f9ede5

Parents:

d2d0baf

Message:

In async_new_connection(), be more robust in the case that the function
is called by the server directly after its client accepts the
IPC_M_CONNECT_TO_ME call.

In fat.c main(), kill the "main" fibril and switch to the connection
fibril.

Location:

uspace

Files:

• lib/libc/generic/async.c (modified) (3 diffs)
• srv/fs/fat/fat.c (modified) (1 diff)

uspace/lib/libc/generic/async.c

@@ -458 +458 @@
  * @param in_phone_hash Identification of the incoming connection.
  * @param callid        Hash of the opening IPC_M_CONNECT_ME_TO call.
+ *                      If callid is zero, the connection was opened by
+ *                      accepting the IPC_M_CONNECT_TO_ME call and this function
+ *                      is called directly by the server.
  * @param call          Call data of the opening call.
  * @param cfibril       Fibril function that should be called upon opening the
@@ -472 +475 @@
         conn = malloc(sizeof(*conn));
         if (!conn) {
-                ipc_answer_fast(callid, ENOMEM, 0, 0);
+                if (callid)
+                        ipc_answer_fast(callid, ENOMEM, 0, 0);
                 return NULL;
         }
@@ -487 +491 @@
         if (!conn->wdata.fid) {
                 free(conn);
-                ipc_answer_fast(callid, ENOMEM, 0, 0);
+                if (callid)
+                        ipc_answer_fast(callid, ENOMEM, 0, 0);
                 return NULL;
         }

uspace/srv/fs/fat/fat.c

@@ -122 +122 @@
 
         /*
-         * TODO: Interestingly, if we return, the only thread dies.
+         * TODO: Interestingly, if we merely return, the only thread dies.
          *       If the only thread dies, the whole task is destroyed. 
          *       Prevent the thread from exiting when there are active fibrils.
          */
-        while(1)
-                usleep(1000000);
-        
+        fibril_schedule_next_adv(FIBRIL_FROM_DEAD);
+        /* not reached */
+
         return 0;
 }