Changeset 26a8604f in mainline

Timestamp:

2005-02-25T11:48:31Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

397c77f

Parents:

453ba46

Message:

Be more careful when sending IPI on UP configured as SMP.

Files:

• arch/ia32/src/smp/ipi.c (modified) (1 diff)
• include/smp/ipi.h (modified) (1 diff)
• src/Makefile (modified) (1 diff)
• src/proc/thread.c (modified) (2 diffs)
• src/smp/ipi.c (added)

arch/ia32/src/smp/ipi.c

@@ -32 +32 @@
 #include <arch/apic.h>
 
-void ipi_broadcast(int ipi)
+void ipi_broadcast_arch(int ipi)
 {
         (void) l_apic_broadcast_custom_ipi((__u8) ipi);

include/smp/ipi.h

@@ -32 +32 @@
 #ifdef __SMP__
 extern void ipi_broadcast(int ipi);
+extern void ipi_broadcast_arch(int ipi);
+#else
+#define ipi_broadcast(x)        ;
 #endif /* __SMP__ */
 

src/Makefile

@@ -25 +25 @@
         synch/mutex.c \
         synch/semaphore.c \
-        synch/waitq.c
+        synch/waitq.c \
+        smp/ipi.c
 
 ifdef DEBUG_SPINLOCK

src/proc/thread.c

@@ -47 +47 @@
 #include <list.h>
 #include <config.h>
-
-#ifdef __SMP__
 #include <arch/interrupt.h>
-#include <arch/apic.h>
-#endif /* __SMP__ */
+#include <smp/ipi.h>
 
 char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"};
@@ -123 +120 @@
 
         spinlock_lock(&cpu->lock);
-        if ((++cpu->nrdy) > avg && (config.cpu_active == config.cpu_count)) {
+        if ((++cpu->nrdy) > avg) {
                 /*
                  * If there are idle halted CPU's, this will wake them up.
                  */
-                #ifdef __SMP__
                 ipi_broadcast(VECTOR_WAKEUP_IPI);
-                #endif /* __SMP__  */
         }       
         spinlock_unlock(&cpu->lock);