Changeset cb01e1e in mainline for kernel/test/synch/rwlock5.c

Timestamp:

2009-04-04T00:26:27Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a85aebd

Parents:

171f9a1

Message:

use global variable and a macro for silencing tests

File:

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

kernel/test/synch/rwlock5.c

@@ -36 +36 @@
 #include <synch/rwlock.h>
 
-#define READERS         50
-#define WRITERS         50
+#define READERS  50
+#define WRITERS  50
 
 static rwlock_t rwlock;
@@ -48 +48 @@
 {
         thread_detach(THREAD);
-
+        
         waitq_sleep(&can_start);
-
+        
         rwlock_write_lock(&rwlock);
         atomic_inc(&items_written);
@@ -59 +59 @@
 {
         thread_detach(THREAD);
-
+        
         waitq_sleep(&can_start);
         
@@ -67 +67 @@
 }
 
-char * test_rwlock5(bool quiet)
+char *test_rwlock5(void)
 {
         int i, j, k;
@@ -77 +77 @@
         for (i = 1; i <= 3; i++) {
                 thread_t *thrd;
-
+                
                 atomic_set(&items_read, 0);
                 atomic_set(&items_written, 0);
-
+                
                 readers = i * READERS;
                 writers = (4 - i) * WRITERS;
-
-                printf("Creating %ld readers and %ld writers...", readers, writers);
+                
+                TPRINTF("Creating %ld readers and %ld writers...", readers, writers);
                 
                 for (j = 0; j < (READERS + WRITERS) / 2; j++) {
@@ -92 +92 @@
                                         thread_ready(thrd);
                                 else
-                                        printf("Could not create reader %d\n", k);
+                                        TPRINTF("Could not create reader %d\n", k);
                         }
                         for (k = 0; k < (4 - i); k++) {
@@ -99 +99 @@
                                         thread_ready(thrd);
                                 else
-                                        printf("Could not create writer %d\n", k);
+                                        TPRINTF("Could not create writer %d\n", k);
                         }
                 }
-
-                printf("ok\n");
-
+                
+                TPRINTF("ok\n");
+                
                 thread_sleep(1);
                 waitq_wakeup(&can_start, WAKEUP_ALL);
-        
+                
                 while ((items_read.count != readers) || (items_written.count != writers)) {
-                        printf("%d readers remaining, %d writers remaining, readers_in=%d\n", readers - items_read.count, writers - items_written.count, rwlock.readers_in);
+                        TPRINTF("%d readers remaining, %d writers remaining, readers_in=%d\n", readers - items_read.count, writers - items_written.count, rwlock.readers_in);
                         thread_usleep(100000);
                 }