Changes in uspace/lib/c/generic/async.c [b7fd2a0:6a5d05b] in mainline

File:

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

uspace/lib/c/generic/async.c

@@ -205 +205 @@
         ipc_call_t *dataptr;
         
-        errno_t retval;
+        int retval;
 } amsg_t;
 
@@ -511 +511 @@
 static FIBRIL_CONDVAR_INITIALIZE(avail_phone_cv);
 
-errno_t async_create_port(iface_t iface, async_port_handler_t handler,
+int async_create_port(iface_t iface, async_port_handler_t handler,
     void *data, port_id_t *port_id)
 {
@@ -698 +698 @@
  *
  */
-static errno_t connection_fibril(void *arg)
+static int connection_fibril(void *arg)
 {
         assert(arg);
@@ -847 +847 @@
  *
  */
-errno_t async_create_callback_port(async_exch_t *exch, iface_t iface, sysarg_t arg1,
+int async_create_callback_port(async_exch_t *exch, iface_t iface, sysarg_t arg1,
     sysarg_t arg2, async_port_handler_t handler, void *data, port_id_t *port_id)
 {
@@ -860 +860 @@
             &answer);
         
-        errno_t ret;
+        int ret;
         async_wait_for(req, &ret);
         if (ret != EOK)
-                return (errno_t) ret;
+                return (int) ret;
         
         sysarg_t phone_hash = IPC_GET_ARG5(answer);
@@ -1056 +1056 @@
  *
  */
-errno_t async_irq_subscribe(int inr, async_notification_handler_t handler,
+int async_irq_subscribe(int inr, async_notification_handler_t handler,
     void *data, const irq_code_t *ucode, cap_handle_t *handle)
 {
@@ -1078 +1078 @@
         
         cap_handle_t cap;
-        errno_t rc = ipc_irq_subscribe(inr, imethod, ucode, &cap);
+        int rc = ipc_irq_subscribe(inr, imethod, ucode, &cap);
         if (rc == EOK && handle != NULL) {
                 *handle = cap;
@@ -1092 +1092 @@
  *
  */
-errno_t async_irq_unsubscribe(int cap)
+int async_irq_unsubscribe(int cap)
 {
         // TODO: Remove entry from hash table
@@ -1109 +1109 @@
  *
  */
-errno_t async_event_subscribe(event_type_t evno,
+int async_event_subscribe(event_type_t evno,
     async_notification_handler_t handler, void *data)
 {
@@ -1142 +1142 @@
  *
  */
-errno_t async_event_task_subscribe(event_task_type_t evno,
+int async_event_task_subscribe(event_task_type_t evno,
     async_notification_handler_t handler, void *data)
 {
@@ -1173 +1173 @@
  *
  */
-errno_t async_event_unmask(event_type_t evno)
+int async_event_unmask(event_type_t evno)
 {
         return ipc_event_unmask(evno);
@@ -1185 +1185 @@
  *
  */
-errno_t async_event_task_unmask(event_task_type_t evno)
+int async_event_task_unmask(event_task_type_t evno)
 {
         return ipc_event_task_unmask(evno);
@@ -1437 +1437 @@
  *
  */
-static errno_t async_manager_worker(void)
+static int async_manager_worker(void)
 {
         while (true) {
@@ -1489 +1489 @@
                 
                 ipc_call_t call;
-                errno_t rc = ipc_wait_cycle(&call, timeout, flags);
+                int rc = ipc_wait_cycle(&call, timeout, flags);
                 
                 atomic_dec(&threads_in_ipc_wait);
@@ -1521 +1521 @@
  *
  */
-static errno_t async_manager_fibril(void *arg)
+static int async_manager_fibril(void *arg)
 {
         futex_up(&async_futex);
@@ -1597 +1597 @@
  *
  */
-void reply_received(void *arg, errno_t retval, ipc_call_t *data)
+void reply_received(void *arg, int retval, ipc_call_t *data)
 {
         assert(arg);
@@ -1709 +1709 @@
  *
  */
-void async_wait_for(aid_t amsgid, errno_t *retval)
+void async_wait_for(aid_t amsgid, int *retval)
 {
         assert(amsgid);
@@ -1755 +1755 @@
  *
  */
-errno_t async_wait_timeout(aid_t amsgid, errno_t *retval, suseconds_t timeout)
+int async_wait_timeout(aid_t amsgid, int *retval, suseconds_t timeout)
 {
         assert(amsgid);
@@ -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);
 }
 
@@ -1918 +1915 @@
  *
  */
-errno_t async_req_fast(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
+int async_req_fast(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
     sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
@@ -1929 +1926 @@
             &result);
         
-        errno_t rc;
+        int rc;
         async_wait_for(aid, &rc);
         
@@ -1970 +1967 @@
  *
  */
-errno_t async_req_slow(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
+int async_req_slow(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
@@ -1981 +1978 @@
             &result);
         
-        errno_t rc;
+        int rc;
         async_wait_for(aid, &rc);
         
@@ -2045 +2042 @@
 }
 
-errno_t async_answer_0(cap_handle_t chandle, errno_t retval)
+int async_answer_0(cap_handle_t chandle, int retval)
 {
         return ipc_answer_0(chandle, retval);
 }
 
-errno_t async_answer_1(cap_handle_t chandle, errno_t retval, sysarg_t arg1)
+int async_answer_1(cap_handle_t chandle, int retval, sysarg_t arg1)
 {
         return ipc_answer_1(chandle, retval, arg1);
 }
 
-errno_t async_answer_2(cap_handle_t chandle, errno_t retval, sysarg_t arg1,
+int async_answer_2(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2)
 {
@@ -2061 +2058 @@
 }
 
-errno_t async_answer_3(cap_handle_t chandle, errno_t retval, sysarg_t arg1,
+int async_answer_3(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3)
 {
@@ -2067 +2064 @@
 }
 
-errno_t async_answer_4(cap_handle_t chandle, errno_t retval, sysarg_t arg1,
+int async_answer_4(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
@@ -2073 +2070 @@
 }
 
-errno_t async_answer_5(cap_handle_t chandle, errno_t retval, sysarg_t arg1,
+int async_answer_5(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
 {
@@ -2079 +2076 @@
 }
 
-errno_t async_forward_fast(cap_handle_t chandle, async_exch_t *exch,
+int async_forward_fast(cap_handle_t chandle, async_exch_t *exch,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, unsigned int mode)
 {
@@ -2088 +2085 @@
 }
 
-errno_t async_forward_slow(cap_handle_t chandle, async_exch_t *exch,
+int async_forward_slow(cap_handle_t chandle, async_exch_t *exch,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
     sysarg_t arg4, sysarg_t arg5, unsigned int mode)
@@ -2111 +2108 @@
  *
  */
-errno_t async_connect_to_me(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
+int async_connect_to_me(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
     sysarg_t arg3)
 {
@@ -2121 +2118 @@
             &answer);
         
-        errno_t rc;
+        int rc;
         async_wait_for(req, &rc);
         if (rc != EOK)
-                return (errno_t) rc;
+                return (int) rc;
         
         return EOK;
 }
 
-static errno_t async_connect_me_to_internal(int phone, sysarg_t arg1, sysarg_t arg2,
+static int async_connect_me_to_internal(int phone, sysarg_t arg1, sysarg_t arg2,
     sysarg_t arg3, sysarg_t arg4, int *out_phone)
 {
@@ -2148 +2145 @@
             msg, reply_received);
         
-        errno_t rc;
+        int rc;
         async_wait_for((aid_t) msg, &rc);
         
@@ -2186 +2183 @@
         
         int phone;
-        errno_t rc = async_connect_me_to_internal(exch->phone, arg1, arg2, arg3,
+        int rc = async_connect_me_to_internal(exch->phone, arg1, arg2, arg3,
             0, &phone);
         if (rc != EOK) {
@@ -2239 +2236 @@
         
         int phone;
-        errno_t rc = async_connect_me_to_internal(exch->phone, iface, arg2,
+        int rc = async_connect_me_to_internal(exch->phone, iface, arg2,
             arg3, 0, &phone);
         if (rc != EOK) {
@@ -2310 +2307 @@
         
         int phone;
-        errno_t rc = async_connect_me_to_internal(exch->phone, arg1, arg2, arg3,
+        int rc = async_connect_me_to_internal(exch->phone, arg1, arg2, arg3,
             IPC_FLAG_BLOCKING, &phone);
         
@@ -2364 +2361 @@
         
         int phone;
-        errno_t rc = async_connect_me_to_internal(exch->phone, iface, arg2,
+        int rc = async_connect_me_to_internal(exch->phone, iface, arg2,
             arg3, IPC_FLAG_BLOCKING, &phone);
         if (rc != EOK) {
@@ -2400 +2397 @@
         
         cap_handle_t phone;
-        errno_t rc = ipc_connect_kbox(id, &phone);
+        int rc = ipc_connect_kbox(id, &phone);
         if (rc != EOK) {
                 errno = rc;
@@ -2424 +2421 @@
 }
 
-static errno_t async_hangup_internal(int phone)
+static int async_hangup_internal(int phone)
 {
         return ipc_hangup(phone);
@@ -2436 +2433 @@
  *
  */
-errno_t async_hangup(async_sess_t *sess)
+int async_hangup(async_sess_t *sess)
 {
         async_exch_t *exch;
@@ -2447 +2444 @@
         fibril_mutex_lock(&async_sess_mutex);
         
-        errno_t rc = async_hangup_internal(sess->phone);
+        int rc = async_hangup_internal(sess->phone);
         
         while (!list_empty(&sess->exch_list)) {
@@ -2519 +2516 @@
                 } else if (mgmt == EXCHANGE_PARALLEL) {
                         int phone;
-                        errno_t rc;
+                        int rc;
                         
                 retry:
@@ -2616 +2613 @@
  *
  */
-errno_t async_share_in_start(async_exch_t *exch, size_t size, sysarg_t arg,
+int async_share_in_start(async_exch_t *exch, size_t size, sysarg_t arg,
     unsigned int *flags, void **dst)
 {
@@ -2624 +2621 @@
         sysarg_t _flags = 0;
         sysarg_t _dst = (sysarg_t) -1;
-        errno_t res = async_req_2_4(exch, IPC_M_SHARE_IN, (sysarg_t) size,
+        int res = async_req_2_4(exch, IPC_M_SHARE_IN, (sysarg_t) size,
             arg, NULL, &_flags, NULL, &_dst);
         
@@ -2676 +2673 @@
  *
  */
-errno_t async_share_in_finalize(cap_handle_t chandle, void *src, unsigned int flags)
+int async_share_in_finalize(cap_handle_t chandle, void *src, unsigned int flags)
 {
         return ipc_answer_3(chandle, EOK, (sysarg_t) src, (sysarg_t) flags,
@@ -2691 +2688 @@
  *
  */
-errno_t async_share_out_start(async_exch_t *exch, void *src, unsigned int flags)
+int async_share_out_start(async_exch_t *exch, void *src, unsigned int flags)
 {
         if (exch == NULL)
@@ -2746 +2743 @@
  *
  */
-errno_t async_share_out_finalize(cap_handle_t chandle, void **dst)
+int async_share_out_finalize(cap_handle_t chandle, void **dst)
 {
         return ipc_answer_2(chandle, EOK, (sysarg_t) __entry, (sysarg_t) dst);
@@ -2777 +2774 @@
  *
  */
-errno_t async_data_read_start(async_exch_t *exch, void *dst, size_t size)
+int async_data_read_start(async_exch_t *exch, void *dst, size_t size)
 {
         if (exch == NULL)
@@ -2851 +2848 @@
  *
  */
-errno_t async_data_read_finalize(cap_handle_t chandle, const void *src, size_t size)
+int async_data_read_finalize(cap_handle_t chandle, const void *src, size_t size)
 {
         return ipc_answer_2(chandle, EOK, (sysarg_t) src, (sysarg_t) size);
@@ -2859 +2856 @@
  *
  */
-errno_t async_data_read_forward_fast(async_exch_t *exch, sysarg_t imethod,
+int async_data_read_forward_fast(async_exch_t *exch, sysarg_t imethod,
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4,
     ipc_call_t *dataptr)
@@ -2879 +2876 @@
         }
         
-        errno_t retval = ipc_forward_fast(chandle, exch->phone, 0, 0, 0,
+        int retval = ipc_forward_fast(chandle, exch->phone, 0, 0, 0,
             IPC_FF_ROUTE_FROM_ME);
         if (retval != EOK) {
@@ -2887 +2884 @@
         }
         
-        errno_t rc;
+        int rc;
         async_wait_for(msg, &rc);
         
-        return (errno_t) rc;
+        return (int) rc;
 }
 
@@ -2902 +2899 @@
  *
  */
-errno_t async_data_write_start(async_exch_t *exch, const void *src, size_t size)
+int async_data_write_start(async_exch_t *exch, const void *src, size_t size)
 {
         if (exch == NULL)
@@ -2976 +2973 @@
  *
  */
-errno_t async_data_write_finalize(cap_handle_t chandle, void *dst, size_t size)
+int async_data_write_finalize(cap_handle_t chandle, void *dst, size_t size)
 {
         return ipc_answer_2(chandle, EOK, (sysarg_t) dst, (sysarg_t) size);
@@ -3002 +2999 @@
  *
  */
-errno_t async_data_write_accept(void **data, const bool nullterm,
+int async_data_write_accept(void **data, const bool nullterm,
     const size_t min_size, const size_t max_size, const size_t granularity,
     size_t *received)
@@ -3042 +3039 @@
         }
         
-        errno_t rc = async_data_write_finalize(chandle, arg_data, size);
+        int rc = async_data_write_finalize(chandle, arg_data, size);
         if (rc != EOK) {
                 free(arg_data);
@@ -3065 +3062 @@
  *
  */
-void async_data_write_void(errno_t retval)
+void async_data_write_void(int retval)
 {
         cap_handle_t chandle;
@@ -3075 +3072 @@
  *
  */
-errno_t async_data_write_forward_fast(async_exch_t *exch, sysarg_t imethod,
+int async_data_write_forward_fast(async_exch_t *exch, sysarg_t imethod,
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4,
     ipc_call_t *dataptr)
@@ -3095 +3092 @@
         }
         
-        errno_t retval = ipc_forward_fast(chandle, exch->phone, 0, 0, 0,
+        int retval = ipc_forward_fast(chandle, exch->phone, 0, 0, 0,
             IPC_FF_ROUTE_FROM_ME);
         if (retval != EOK) {
@@ -3103 +3100 @@
         }
         
-        errno_t rc;
+        int rc;
         async_wait_for(msg, &rc);
         
-        return (errno_t) rc;
+        return (int) rc;
 }
 
@@ -3200 +3197 @@
 }
 
-errno_t async_state_change_start(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
+int async_state_change_start(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
     sysarg_t arg3, async_exch_t *other_exch)
 {
@@ -3228 +3225 @@
 }
 
-errno_t async_state_change_finalize(cap_handle_t chandle, async_exch_t *other_exch)
+int async_state_change_finalize(cap_handle_t chandle, async_exch_t *other_exch)
 {
         return ipc_answer_1(chandle, EOK, other_exch->phone);