Changeset 7ee0e2f in mainline for test

Timestamp:

2006-06-26T10:18:05Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2f40fe4

Parents:

e45f81a

Message:

Remove unneeded FRAME_PANIC.
Fix some things broken by last commit.

Location:

test/mm

Files:

• falloc1/test.c (modified) (2 diffs)
• falloc2/test.c (modified) (2 diffs)

test/mm/falloc1/test.c

@@ -55 +55 @@
                         allocated = 0;
                         for (i = 0; i < MAX_FRAMES >> order; i++) {
-                                frames[allocated] = frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+                                frames[allocated] = (__address) frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
@@ -61 +61 @@
                                 }
                                 
-                                if (status == 0) {
+                                if (frames[allocated]) {
                                         allocated++;
                                 } else {

test/mm/falloc2/test.c

@@ -52 +52 @@
 void falloc(void * arg)
 {
-        int status, order, run, allocated, i;
+        int order, run, allocated, i;
         __u8 val = THREAD->tid % THREADS;
         index_t k;
@@ -66 +66 @@
                         allocated = 0;
                         for (i = 0; i < (MAX_FRAMES >> order); i++) {
-                                frames[allocated] = frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status);
-                                if (status == 0) {
+                                frames[allocated] = (__address)frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+                                if (frames[allocated]) {
                                         memsetb(frames[allocated], FRAME_SIZE << order, val);
                                         allocated++;