Changeset b7fd2a0 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

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

uspace/lib/c/generic/async.c

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