From 9ddbf57709936131bb0ecf2c73c971b60d7320fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= <rene.kijewski@fu-berlin.de>
Date: Sat, 18 Oct 2014 18:41:40 +0200
Subject: [PATCH] core: refactor sched_run

`sched_run()` was cluttered. Many individual changes were done without a
proper refactoring.
---
 core/include/sched.h |  3 +-
 core/sched.c         | 76 +++++++++++++++++++++-----------------------
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/core/include/sched.h b/core/include/sched.h
index 85f367ee7..59b951686 100644
--- a/core/include/sched.h
+++ b/core/include/sched.h
@@ -100,8 +100,9 @@
 
 /**
  * @brief   Triggers the scheduler to schedule the next thread
+ * @returns 1 if sched_active_thread/sched_active_pid was changed, 0 otherwise.
  */
-void sched_run(void);
+int sched_run(void);
 
 /**
  * @brief   Set the status of the specified process
diff --git a/core/sched.c b/core/sched.c
index eee93c9dc..68c4966b2 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -53,70 +53,66 @@ static void (*sched_cb) (uint32_t timestamp, uint32_t value) = NULL;
 schedstat sched_pidlist[KERNEL_PID_LAST + 1];
 #endif
 
-void sched_run(void)
+int sched_run(void)
 {
     sched_context_switch_request = 0;
 
+    tcb_t *active_thread = (tcb_t *)sched_active_thread;
+
+    /* The bitmask in runqueue_bitcache is never empty,
+     * since the threading should not be started before at least the idle thread was started.
+     */
+    int nextrq = bitarithm_lsb(runqueue_bitcache);
+    tcb_t *next_thread = clist_get_container(sched_runqueues[nextrq], tcb_t, rq_entry);
+
+    DEBUG("scheduler: active thread: %" PRIkernel_pid ", next thread: %" PRIkernel_pid "\n",
+          (active_thread == NULL) ? KERNEL_PID_UNDEF : active_thread->pid,
+          next_thread->pid);
+
+    if (active_thread == next_thread) {
+        DEBUG("scheduler: done, sched_active_thread was not changed.\n");
+        return 0;
+    }
+
 #ifdef SCHEDSTATISTICS
     unsigned long time = hwtimer_now();
 #endif
 
-    tcb_t *my_active_thread = (tcb_t *)sched_active_thread;
-
-    if (my_active_thread) {
-        if (my_active_thread->status == STATUS_RUNNING) {
-            my_active_thread->status = STATUS_PENDING;
+    if (active_thread) {
+        if (active_thread->status == STATUS_RUNNING) {
+            active_thread->status = STATUS_PENDING;
         }
 
 #ifdef SCHED_TEST_STACK
-        if (*((unsigned int *)my_active_thread->stack_start) != (unsigned int) my_active_thread->stack_start) {
-            printf("scheduler(): stack overflow detected, task=%s pid=%" PRIkernel_pid "\n", my_active_thread->name, my_active_thread->pid);
+        if (*((uintptr_t *) active_thread->stack_start) != (uintptr_t) active_thread->stack_start) {
+            printf("scheduler(): stack overflow detected, pid=%" PRIkernel_pid "\n", active_thread->pid);
         }
 #endif
 
 #ifdef SCHEDSTATISTICS
-        if (sched_pidlist[my_active_thread->pid].laststart) {
-            sched_pidlist[my_active_thread->pid].runtime_ticks += time - sched_pidlist[my_active_thread->pid].laststart;
+        schedstat *active_stat = &sched_pidlist[active_thread->pid];
+        if (active_stat->laststart) {
+            active_stat->runtime_ticks += time - active_stat->laststart;
         }
 #endif
     }
 
-    DEBUG("\nscheduler: previous task: %s\n", (my_active_thread == NULL) ? "none" : my_active_thread->name);
-
-    /* The bitmask in runqueue_bitcache is never empty,
-     * since the threading should not be started before at least the idle thread was started.
-     */
-    int nextrq = bitarithm_lsb(runqueue_bitcache);
-    my_active_thread = clist_get_container(sched_runqueues[nextrq], tcb_t, rq_entry);
-    DEBUG("scheduler: first in queue: %s\n", my_active_thread->name);
-
-    kernel_pid_t my_next_pid = my_active_thread->pid;
-
 #if SCHEDSTATISTICS
-    sched_pidlist[my_next_pid].laststart = time;
-    sched_pidlist[my_next_pid].schedules++;
-    if ((sched_cb) && (my_next_pid != sched_active_pid)) {
-        sched_cb(time, my_next_pid);
+    schedstat *next_stat = &sched_pidlist[next_thread->pid];
+    next_stat->laststart = time;
+    next_stat->schedules++;
+    if (sched_cb) {
+        sched_cb(time, next_thread->pid);
     }
 #endif
 
-    sched_active_pid = my_next_pid;
-
-    DEBUG("scheduler: next task: %s\n", my_active_thread->name);
-
-    if (my_active_thread != sched_active_thread) {
-        if (sched_active_thread != NULL) {
-            if (sched_active_thread->status == STATUS_RUNNING) {
-                sched_active_thread->status = STATUS_PENDING;
-            }
-        }
-
-        sched_set_status((tcb_t *)my_active_thread, STATUS_RUNNING);
-    }
+    next_thread->status = STATUS_RUNNING;
+    sched_active_pid = next_thread->pid;
+    sched_active_thread = (volatile tcb_t *) next_thread;
 
-    sched_active_thread = (volatile tcb_t *) my_active_thread;
+    DEBUG("scheduler: done, changed sched_active_thread.\n");
 
-    DEBUG("scheduler: done.\n");
+    return 1;
 }
 
 #if SCHEDSTATISTICS