Changeset 76cec1e in mainline for src/proc/scheduler.c

Timestamp:

2005-07-15T21:57:30Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b4a4c5e3

Parents:

e41c47e

Message:

Huge indentation fix.

File:

• src/proc/scheduler.c (modified) (7 diffs)

src/proc/scheduler.c

@@ -103 +103 @@
                  */
                 if (test_and_set(&CPU->kcpulbstarted) == 0) {
-                        waitq_wakeup(&CPU->kcpulb_wq, 0);
+                        waitq_wakeup(&CPU->kcpulb_wq, 0);
                         goto loop;
                 }
@@ -239 +239 @@
                          */
                         before_thread_runs();
-                        spinlock_unlock(&THREAD->lock);
+                        spinlock_unlock(&THREAD->lock);
                         cpu_priority_restore(THREAD->saved_context.pri);
                         return;
@@ -279 +279 @@
                 switch (THREAD->state) {
                     case Running:
-                            THREAD->state = Ready;
-                            spinlock_unlock(&THREAD->lock);
-                            thread_ready(THREAD);
-                            break;
+                        THREAD->state = Ready;
+                        spinlock_unlock(&THREAD->lock);
+                        thread_ready(THREAD);
+                        break;
 
                     case Exiting:
-                            frame_free((__address) THREAD->kstack);
-                            if (THREAD->ustack) {
-                                    frame_free((__address) THREAD->ustack);
-                            }
-                            
-                            /*
-                             * Detach from the containing task.
-                             */
-                            spinlock_lock(&TASK->lock);
-                            list_remove(&THREAD->th_link);
-                            spinlock_unlock(&TASK->lock);
-
-                            spinlock_unlock(&THREAD->lock);
-                            
-                            spinlock_lock(&threads_lock);
-                            list_remove(&THREAD->threads_link);
-                            spinlock_unlock(&threads_lock);
-
-                            spinlock_lock(&CPU->lock);
-                            if(CPU->fpu_owner==THREAD) CPU->fpu_owner=NULL;
-                            spinlock_unlock(&CPU->lock);
-
-                            
-                            free(THREAD);
-                            
-                            break;
-                            
+                        frame_free((__address) THREAD->kstack);
+                        if (THREAD->ustack) {
+                                frame_free((__address) THREAD->ustack);
+                        }
+
+                        /*
+                         * Detach from the containing task.
+                         */
+                        spinlock_lock(&TASK->lock);
+                        list_remove(&THREAD->th_link);
+                        spinlock_unlock(&TASK->lock);
+
+                        spinlock_unlock(&THREAD->lock);
+    
+                        spinlock_lock(&threads_lock);
+                        list_remove(&THREAD->threads_link);
+                        spinlock_unlock(&threads_lock);
+
+                        spinlock_lock(&CPU->lock);
+                        if(CPU->fpu_owner==THREAD) CPU->fpu_owner=NULL;
+                        spinlock_unlock(&CPU->lock);
+
+                        free(THREAD);
+
+                        break;
+    
                     case Sleeping:
-                            /*
-                             * Prefer the thread after it's woken up.
-                             */
-                            THREAD->pri = -1;
-
-                            /*
-                             * We need to release wq->lock which we locked in waitq_sleep().
-                             * Address of wq->lock is kept in THREAD->sleep_queue.
-                             */
-                            spinlock_unlock(&THREAD->sleep_queue->lock);
-
-                            /*
-                             * Check for possible requests for out-of-context invocation.
-                             */
-                            if (THREAD->call_me) {
-                                    THREAD->call_me(THREAD->call_me_with);
-                                    THREAD->call_me = NULL;
-                                    THREAD->call_me_with = NULL;
-                            }
-
-                            spinlock_unlock(&THREAD->lock);
-                            
-                            break;
+                        /*
+                         * Prefer the thread after it's woken up.
+                         */
+                        THREAD->pri = -1;
+
+                        /*
+                         * We need to release wq->lock which we locked in waitq_sleep().
+                         * Address of wq->lock is kept in THREAD->sleep_queue.
+                         */
+                        spinlock_unlock(&THREAD->sleep_queue->lock);
+
+                        /*
+                         * Check for possible requests for out-of-context invocation.
+                         */
+                        if (THREAD->call_me) {
+                                THREAD->call_me(THREAD->call_me_with);
+                                THREAD->call_me = NULL;
+                                THREAD->call_me_with = NULL;
+                        }
+
+                        spinlock_unlock(&THREAD->lock);
+
+                        break;
 
                     default:
-                            /*
-                             * Entering state is unexpected.
-                             */
-                            panic("tid%d: unexpected state %s\n", THREAD->tid, thread_states[THREAD->state]);
-                            break;
+                        /*
+                         * Entering state is unexpected.
+                         */
+                        panic("tid%d: unexpected state %s\n", THREAD->tid, thread_states[THREAD->state]);
+                        break;
                 }
                 THREAD = NULL;
         }
-    
+
         THREAD = find_best_thread();
         
@@ -470 +469 @@
                                 t = list_get_instance(l, thread_t, rq_link);
                                 /*
-                                 * We don't want to steal CPU-wired threads neither threads already stolen.
+                                 * We don't want to steal CPU-wired threads neither threads already stolen.
                                  * The latter prevents threads from migrating between CPU's without ever being run.
-                                 * We don't want to steal threads whose FPU context is still in CPU.
+                                 * We don't want to steal threads whose FPU context is still in CPU.
                                  */
                                 spinlock_lock(&t->lock);
@@ -498 +497 @@
                                         atomic_dec(&nrdy);
 
-                                        r->n--;
+                                        r->n--;
                                         list_remove(&t->rq_link);
 
@@ -528 +527 @@
                                         
                                 /*
-                                 * We are not satisfied yet, focus on another CPU next time.
+                                 * We are not satisfied yet, focus on another CPU next time.
                                  */
                                 k++;
@@ -553 +552 @@
                 
         goto not_satisfied;
-    
+
 satisfied:
         /*