Changeset cb01e1e in mainline for kernel/test/mm/falloc1.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/mm/falloc1.c (modified) (5 diffs)

kernel/test/mm/falloc1.c

@@ -37 +37 @@
 #include <align.h>
 
-#define MAX_FRAMES 1024
-#define MAX_ORDER 8
-#define TEST_RUNS 2
+#define MAX_FRAMES  1024
+#define MAX_ORDER   8
+#define TEST_RUNS   2
 
-char * test_falloc1(bool quiet) {
-        uintptr_t * frames = (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), 0);
+char *test_falloc1(void) {
+        uintptr_t *frames
+            = (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), 0);
         int results[MAX_ORDER + 1];
         
@@ -53 +54 @@
         if (frames == NULL)
                 return "Unable to allocate frames";
-
+        
         for (run = 0; run < TEST_RUNS; run++) {
                 for (order = 0; order <= MAX_ORDER; order++) {
-                        if (!quiet)
-                                printf("Allocating %d frames blocks ... ", 1 << order);
+                        TPRINTF("Allocating %d frames blocks ... ", 1 << order);
                         
                         allocated = 0;
@@ -64 +64 @@
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
-                                        if (!quiet)
-                                                printf("Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
+                                        TPRINTF("Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
                                         return "Test failed";
                                 }
@@ -72 +71 @@
                                         allocated++;
                                 else {
-                                        if (!quiet)
-                                                printf("done. ");
+                                        TPRINTF("done. ");
                                         break;
                                 }
                         }
                         
-                        if (!quiet)
-                                printf("%d blocks allocated.\n", allocated);
-                
+                        TPRINTF("%d blocks allocated.\n", allocated);
+                        
                         if (run) {
                                 if (results[order] != allocated)
@@ -87 +84 @@
                                 results[order] = allocated;
                         
-                        if (!quiet)
-                                printf("Deallocating ... ");
+                        TPRINTF("Deallocating ... ");
                         
                         for (i = 0; i < allocated; i++)
                                 frame_free(KA2PA(frames[i]));
                         
-                        if (!quiet)
-                                printf("done.\n");
+                        TPRINTF("done.\n");
                 }
         }
-
+        
         free(frames);