Changeset deada67 in mainline for kernel/test/mm/falloc2.c

Timestamp:

2006-12-19T17:54:50Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

730376d

Parents:

6536a4a9

Message:

quiet variants of tests

File:

• kernel/test/mm/falloc2.c (modified) (9 diffs)

kernel/test/mm/falloc2.c

@@ -48 +48 @@
 static atomic_t thread_count;
 static atomic_t thread_fail;
+static bool sh_quiet;
 
 static void falloc(void * arg)
@@ -57 +58 @@
         uintptr_t * frames =  (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
         if (frames == NULL) {
-                printf("Thread #%d (cpu%d): Unable to allocate frames\n", THREAD->tid, CPU->id);
+                if (!sh_quiet)
+                        printf("Thread #%d (cpu%d): Unable to allocate frames\n", THREAD->tid, CPU->id);
                 atomic_inc(&thread_fail);
                 atomic_dec(&thread_count);
@@ -67 +69 @@
         for (run = 0; run < THREAD_RUNS; run++) {
                 for (order = 0; order <= MAX_ORDER; order++) {
-                        printf("Thread #%d (cpu%d): Allocating %d frames blocks ... \n", THREAD->tid, CPU->id, 1 << order);
+                        if (!sh_quiet)
+                                printf("Thread #%d (cpu%d): Allocating %d frames blocks ... \n", THREAD->tid, CPU->id, 1 << order);
+                        
                         allocated = 0;
                         for (i = 0; i < (MAX_FRAMES >> order); i++) {
@@ -77 +81 @@
                                         break;
                         }
-                        printf("Thread #%d (cpu%d): %d blocks allocated.\n", THREAD->tid, CPU->id, allocated);
-
-                        printf("Thread #%d (cpu%d): Deallocating ... \n", THREAD->tid, CPU->id);
+                        
+                        if (!sh_quiet)
+                                printf("Thread #%d (cpu%d): %d blocks allocated.\n", THREAD->tid, CPU->id, allocated);
+                        
+                        if (!sh_quiet)
+                                printf("Thread #%d (cpu%d): Deallocating ... \n", THREAD->tid, CPU->id);
+                        
                         for (i = 0; i < allocated; i++) {
                                 for (k = 0; k <= ((FRAME_SIZE << order) - 1); k++) {
                                         if (((uint8_t *) frames[i])[k] != val) {
-                                                printf("Thread #%d (cpu%d): Unexpected data (%d) in block %p offset %#zx\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
+                                                if (!sh_quiet)
+                                                        printf("Thread #%d (cpu%d): Unexpected data (%d) in block %p offset %#zx\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
                                                 atomic_inc(&thread_fail);
                                                 goto cleanup;
@@ -90 +99 @@
                                 frame_free(KA2PA(frames[i]));
                         }
-                        printf("Thread #%d (cpu%d): Finished run.\n", THREAD->tid, CPU->id);
+                        
+                        if (!sh_quiet)
+                                printf("Thread #%d (cpu%d): Finished run.\n", THREAD->tid, CPU->id);
                 }
         }
@@ -96 +107 @@
 cleanup:        
         free(frames);
-        printf("Thread #%d (cpu%d): Exiting\n", THREAD->tid, CPU->id);
+        
+        if (!sh_quiet)
+                printf("Thread #%d (cpu%d): Exiting\n", THREAD->tid, CPU->id);
         atomic_dec(&thread_count);
 }
@@ -103 +116 @@
 {
         unsigned int i;
+        sh_quiet = quiet;
 
         atomic_set(&thread_count, THREADS);
@@ -110 +124 @@
                 thread_t * thrd = thread_create(falloc, NULL, TASK, 0, "falloc", false);
                 if (!thrd) {
-                        printf("Could not create thread %d\n", i);
+                        if (!quiet)
+                                printf("Could not create thread %d\n", i);
                         break;
                 }
@@ -117 +132 @@
         
         while (atomic_get(&thread_count) > 0) {
-                printf("Threads left: %d\n", atomic_get(&thread_count));
+                if (!quiet)
+                        printf("Threads left: %d\n", atomic_get(&thread_count));
                 thread_sleep(1);
         }