Changeset 1093620 in mainline for test

Timestamp:

2006-01-22T16:51:11Z (20 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

0d8d27c

Parents:

bd6e392

Message:

Fixes, comments, tests to frame allocator

Location:

test/mm

Files:

• falloc1/test.c (modified) (3 diffs)
• falloc2/test.c (modified) (6 diffs)

test/mm/falloc1/test.c

@@ -30 +30 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/heap.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
 #include <debug.h>
 
-#define MAX_FRAMES 2048
+#define MAX_FRAMES 1024
 #define MAX_ORDER 8
-#define TEST_RUNS 4
+#define TEST_RUNS 2
 
 void test(void) {
-        __address frames[MAX_FRAMES];
+        __address * frames = (__address *) malloc(MAX_FRAMES*sizeof(__address));
         int results[MAX_ORDER+1];
         
@@ -53 +54 @@
                         allocated = 0;
                         for (i=0;i<MAX_FRAMES>>order;i++) {
-                                frames[allocated] = frame_alloc(FRAME_NON_BLOCKING, order, &status);
+                                frames[allocated] = frame_alloc(FRAME_NON_BLOCKING | FRAME_KA, order, &status);
                                 
                                 if (frames[allocated] % (FRAME_SIZE << order) != 0) {
@@ -83 +84 @@
         }
 
-
+        free(frames);
         
         printf("Test passed\n");

test/mm/falloc2/test.c

@@ -30 +30 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/heap.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
@@ -37 +38 @@
 #include <memstr.h>
 
-#define MAX_FRAMES 128
-#define MAX_ORDER 2
+#define MAX_FRAMES 256
+#define MAX_ORDER 8
 
 #define THREAD_RUNS 1
-#define THREADS 6
+#define THREADS 8
 
 static void thread(void * arg);
@@ -54 +55 @@
         index_t k;
         
-        __address frames[MAX_FRAMES];
+        __address * frames =  (__address *) malloc(MAX_FRAMES * sizeof(__address));
 
         for (run=0;run<THREAD_RUNS;run++) {
@@ -61 +62 @@
                         printf("Thread #%d: Allocating %d frames blocks ... \n",val, 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 (status == 0) {
@@ -75 +76 @@
                         printf("Thread #%d: Deallocating ... \n", val);
                         for (i=0;i<allocated;i++) {
+                        
                                 for (k=0;k<=((FRAME_SIZE << order) - 1);k++) {
                                         if ( ((char *) frames[i])[k] != val ) {
@@ -82 +84 @@
                                 
                                 }
-                        
+                                
                                 frame_free(frames[i]);
                         }