Changeset 4e7d3dd in mainline

Timestamp:

2011-01-27T15:06:07Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0843f02

Parents:

bf75e3cb

Message:

cstyle (no change in functionality)

File:

• kernel/generic/src/proc/scheduler.c (modified) (14 diffs)

kernel/generic/src/proc/scheduler.c

@@ -63 +63 @@
 #include <debug.h>
 
-static void before_task_runs(void);
-static void before_thread_runs(void);
-static void after_thread_ran(void);
 static void scheduler_separated_stack(void);
 
@@ -71 +68 @@
 
 /** Carry out actions before new task runs. */
-void before_task_runs(void)
+static void before_task_runs(void)
 {
         before_task_runs_arch();
@@ -85 +82 @@
  *
  */
-void before_thread_runs(void)
+static void before_thread_runs(void)
 {
         before_thread_runs_arch();
+        
 #ifdef CONFIG_FPU_LAZY
         if(THREAD == CPU->fpu_owner)
@@ -113 +111 @@
  *
  */
-void after_thread_ran(void)
+static void after_thread_ran(void)
 {
         after_thread_ran_arch();
@@ -391 +389 @@
          * possible destruction should thread_destroy() be called on this or any
          * other processor while the scheduler is still using them.
-         *
          */
         if (old_task)
@@ -417 +414 @@
                                  * The thread structure is kept allocated until
                                  * somebody calls thread_detach() on it.
-                                 *
                                  */
                                 if (!irq_spinlock_trylock(&THREAD->join_wq.lock)) {
                                         /*
                                          * Avoid deadlock.
-                                         *
                                          */
                                         irq_spinlock_unlock(&THREAD->lock, false);
@@ -443 +438 @@
                         /*
                          * Prefer the thread after it's woken up.
-                         *
                          */
                         THREAD->priority = -1;
@@ -451 +445 @@
                          * waitq_sleep(). Address of wq->lock is kept in
                          * THREAD->sleep_queue.
-                         *
                          */
                         irq_spinlock_unlock(&THREAD->sleep_queue->lock, false);
@@ -461 +454 @@
                         /*
                          * Entering state is unexpected.
-                         *
                          */
                         panic("tid%" PRIu64 ": unexpected state %s.",
@@ -480 +472 @@
         
         /*
-         * If both the old and the new task are the same, lots of work is
-         * avoided.
-         *
+         * If both the old and the new task are the same,
+         * lots of work is avoided.
          */
         if (TASK != THREAD->task) {
@@ -488 +479 @@
                 
                 /*
-                 * Note that it is possible for two tasks to share one address
-                 * space.
-                 (
+                 * Note that it is possible for two tasks
+                 * to share one address space.
                  */
                 if (old_as != new_as) {
@@ -496 +486 @@
                          * Both tasks and address spaces are different.
                          * Replace the old one with the new one.
-                         *
                          */
                         as_switch(old_as, new_as);
@@ -527 +516 @@
          * necessary, is to be mapped in before_thread_runs(). This
          * function must be executed before the switch to the new stack.
-         *
          */
         before_thread_runs();
@@ -534 +522 @@
          * Copy the knowledge of CPU, TASK, THREAD and preemption counter to
          * thread's stack.
-         *
          */
         the_copy(THE, (the_t *) THREAD->kstack);