Changeset b7fd2a0 in mainline for kernel/generic/src/synch

Timestamp:

2018-01-13T03:10:29Z (8 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.

Location:

kernel/generic/src/synch

Files:

• condvar.c (modified) (3 diffs)
• futex.c (modified) (5 diffs)
• mutex.c (modified) (1 diff)
• rcu.c (modified) (2 diffs)
• semaphore.c (modified) (1 diff)
• smc.c (modified) (1 diff)
• smp_memory_barrier.c (modified) (1 diff)
• waitq.c (modified) (3 diffs)
• workqueue.c (modified) (1 diff)

kernel/generic/src/synch/condvar.c

@@ -85 +85 @@
  * @return              See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
+errno_t _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         ipl_t ipl;
         bool blocked;
@@ -124 +124 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
+errno_t _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         ipl_t ipl;
         bool blocked;
@@ -161 +161 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock, 
+errno_t _condvar_wait_timeout_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock, 
         uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         /* Save spinlock's state so we can restore it correctly later on. */
         ipl_t ipl = irq_lock->ipl;

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;
         }
 }

kernel/generic/src/synch/mutex.c

@@ -85 +85 @@
  *
  */
-int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, unsigned int flags)
+errno_t _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, unsigned int flags)
 {
-        int rc;
+        errno_t rc;
 
         if (mtx->type == MUTEX_PASSIVE && THREAD) {

kernel/generic/src/synch/rcu.c

@@ -957 +957 @@
                         
                         /* Wait for the GP to complete. */
-                        int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
+                        errno_t ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
                                 SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
                         
@@ -1013 +1013 @@
                 spinlock_lock(&rcu.gp_lock);
 
-                int ret = 0;
+                errno_t ret = 0;
                 ret = _condvar_wait_timeout_spinlock(&rcu.expedite_now, &rcu.gp_lock,
                         DETECT_SLEEP_MS * 1000, SYNCH_FLAGS_INTERRUPTIBLE);

kernel/generic/src/synch/semaphore.c

@@ -71 +71 @@
  *
  */
-int _semaphore_down_timeout(semaphore_t *sem, uint32_t usec, unsigned int flags)
+errno_t _semaphore_down_timeout(semaphore_t *sem, uint32_t usec, unsigned int flags)
 {
         return waitq_sleep_timeout(&sem->wq, usec, flags, NULL);

kernel/generic/src/synch/smc.c

@@ -43 +43 @@
 #include <mm/as.h>
 
-sysarg_t sys_smc_coherence(uintptr_t va, size_t size)
+sys_errno_t sys_smc_coherence(uintptr_t va, size_t size)
 {
         if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE))

kernel/generic/src/synch/smp_memory_barrier.c

@@ -51 +51 @@
  * @return Irrelevant.
  */
-sysarg_t sys_smp_memory_barrier(void)
+sys_errno_t sys_smp_memory_barrier(void)
 {
         for (unsigned int cpu_id = 0; cpu_id < config.cpu_active; ++cpu_id) {

kernel/generic/src/synch/waitq.c

@@ -268 +268 @@
  *
  */
-int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
+errno_t waitq_sleep_timeout(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
 {
         assert((!PREEMPTION_DISABLED) || (PARAM_NON_BLOCKING(flags, usec)));
@@ -274 +274 @@
         ipl_t ipl = waitq_sleep_prepare(wq);
         bool nblocked;
-        int rc = waitq_sleep_timeout_unsafe(wq, usec, flags, &nblocked);
+        errno_t rc = waitq_sleep_timeout_unsafe(wq, usec, flags, &nblocked);
         waitq_sleep_finish(wq, nblocked, ipl);
 
@@ -373 +373 @@
  *
  */
-int waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
+errno_t waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
 {
         *blocked = false;

kernel/generic/src/synch/workqueue.c

@@ -895 +895 @@
         
         while (list_empty(&info->work_queues) && !stop) {
-                int ret = _condvar_wait_timeout_irq_spinlock(&info->req_cv, 
+                errno_t ret = _condvar_wait_timeout_irq_spinlock(&info->req_cv, 
                         &info->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);