Changeset 76b5a95c in mainline for uspace/lib/c/generic/async.c

Timestamp:

2011-03-23T20:53:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

71af5a4

Parents:

5716e9a (diff), ab10b842 (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.c (modified) (3 diffs)

uspace/lib/c/generic/async.c

@@ -430 +430 @@
         
         fid_t fid = fibril_create(notification_fibril, msg);
+        if (fid == 0) {
+                free(msg);
+                futex_up(&async_futex);
+                return false;
+        }
+        
         fibril_add_ready(fid);
         
@@ -681 +687 @@
         conn->wdata.fid = fibril_create(connection_fibril, conn);
         
-        if (!conn->wdata.fid) {
+        if (conn->wdata.fid == 0) {
                 free(conn);
+                
                 if (callid)
                         ipc_answer_0(callid, ENOMEM);
+                
                 return (uintptr_t) NULL;
         }
@@ -853 +861 @@
 {
         fid_t fid = fibril_create(async_manager_fibril, NULL);
-        fibril_add_manager(fid);
+        if (fid != 0)
+                fibril_add_manager(fid);
 }