Changeset 7e13972 in mainline for kernel/test/synch/rwlock4.c

Timestamp:

2006-12-12T18:51:06Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

cce6acf

Parents:

96348adc

Message:

remove asserts and panics from tests

File:

• kernel/test/synch/rwlock4.c (modified) (6 diffs)

kernel/test/synch/rwlock4.c

@@ -35 +35 @@
 #include <arch/context.h>
 #include <context.h>
-#include <panic.h>
 
 #include <synch/waitq.h>
@@ -46 +45 @@
 
 static rwlock_t rwlock;
+static atomic_t threads_fault;
 
 SPINLOCK_INITIALIZE(rw_lock);
@@ -79 +79 @@
         printf("cpu%d, tid %d w=\n", CPU->id, THREAD->tid);
 
-        if (rwlock.readers_in) panic("Oops.");
+        if (rwlock.readers_in) {
+                printf("Oops.");
+                atomic_inc(&threads_fault);
+                return;
+        }
         thread_usleep(random(1000000));
-        if (rwlock.readers_in) panic("Oops.");  
+        if (rwlock.readers_in) {
+                printf("Oops.");        
+                atomic_inc(&threads_fault);
+                return;
+        }
 
         rwlock_write_unlock(&rwlock);
@@ -113 +121 @@
         waitq_initialize(&can_start);
         rwlock_initialize(&rwlock);
+        atomic_set(&threads_fault, 0);
         
         thread_t *thrd;
@@ -131 +140 @@
         k = random(5) + 1;
         printf("Creating %d writers\n", k);
-        for (i=0; i<k; i++) {
+        for (i = 0; i < k; i++) {
                 thrd = thread_create(writer, NULL, TASK, 0, "writer");
                 if (thrd)
@@ -142 +151 @@
         waitq_wakeup(&can_start, WAKEUP_ALL);
         
-        return NULL;
+        if (atomic_get(&threads_fault) == 0)
+                return NULL;
+        
+        return "Test failed";
 }