Changeset 50f19b7 in mainline

Timestamp:

2018-01-13T08:42:30Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

18bb198, a0a9cc2

Parents:

a53ed3a (diff), 6a5d05b (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.

git-author:

Jakub Jermář <jakub@…> (2018-01-13 08:42:30)

git-committer:

GitHub <noreply@…> (2018-01-13 08:42:30)

Message:

Merge pull request #14 from Aearsis/master

async_usleep: no need to use a heap-allocated amsg_t

File:

• uspace/lib/c/generic/async.c (modified) (2 diffs)

uspace/lib/c/generic/async.c

@@ -1856 +1856 @@
 void async_usleep(suseconds_t timeout)
 {
-        amsg_t *msg = amsg_create();
-        if (!msg)
-                return;
-        
-        msg->wdata.fid = fibril_get_id();
-        
-        getuptime(&msg->wdata.to_event.expires);
-        tv_add_diff(&msg->wdata.to_event.expires, timeout);
+        awaiter_t awaiter;
+        awaiter_initialize(&awaiter);
+        
+        awaiter.fid = fibril_get_id();
+        
+        getuptime(&awaiter.to_event.expires);
+        tv_add_diff(&awaiter.to_event.expires, timeout);
         
         futex_down(&async_futex);
         
-        async_insert_timeout(&msg->wdata);
+        async_insert_timeout(&awaiter);
         
         /* Leave the async_futex locked when entering this function */
@@ -1873 +1872 @@
         
         /* Futex is up automatically after fibril_switch() */
-        
-        amsg_destroy(msg);
 }