Changeset e3f41b6 in mainline for src

Timestamp:

2005-06-06T20:01:57Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

b0bf501

Parents:

d47f0e1

Message:

Code cleanup in scheduler.c thread.c - removed unnecessary spinlock.
atomic_inc, atomic_dec moved to arch/atomic.h instead of arch/smp/atomic.h,
advisable to use even in non-smp mode.
Fixed atomic_inc, atomic_dec in mips architecture.

Location:

src

Files:

• Makefile (modified) (1 diff)
• mm/tlb.c (modified) (1 diff)
• proc/scheduler.c (modified) (5 diffs)
• proc/thread.c (modified) (2 diffs)
• synch/spinlock.c (modified) (1 diff)
• time/clock.c (modified) (1 diff)

src/Makefile

@@ -71 +71 @@
 
 kernel.bin: $(arch_objects) $(objects) $(test_objects)
-        $(LD) $(LFLAGS) $(arch_objects) $(objects) $(test_objects) -o $@ >kernel.map
+        $(LD) $(LFLAGS) $(arch_objects) $(objects) $(test_objects) -o $@ -Map kernel.map
 
 %.s: %.S

src/mm/tlb.c

@@ -31 +31 @@
 #include <synch/spinlock.h>
 #include <typedefs.h>
-#include <arch/smp/atomic.h>
+#include <arch/atomic.h>
 #include <arch/interrupt.h>
 #include <config.h>

src/proc/scheduler.c

@@ -43 +43 @@
 #include <synch/spinlock.h>
 #include <arch/faddr.h>
-
-#ifdef __SMP__
-#include <arch/smp/atomic.h>
-#endif /* __SMP__ */
+#include <arch/atomic.h>
 
 /*
@@ -54 +51 @@
  */
 
-spinlock_t nrdylock;
 volatile int nrdy;
 
@@ -78 +74 @@
 void scheduler_init(void)
 {
-        spinlock_initialize(&nrdylock);
 }
 
@@ -141 +136 @@
                 }
         
-                spinlock_lock(&nrdylock);
-                nrdy--;
-                spinlock_unlock(&nrdylock);             
+                atomic_dec(&nrdy);
 
                 spinlock_lock(&CPU->lock);
@@ -499 +492 @@
                                         spinlock_unlock(&cpu->lock);
 
-                                        spinlock_lock(&nrdylock);
-                                        nrdy--;
-                                        spinlock_unlock(&nrdylock);                                     
+                                        atomic_dec(&nrdy);
 
                                         r->n--;

src/proc/thread.c

@@ -50 +50 @@
 #include <smp/ipi.h>
 #include <arch/faddr.h>
+#include <arch/atomic.h>
 
 char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"}; /**< Thread states */
@@ -135 +136 @@
         spinlock_unlock(&r->lock);
 
-        spinlock_lock(&nrdylock);
-        avg = ++nrdy / config.cpu_active;
-        spinlock_unlock(&nrdylock);
+        atomic_inc(&nrdy);
+        avg = nrdy / config.cpu_active;
 
         spinlock_lock(&cpu->lock);

src/synch/spinlock.c

@@ -29 +29 @@
 #include <arch.h>
 
-#ifdef __SMP__
-#include <arch/smp/atomic.h>
-#endif
-
+#include <arch/atomic.h>
 #include <synch/spinlock.h>
 

src/time/clock.c

@@ -39 +39 @@
 #include <arch.h>
 #include <list.h>
-
-#ifdef __SMP__
-#include <arch/smp/atomic.h>
-#endif
+#include <arch/atomic.h>
 
 /** Clock routine