Changeset b7fd2a0 in mainline for kernel/generic/src/synch/futex.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:

• kernel/generic/src/synch/futex.c (modified) (5 diffs)

kernel/generic/src/synch/futex.c

@@ -398 +398 @@
  *                      waitq_sleep_timeout().
  */
-sysarg_t sys_futex_sleep(uintptr_t uaddr)
+sys_errno_t sys_futex_sleep(uintptr_t uaddr)
 {
         futex_t *futex = get_futex(uaddr);
         
         if (!futex) 
-                return (sysarg_t) ENOENT;
+                return (sys_errno_t) ENOENT;
 
 #ifdef CONFIG_UDEBUG
@@ -409 +409 @@
 #endif
 
-        int rc = waitq_sleep_timeout(
+        errno_t rc = waitq_sleep_timeout(
             &futex->wq, 0, SYNCH_FLAGS_INTERRUPTIBLE, NULL);
 
@@ -416 +416 @@
 #endif
 
-        return (sysarg_t) rc;
+        return (sys_errno_t) rc;
 }
 
@@ -425 +425 @@
  * @return              ENOENT if there is no physical mapping for uaddr.
  */
-sysarg_t sys_futex_wakeup(uintptr_t uaddr)
+sys_errno_t sys_futex_wakeup(uintptr_t uaddr)
 {
         futex_t *futex = get_futex(uaddr);
@@ -433 +433 @@
                 return EOK;
         } else {
-                return (sysarg_t) ENOENT;
+                return (sys_errno_t) ENOENT;
         }
 }