Changeset 6e787c4 in mainline

Timestamp:

2005-08-24T12:21:26Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cfd6efd2

Parents:

a8f9a82

Message:

Make rwlock test #3 compile again.

Make rwlock test #4 preemption-safe.

Prepare for preemption controlling functions.

Files:

• include/cpu.h (modified) (1 diff)
• include/preemption.h (added)
• src/Makefile (modified) (1 diff)
• src/preempt/preemption.c (added)
• test/synch/rwlock3/test.c (modified) (1 diff)
• test/synch/rwlock4/test.c (modified) (1 diff)

include/cpu.h

@@ -41 +41 @@
 #include <arch/context.h>
 
-#define CPU_STACK_SIZE  (4096)
+#define CPU_STACK_SIZE  PAGE_SIZE
 
 struct cpu {

src/Makefile

@@ -21 +21 @@
         time/timeout.c \
         time/delay.c \
+        preempt/preemption.c \
         synch/spinlock.c \
         synch/condvar.c \

test/synch/rwlock3/test.c

@@ -41 +41 @@
 
 static void reader(void *arg);
-static void failed(void *arg);
+static void failed(void);
 
 void reader(void *arg)

test/synch/rwlock4/test.c

@@ -60 +60 @@
 {
         __u32 rc;
+        pri_t pri;
 
+        pri = cpu_priority_high();
         spinlock_lock(&lock);   
         rc = seed % max;
         seed = (((seed<<2) ^ (seed>>2)) * 487) + rc;
         spinlock_unlock(&lock);
+        cpu_priority_restore(pri);
         return rc;
 }