Changeset c8410ec9 in mainline

Timestamp:

2006-12-19T11:04:39Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6536a4a9

Parents:

95155b0c

Message:

quiet mode

Location:

kernel

Files:

• generic/src/console/cmd.c (modified) (1 diff)
• test/debug/mips1.c (modified) (1 diff)
• test/fpu/fpu1.c (modified) (9 diffs)
• test/fpu/sse1.c (modified) (8 diffs)

kernel/generic/src/console/cmd.c

@@ -1034 +1034 @@
                 if (strcmp(test->name, argv->buffer) == 0) {
                         fnd = true;
-                        run_bench(test, cnt);
+                        
+                        if (test->safe)
+                                run_bench(test, cnt);
+                        else
+                                printf("Unsafe test\n");
+                        
                         break;
                 }

kernel/test/debug/mips1.c

@@ -41 +41 @@
 char * test_mips1(bool quiet)
 {
-        printf("You should enter kconsole debug mode now.\n");
+        if (!quiet)
+                printf("You should enter kconsole debug mode now.\n");
         
         asm volatile (

kernel/test/fpu/fpu1.c

@@ -104 +104 @@
 static atomic_t threads_fault;
 static waitq_t can_start;
+static bool sh_quiet;
 
 static void e(void *data)
 {
         int i;
-        double e,d,le,f;
+        double e, d, le, f;
 
         thread_detach(THREAD);
@@ -125 +126 @@
 
                 if ((int) (100000000 * e) != E_10e8) {
-                        printf("tid%d: e*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
+                        if (!sh_quiet)
+                                printf("tid%d: e*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -159 +161 @@
 #ifdef KERN_ia64_ARCH_H_
                 if ((int) (1000000 * pi) != PI_10e8) {
-                        printf("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (1000000 * pi), (unative_t) (PI_10e8 / 100));
+                        if (!sh_quiet)
+                                printf("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (1000000 * pi), (unative_t) (PI_10e8 / 100));
                         atomic_inc(&threads_fault);
                         break;
@@ -165 +168 @@
 #else
                 if ((int) (100000000 * pi) != PI_10e8) {
-                        printf("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
+                        if (!sh_quiet)
+                                printf("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -177 +181 @@
 {
         unsigned int i, total = 0;
+        sh_quiet = quiet;
 
         waitq_initialize(&can_start);
         atomic_set(&threads_ok, 0);
         atomic_set(&threads_fault, 0);
-        printf("Creating %d threads... ", 2 * THREADS);
+        
+        if (!quiet)
+                printf("Creating %d threads... ", 2 * THREADS);
 
         for (i = 0; i < THREADS; i++) {  
@@ -187 +194 @@
                 
                 if (!(t = thread_create(e, NULL, TASK, 0, "e", false))) {
-                        printf("could not create thread %d\n", 2 * i);
+                        if (!quiet)
+                                printf("could not create thread %d\n", 2 * i);
                         break;
                 }
@@ -194 +202 @@
                 
                 if (!(t = thread_create(pi, NULL, TASK, 0, "pi", false))) {
-                        printf("could not create thread %d\n", 2 * i + 1);
+                        if (!quiet)
+                                printf("could not create thread %d\n", 2 * i + 1);
                         break;
                 }
@@ -200 +209 @@
                 total++;
         }
-        printf("ok\n");
+        
+        if (!quiet)
+                printf("ok\n");
         
         thread_sleep(1);
@@ -206 +217 @@
         
         while (atomic_get(&threads_ok) != total) {
-                printf("Threads left: %d\n", total - atomic_get(&threads_ok));
+                if (!quiet)
+                        printf("Threads left: %d\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);
         }

kernel/test/fpu/sse1.c

@@ -46 +46 @@
 static atomic_t threads_fault;
 static waitq_t can_start;
+static bool sh_quiet;
+
 
 static void testit1(void *data)
@@ -70 +72 @@
                 
                 if (arg != after_arg) {
-                        printf("tid%d: arg(%d) != %d\n", THREAD->tid, arg, after_arg);
+                        if (!sh_quiet)
+                                printf("tid%d: arg(%d) != %d\n", THREAD->tid, arg, after_arg);
                         atomic_inc(&threads_fault);
                         break;
@@ -101 +104 @@
                 
                 if (arg != after_arg) {
-                        printf("tid%d: arg(%d) != %d\n", THREAD->tid, arg, after_arg);
+                        if (!sh_quiet)
+                                printf("tid%d: arg(%d) != %d\n", THREAD->tid, arg, after_arg);
                         atomic_inc(&threads_fault);
                         break;
@@ -113 +117 @@
 {
         unsigned int i, total = 0;
-
+        sh_quiet = quiet;
+        
         waitq_initialize(&can_start);
         atomic_set(&threads_ok, 0);
         atomic_set(&threads_fault, 0);
-        printf("Creating %d threads... ", 2 * THREADS);
+        
+        if (!quiet)
+                printf("Creating %d threads... ", 2 * THREADS);
 
         for (i = 0; i < THREADS; i++) {
@@ -123 +130 @@
                 
                 if (!(t = thread_create(testit1, (void *) ((unative_t) 2 * i), TASK, 0, "testit1", false))) {
-                        printf("could not create thread %d\n", 2 * i);
+                        if (!quiet)
+                                printf("could not create thread %d\n", 2 * i);
                         break;
                 }
@@ -130 +138 @@
                 
                 if (!(t = thread_create(testit2, (void *) ((unative_t) 2 * i + 1), TASK, 0, "testit2", false))) {
-                        printf("could not create thread %d\n", 2 * i + 1);
+                        if (!quiet)
+                                printf("could not create thread %d\n", 2 * i + 1);
                         break;
                 }
@@ -136 +145 @@
                 total++;
         }
-        printf("ok\n");
+        
+        if (!quiet)
+                printf("ok\n");
                 
         thread_sleep(1);
@@ -142 +153 @@
         
         while (atomic_get(&threads_ok) != total) {
-                printf("Threads left: %d\n", total - atomic_get(&threads_ok));
+                if (!quiet)
+                        printf("Threads left: %d\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);
         }