Changeset 96348adc in mainline for kernel/test/mm/falloc2.c

Timestamp:

2006-12-12T17:24:58Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7e13972

Parents:

34db7fa

Message:

cleanup tests

File:

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

kernel/test/mm/falloc2.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include <print.h>
 #include <test.h>
@@ -39 +40 @@
 #include <arch.h>
 
-#ifdef CONFIG_BENCH
-#include <arch/cycle.h>
-#endif
-
 #define MAX_FRAMES 256
 #define MAX_ORDER 8
@@ -49 +46 @@
 #define THREADS 8
 
-static void falloc(void * arg);
-static void failed(void);
+static atomic_t thread_count;
+static atomic_t thread_fail;
 
-static atomic_t thread_count;
-
-void falloc(void * arg)
+static void falloc(void * arg)
 {
         int order, run, allocated, i;
@@ -61 +56 @@
         
         uintptr_t * frames =  (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
-        ASSERT(frames != NULL);
+        if (frames == NULL) {
+                printf("Thread #%d (cpu%d): Unable to allocate frames\n", THREAD->tid, CPU->id);
+                atomic_inc(&thread_fail);
+                atomic_dec(&thread_count);
+                return;
+        }
         
         thread_detach(THREAD);
@@ -74 +74 @@
                                         memsetb(frames[allocated], FRAME_SIZE << order, val);
                                         allocated++;
-                                } else {
+                                } else
                                         break;
-                                }
                         }
                         printf("Thread #%d (cpu%d): %d blocks allocated.\n", THREAD->tid, CPU->id, allocated);
@@ -85 +84 @@
                                         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);
-                                                failed();
+                                                atomic_inc(&thread_fail);
+                                                goto cleanup;
                                         }
                                 }
@@ -93 +93 @@
                 }
         }
-        
+
+cleanup:        
         free(frames);
         printf("Thread #%d (cpu%d): Exiting\n", THREAD->tid, CPU->id);
@@ -99 +100 @@
 }
 
-
-void failed(void)
+char * test_falloc2(void)
 {
-        panic("Test failed.\n");
-}
-
-
-void test_falloc2(void)
-{
-#ifdef CONFIG_BENCH
-        uint64_t t0 = get_cycle();
-#endif
-        int i;
+        unsigned int i;
 
         atomic_set(&thread_count, THREADS);
+        atomic_set(&thread_fail, 0);
                 
         for (i = 0; i < THREADS; i++) {
-                thread_t * thrd;
-                thrd = thread_create(falloc, NULL, TASK, 0, "falloc");
-                if (thrd)
-                        thread_ready(thrd);
-                else
-                        failed();
+                thread_t * thrd = thread_create(falloc, NULL, TASK, 0, "falloc");
+                if (!thrd) {
+                        printf("Could not create thread %d\n", i);
+                        break;
+                }
+                thread_ready(thrd);
         }
         
-        while (thread_count.count)
-                ;
-
-        printf("Test passed.\n");
-#ifdef CONFIG_BENCH
-        uint64_t dt = get_cycle() - t0;
-        printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
-#endif
+        while (atomic_get(&thread_count) > 0) {
+                printf("Threads left: %d\n", atomic_get(&thread_count));
+                thread_sleep(1);
+        }
+        
+        if (atomic_get(&thread_fail) == 0)
+                return NULL;
+        
+        return "Test failed";
 }