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

kernel/test/fpu/fpu1_x86.c

@@ -61 +61 @@
 static atomic_t threads_fault;
 static waitq_t can_start;
-static bool sh_quiet;
 
 static void e(void *data)
@@ -83 +82 @@
                 
                 if ((int) (100000000 * e) != E_10e8) {
-                        if (!sh_quiet)
-                                printf("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
+                        TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -117 +115 @@
                 
                 if ((int) (100000000 * pi) != PI_10e8) {
-                        if (!sh_quiet)
-                                printf("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
+                        TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -126 +123 @@
 }
 
-char * test_fpu1(bool quiet)
+char *test_fpu1(void)
 {
         unsigned int i, total = 0;
-        sh_quiet = quiet;
         
         waitq_initialize(&can_start);
@@ -135 +131 @@
         atomic_set(&threads_fault, 0);
         
-        if (!quiet)
-                printf("Creating %u threads... ", 2 * THREADS);
+        TPRINTF("Creating %u threads... ", 2 * THREADS);
         
-        for (i = 0; i < THREADS; i++) {  
+        for (i = 0; i < THREADS; i++) {
                 thread_t *t;
                 
                 if (!(t = thread_create(e, NULL, TASK, 0, "e", false))) {
-                        if (!quiet)
-                                printf("could not create thread %u\n", 2 * i);
+                        TPRINTF("could not create thread %u\n", 2 * i);
                         break;
                 }
@@ -150 +144 @@
                 
                 if (!(t = thread_create(pi, NULL, TASK, 0, "pi", false))) {
-                        if (!quiet)
-                                printf("could not create thread %u\n", 2 * i + 1);
+                        TPRINTF("could not create thread %u\n", 2 * i + 1);
                         break;
                 }
@@ -158 +151 @@
         }
         
-        if (!quiet)
-                printf("ok\n");
+        TPRINTF("ok\n");
         
         thread_sleep(1);
@@ -165 +157 @@
         
         while (atomic_get(&threads_ok) != (long) total) {
-                if (!quiet)
-                        printf("Threads left: %d\n", total - atomic_get(&threads_ok));
+                TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);
         }