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

Timestamp:

2009-04-04T00:26:27Z (15 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/rwlock4.c (modified) (8 diffs)

kernel/test/synch/rwlock4.c

@@ -41 +41 @@
 #include <synch/spinlock.h>
 
-#define READERS         50
-#define WRITERS         50
+#define READERS  50
+#define WRITERS  50
 
 static atomic_t thread_count;
 static rwlock_t rwlock;
 static atomic_t threads_fault;
-static bool sh_quiet;
 
 SPINLOCK_INITIALIZE(rw_lock);
@@ -58 +57 @@
 {
         uint32_t rc;
-
-        spinlock_lock(&rw_lock);        
+        
+        spinlock_lock(&rw_lock);
         rc = seed % max;
         seed = (((seed << 2) ^ (seed >> 2)) * 487) + rc;
@@ -71 +70 @@
         thread_detach(THREAD);
         waitq_sleep(&can_start);
-
+        
         to = random(40000);
         
-        if (!sh_quiet)
-                printf("cpu%u, tid %" PRIu64 " w+ (%d)\n", CPU->id, THREAD->tid, to);
+        TPRINTF("cpu%u, tid %" PRIu64 " w+ (%d)\n", CPU->id, THREAD->tid, to);
         
         rc = rwlock_write_lock_timeout(&rwlock, to);
         if (SYNCH_FAILED(rc)) {
-                if (!sh_quiet)
-                        printf("cpu%u, tid %" PRIu64 " w!\n", CPU->id, THREAD->tid);
+                TPRINTF("cpu%u, tid %" PRIu64 " w!\n", CPU->id, THREAD->tid);
                 atomic_dec(&thread_count);
                 return;
         }
         
-        if (!sh_quiet)
-                printf("cpu%u, tid %" PRIu64 " w=\n", CPU->id, THREAD->tid);
-
+        TPRINTF("cpu%u, tid %" PRIu64 " w=\n", CPU->id, THREAD->tid);
+        
         if (rwlock.readers_in) {
-                if (!sh_quiet)
-                        printf("Oops.");
+                TPRINTF("Oops.\n");
                 atomic_inc(&threads_fault);
                 atomic_dec(&thread_count);
                 return;
         }
+        
         thread_usleep(random(1000000));
+        
         if (rwlock.readers_in) {
-                if (!sh_quiet)
-                        printf("Oops.");        
+                TPRINTF("Oops.\n");
                 atomic_inc(&threads_fault);
                 atomic_dec(&thread_count);
                 return;
         }
-
+        
         rwlock_write_unlock(&rwlock);
         
-        if (!sh_quiet)
-                printf("cpu%u, tid %" PRIu64 " w-\n", CPU->id, THREAD->tid);
+        TPRINTF("cpu%u, tid %" PRIu64 " w-\n", CPU->id, THREAD->tid);
         atomic_dec(&thread_count);
 }
@@ -119 +114 @@
         to = random(2000);
         
-        if (!sh_quiet)
-                printf("cpu%u, tid %" PRIu64 " r+ (%d)\n", CPU->id, THREAD->tid, to);
+        TPRINTF("cpu%u, tid %" PRIu64 " r+ (%d)\n", CPU->id, THREAD->tid, to);
         
         rc = rwlock_read_lock_timeout(&rwlock, to);
         if (SYNCH_FAILED(rc)) {
-                if (!sh_quiet)
-                        printf("cpu%u, tid %" PRIu64 " r!\n", CPU->id, THREAD->tid);
+                TPRINTF("cpu%u, tid %" PRIu64 " r!\n", CPU->id, THREAD->tid);
                 atomic_dec(&thread_count);
                 return;
         }
         
-        if (!sh_quiet)
-                printf("cpu%u, tid %" PRIu64 " r=\n", CPU->id, THREAD->tid);
+        TPRINTF("cpu%u, tid %" PRIu64 " r=\n", CPU->id, THREAD->tid);
         
         thread_usleep(30000);
         rwlock_read_unlock(&rwlock);
         
-        if (!sh_quiet)
-                printf("cpu%u, tid %" PRIu64 " r-\n", CPU->id, THREAD->tid);
+        TPRINTF("cpu%u, tid %" PRIu64 " r-\n", CPU->id, THREAD->tid);
         atomic_dec(&thread_count);
 }
 
-char * test_rwlock4(bool quiet)
+char *test_rwlock4(void)
 {
         context_t ctx;
         uint32_t i;
-        sh_quiet = quiet;
         
         waitq_initialize(&can_start);
@@ -159 +149 @@
         
         context_save(&ctx);
-        if (!quiet) {
-                printf("sp=%#x, readers_in=%" PRIc "\n", ctx.sp, rwlock.readers_in);
-                printf("Creating %" PRIu32 " readers\n", rd);
-        }
+        TPRINTF("sp=%#x, readers_in=%" PRIc "\n", ctx.sp, rwlock.readers_in);
+        TPRINTF("Creating %" PRIu32 " readers\n", rd);
         
         for (i = 0; i < rd; i++) {
@@ -168 +156 @@
                 if (thrd)
                         thread_ready(thrd);
-                else if (!quiet)
-                        printf("Could not create reader %" PRIu32 "\n", i);
+                else
+                        TPRINTF("Could not create reader %" PRIu32 "\n", i);
         }
-
-        if (!quiet)
-                printf("Creating %" PRIu32 " writers\n", wr);
+        
+        TPRINTF("Creating %" PRIu32 " writers\n", wr);
         
         for (i = 0; i < wr; i++) {
@@ -179 +166 @@
                 if (thrd)
                         thread_ready(thrd);
-                else if (!quiet)
-                        printf("Could not create writer %" PRIu32 "\n", i);
+                else
+                        TPRINTF("Could not create writer %" PRIu32 "\n", i);
         }
         
@@ -187 +174 @@
         
         while (atomic_get(&thread_count) > 0) {
-                if (!quiet)
-                        printf("Threads left: %ld\n", atomic_get(&thread_count));
+                TPRINTF("Threads left: %ld\n", atomic_get(&thread_count));
                 thread_sleep(1);
         }