Changeset 96348adc in mainline for kernel/test/synch/rwlock5.c

Timestamp:

2006-12-12T17:24:58Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7e13972

Parents:

34db7fa

Message:

cleanup tests

File:

• kernel/test/synch/rwlock5.c (modified) (5 diffs)

kernel/test/synch/rwlock5.c

@@ -45 +45 @@
 static atomic_t items_written;
 
-static void writer(void *arg);
-static void reader(void *arg);
-static void failed(void);
-
-void writer(void *arg)
+static void writer(void *arg)
 {
         thread_detach(THREAD);
@@ -60 +56 @@
 }
 
-void reader(void *arg)
+static void reader(void *arg)
 {
         thread_detach(THREAD);
@@ -71 +67 @@
 }
 
-void failed(void)
-{
-        printf("Test failed prematurely.\n");
-        thread_exit();
-}
-
-void test_rwlock5(void)
+char * test_rwlock5(void)
 {
         int i, j, k;
         count_t readers, writers;
         
-        printf("Read/write locks test #5\n");
-    
         waitq_initialize(&can_start);
         rwlock_initialize(&rwlock);
         
-        for (i=1; i<=3; i++) {
+        for (i = 1; i <= 3; i++) {
                 thread_t *thrd;
 
@@ -93 +81 @@
                 atomic_set(&items_written, 0);
 
-                readers = i*READERS;
-                writers = (4-i)*WRITERS;
+                readers = i * READERS;
+                writers = (4 - i) * WRITERS;
 
                 printf("Creating %ld readers and %ld writers...", readers, writers);
                 
-                for (j=0; j<(READERS+WRITERS)/2; j++) {
-                        for (k=0; k<i; k++) {
+                for (j = 0; j < (READERS + WRITERS) / 2; j++) {
+                        for (k = 0; k < i; k++) {
                                 thrd = thread_create(reader, NULL, TASK, 0, "reader");
                                 if (thrd)
                                         thread_ready(thrd);
                                 else
-                                        failed();
+                                        printf("Could not create reader %d\n", k);
                         }
-                        for (k=0; k<(4-i); k++) {
+                        for (k = 0; k < (4 - i); k++) {
                                 thrd = thread_create(writer, NULL, TASK, 0, "writer");
                                 if (thrd)
                                         thread_ready(thrd);
                                 else
-                                        failed();
+                                        printf("Could not create writer %d\n", k);
                         }
                 }
@@ -120 +108 @@
                 waitq_wakeup(&can_start, WAKEUP_ALL);
         
-                while (items_read.count != readers || items_written.count != writers) {
+                while ((items_read.count != readers) || (items_written.count != writers)) {
                         printf("%zd readers remaining, %zd writers remaining, readers_in=%zd\n", readers - items_read.count, writers - items_written.count, rwlock.readers_in);
                         thread_usleep(100000);
                 }
         }
-        printf("Test passed.\n");
+        
+        return NULL;
 }