Changeset 319e60e in mainline for kernel/test

Timestamp:

2006-12-11T18:33:53Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

50661ab

Parents:

134877d

Message:

prepare for new test infrastructure

Location:

kernel/test

Files:

• atomic/atomic1.c (moved) (moved from kernel/test/atomic/atomic1/test.c ) (2 diffs)
• mm/slab2/test.c (modified) (3 diffs)
• test.c (added)
• test.h (moved) (moved from kernel/generic/include/test.h ) (3 diffs)

kernel/test/atomic/atomic1.c

@@ -32 +32 @@
 #include <debug.h>
 
-void test(void)
+#ifdef CONFIG_BENCH
+#include <arch/cycle.h>
+#endif
+
+void test_atomic1(void)
 {
+#ifdef CONFIG_BENCH
+        uint64_t t0 = get_cycle();
+#endif
         atomic_t a;
 
@@ -52 +59 @@
         ASSERT(atomic_get(&a) == 10);
 
-        printf("Test passed.\n");       
+        printf("Test passed.\n");
+#ifdef CONFIG_BENCH
+        uint64_t dt = get_cycle() - t0;
+        printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
+#endif
         return;
 }

kernel/test/mm/slab2/test.c

@@ -38 +38 @@
 #include <synch/mutex.h>
 
+#ifdef CONFIG_BENCH
+#include <arch/cycle.h>
+#endif
+
 #define ITEM_SIZE 256
 
@@ -209 +213 @@
 void test(void)
 {
+#ifdef CONFIG_BENCH
+        uint64_t t0 = get_cycle();
+#endif
+
         printf("Running reclaim single-thread test .. pass1\n");
         totalmemtest();
@@ -219 +227 @@
         multitest(8192);
         printf("All done.\n");
-}
+
+#ifdef CONFIG_BENCH
+        uint64_t dt = get_cycle() - t0;
+        printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
+#endif
+}

kernel/test/test.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2001-2004 Jakub Jermar
+ * Copyright (C) 2006 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup test
  * @{
  */
@@ -36 +36 @@
 #define KERN_TEST_H_
 
-extern void test(void);
+#include <arch/types.h>
+#include <typedefs.h>
+
+typedef struct {
+        char * name;
+        char * desc;
+        function entry;
+} test_t;
+
+extern void test_atomic1(void);
+
+extern test_t tests[];
 
 #endif