Changeset 89ea2dc in mainline

Timestamp:

2017-12-19T17:35:28Z (6 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:

d0c2beb

Parents:

7565a4b

Message:

Functions that return true/false should have bool as a return type.

Location:

kernel/generic

Files:

• include/adt/bitmap.h (modified) (2 diffs)
• include/synch/spinlock.h (modified) (2 diffs)
• include/synch/workqueue.h (modified) (1 diff)
• src/adt/bitmap.c (modified) (1 diff)
• src/synch/spinlock.c (modified) (3 diffs)
• src/synch/workqueue.c (modified) (5 diffs)

kernel/generic/include/adt/bitmap.h

@@ -37 +37 @@
 
 #include <stddef.h>
+#include <stdbool.h>
 
 #define BITMAP_ELEMENT   8
@@ -81 +82 @@
 extern void bitmap_clear_range(bitmap_t *, size_t, size_t);
 
-extern int bitmap_allocate_range(bitmap_t *, size_t, size_t, size_t, size_t,
+extern bool bitmap_allocate_range(bitmap_t *, size_t, size_t, size_t, size_t,
     size_t *);
 extern void bitmap_copy(bitmap_t *, bitmap_t *, size_t);

kernel/generic/include/synch/spinlock.h

@@ -112 +112 @@
 
 extern void spinlock_initialize(spinlock_t *, const char *);
-extern int spinlock_trylock(spinlock_t *);
+extern bool spinlock_trylock(spinlock_t *);
 extern void spinlock_lock_debug(spinlock_t *);
 extern void spinlock_unlock_debug(spinlock_t *);
@@ -287 +287 @@
 extern void irq_spinlock_lock(irq_spinlock_t *, bool);
 extern void irq_spinlock_unlock(irq_spinlock_t *, bool);
-extern int irq_spinlock_trylock(irq_spinlock_t *);
+extern bool irq_spinlock_trylock(irq_spinlock_t *);
 extern void irq_spinlock_pass(irq_spinlock_t *, irq_spinlock_t *);
 extern void irq_spinlock_exchange(irq_spinlock_t *, irq_spinlock_t *);

kernel/generic/include/synch/workqueue.h

@@ -61 +61 @@
 extern void workq_global_worker_init(void);
 extern void workq_global_stop(void);
-extern int workq_global_enqueue_noblock(work_t *, work_func_t);
-extern int workq_global_enqueue(work_t *, work_func_t);
+extern bool workq_global_enqueue_noblock(work_t *, work_func_t);
+extern bool workq_global_enqueue(work_t *, work_func_t);
 
 extern struct work_queue * workq_create(const char *);
 extern void workq_destroy(struct work_queue *);
-extern int workq_init(struct work_queue *, const char *);
+extern bool workq_init(struct work_queue *, const char *);
 extern void workq_stop(struct work_queue *);
-extern int workq_enqueue_noblock(struct work_queue *, work_t *, work_func_t);
-extern int workq_enqueue(struct work_queue *, work_t *, work_func_t);
+extern bool workq_enqueue_noblock(struct work_queue *, work_t *, work_func_t);
+extern bool workq_enqueue(struct work_queue *, work_t *, work_func_t);
 
 extern void workq_print_info(struct work_queue *);

kernel/generic/src/adt/bitmap.c

@@ -269 +269 @@
  *
  */
-int bitmap_allocate_range(bitmap_t *bitmap, size_t count, size_t base,
+bool bitmap_allocate_range(bitmap_t *bitmap, size_t count, size_t base,
     size_t prefered, size_t constraint, size_t *index)
 {

kernel/generic/src/synch/spinlock.c

@@ -153 +153 @@
  *
  */
-int spinlock_trylock(spinlock_t *lock)
+bool spinlock_trylock(spinlock_t *lock)
 {
         preemption_disable();
-        int rc = !test_and_set(&lock->val);
+        bool ret = !test_and_set(&lock->val);
         
         /*
@@ -163 +163 @@
         CS_ENTER_BARRIER();
         
-        if (!rc)
+        if (!ret)
                 preemption_enable();
         
-        return rc;
+        return ret;
 }
 
@@ -257 +257 @@
  *
  */
-int irq_spinlock_trylock(irq_spinlock_t *lock)
+bool irq_spinlock_trylock(irq_spinlock_t *lock)
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock);
-        int rc = spinlock_trylock(&(lock->lock));
-        
-        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
-        return rc;
+        bool ret = spinlock_trylock(&(lock->lock));
+        
+        ASSERT_IRQ_SPINLOCK((!ret) || (!lock->guard), lock);
+        return ret;
 }
 

kernel/generic/src/synch/workqueue.c

@@ -256 +256 @@
  * workq_stop().
  */
-int workq_init(struct work_queue *workq, const char *name)
+bool workq_init(struct work_queue *workq, const char *name)
 {
         workq_preinit(workq, name);
@@ -394 +394 @@
  * See workq_enqueue_noblock() for more details.
  */
-int workq_global_enqueue_noblock(work_t *work_item, work_func_t func)
+bool workq_global_enqueue_noblock(work_t *work_item, work_func_t func)
 {
         return workq_enqueue_noblock(&g_work_queue, work_item, func);
@@ -403 +403 @@
  * See workq_enqueue() for more details.
  */
-int workq_global_enqueue(work_t *work_item, work_func_t func)
+bool workq_global_enqueue(work_t *work_item, work_func_t func)
 {
         return workq_enqueue(&g_work_queue, work_item, func);
@@ -426 +426 @@
  * @return true  Otherwise. func() will be invoked in a separate thread.
  */
-int workq_enqueue_noblock(struct work_queue *workq, work_t *work_item, 
+bool workq_enqueue_noblock(struct work_queue *workq, work_t *work_item, 
         work_func_t func)
 {
@@ -446 +446 @@
  * @return true  Otherwise. func() will be invoked in a separate thread.
  */
-int workq_enqueue(struct work_queue *workq, work_t *work_item, work_func_t func)
+bool workq_enqueue(struct work_queue *workq, work_t *work_item, work_func_t func)
 {
         return _workq_enqueue(workq, work_item, func, true);