Changeset cb01e1e in mainline for kernel/test/synch/semaphore1.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/semaphore1.c (modified) (8 diffs)

kernel/test/synch/semaphore1.c

@@ -36 +36 @@
 #include <synch/semaphore.h>
 
-#define AT_ONCE                 3
-#define PRODUCERS               50
-#define CONSUMERS               50
+#define AT_ONCE    3
+#define PRODUCERS  50
+#define CONSUMERS  50
 
 static semaphore_t sem;
@@ -48 +48 @@
 static void producer(void *arg)
 {
-        thread_detach(THREAD);  
-
+        thread_detach(THREAD);
+        
         waitq_sleep(&can_start);
-            
+        
         semaphore_down(&sem);
         atomic_inc(&items_produced);
@@ -60 +60 @@
 static void consumer(void *arg)
 {
-        thread_detach(THREAD);  
+        thread_detach(THREAD);
         
         waitq_sleep(&can_start);
@@ -70 +70 @@
 }
 
-char * test_semaphore1(bool quiet)
+char *test_semaphore1(void)
 {
         int i, j, k;
@@ -77 +77 @@
         waitq_initialize(&can_start);
         semaphore_initialize(&sem, AT_ONCE);
-
+        
         for (i = 1; i <= 3; i++) {
                 thread_t *thrd;
-
+                
                 atomic_set(&items_produced, 0);
                 atomic_set(&items_consumed, 0);
@@ -87 +87 @@
                 producers = (4 - i) * PRODUCERS;
                 
-                printf("Creating %d consumers and %d producers...", consumers, producers);
-        
+                TPRINTF("Creating %d consumers and %d producers...", consumers, producers);
+                
                 for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) {
                         for (k = 0; k < i; k++) {
@@ -95 +95 @@
                                         thread_ready(thrd);
                                 else
-                                        printf("could not create consumer %d\n", i);
+                                        TPRINTF("could not create consumer %d\n", i);
                         }
                         for (k = 0; k < (4 - i); k++) {
@@ -102 +102 @@
                                         thread_ready(thrd);
                                 else
-                                        printf("could not create producer %d\n", i);
+                                        TPRINTF("could not create producer %d\n", i);
                         }
                 }
-
-                printf("ok\n");
-
+                
+                TPRINTF("ok\n");
+                
                 thread_sleep(1);
                 waitq_wakeup(&can_start, WAKEUP_ALL);
-        
+                
                 while ((items_consumed.count != consumers) || (items_produced.count != producers)) {
-                        printf("%d consumers remaining, %d producers remaining\n", consumers - items_consumed.count, producers - items_produced.count);
+                        TPRINTF("%d consumers remaining, %d producers remaining\n", consumers - items_consumed.count, producers - items_produced.count);
                         thread_sleep(1);
                 }