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

kernel/test/synch/semaphore1.c

@@ -46 +46 @@
 static atomic_t items_consumed;
 
-static void consumer(void *arg);
-static void producer(void *arg);
-static void failed(void);
-
 static void producer(void *arg)
 {
@@ -74 +70 @@
 }
 
-static void failed(void)
-{
-        printf("Test failed prematurely.\n");
-        thread_exit();
-}
-
-void test_semaphore1(void)
+char * test_semaphore1(void)
 {
         int i, j, k;
         int consumers, producers;
         
-        printf("Semaphore test #1\n");
-    
         waitq_initialize(&can_start);
         semaphore_initialize(&sem, AT_ONCE);
 
-
-        for (i=1; i<=3; i++) {
+        for (i = 1; i <= 3; i++) {
                 thread_t *thrd;
 
@@ -98 +85 @@
                 
                 consumers = i * CONSUMERS;
-                producers = (4-i) * PRODUCERS;
+                producers = (4 - i) * PRODUCERS;
                 
                 printf("Creating %d consumers and %d producers...", consumers, producers);
         
-                for (j=0; j<(CONSUMERS+PRODUCERS)/2; j++) {
-                        for (k=0; k<i; k++) {
+                for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) {
+                        for (k = 0; k < i; k++) {
                                 thrd = thread_create(consumer, NULL, TASK, 0, "consumer");
                                 if (thrd)
                                         thread_ready(thrd);
                                 else
-                                        failed();
+                                        printf("could not create consumer %d\n", i);
                         }
-                        for (k=0; k<(4-i); k++) {
+                        for (k = 0; k < (4 - i); k++) {
                                 thrd = thread_create(producer, NULL, TASK, 0, "producer");
                                 if (thrd)
                                         thread_ready(thrd);
                                 else
-                                        failed();
+                                        printf("could not create producer %d\n", i);
                         }
                 }
@@ -124 +111 @@
                 waitq_wakeup(&can_start, WAKEUP_ALL);
         
-                while (items_consumed.count != consumers || items_produced.count != producers) {
+                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);
                         thread_sleep(1);
                 }
         }
-        printf("Test passed.\n");
+        
+        return NULL;
 }