Changeset 4a2f4bb in mainline for test/mm/falloc1/test.c

Timestamp:

2006-01-25T21:18:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a003d5b

Parents:

895be41

Message:

Fix and cleanup frame allocator tests.
falloc1:

• fix so that it compiles on ia64
• check that frames is not NULL

falloc2:

• threads cannot be passed argument in the way this test did (otherwise some threads will use the same value for val)
  • check that frames is not NULL
  • free frames at the end of the test

File:

• test/mm/falloc1/test.c (modified) (5 diffs)

test/mm/falloc1/test.c

@@ -34 +34 @@
 #include <arch/types.h>
 #include <debug.h>
+#include <align.h>
 
 #define MAX_FRAMES 1024
@@ -48 +49 @@
 
         ASSERT(TEST_RUNS > 1);
+        ASSERT(frames != NULL)
 
-        for (run=0;run<=TEST_RUNS;run++) {
-                for (order=0;order<=MAX_ORDER;order++) {
-                        printf("Allocating %d frames blocks ... ", 1<<order);
+        for (run = 0; run < TEST_RUNS; run++) {
+                for (order = 0; order <= MAX_ORDER; order++) {
+                        printf("Allocating %d frames blocks ... ", 1 << order);
                         allocated = 0;
-                        for (i=0;i<MAX_FRAMES>>order;i++) {
+                        for (i = 0; i < MAX_FRAMES >> order; i++) {
                                 frames[allocated] = frame_alloc(FRAME_NON_BLOCKING | FRAME_KA, order, &status);
                                 
-                                if (frames[allocated] % (FRAME_SIZE << order) != 0) {
+                                if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
                                         panic("Test failed. Block at address %X (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
                                 }
@@ -68 +70 @@
                         }
                 
-                        printf("%d blocks alocated.\n", allocated);
+                        printf("%d blocks allocated.\n", allocated);
                 
                         if (run) {
@@ -74 +76 @@
                                         panic("Test failed. Frame leak possible.\n");
                                 }
-                        } else results[order] = allocated;
+                        } else
+                                results[order] = allocated;
                         
                         printf("Deallocating ... ");
-                        for (i=0;i<allocated;i++) {
+                        for (i = 0; i < allocated; i++) {
                                 frame_free(frames[i]);
                         }
@@ -86 +89 @@
         free(frames);
         
-        printf("Test passed\n");
+        printf("Test passed.\n");
 }