Changeset 96348adc in mainline for kernel/test/mm/slab2.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/slab2.c (modified) (7 diffs)

kernel/test/mm/slab2.c

@@ -38 +38 @@
 #include <synch/mutex.h>
 
-#ifdef CONFIG_BENCH
-#include <arch/cycle.h>
-#endif
-
 #define ITEM_SIZE 256
 
@@ -78 +74 @@
                 olddata1 = data1;
                 olddata2 = data2;
-        }while(1);
+        } while(1);
         printf("done.\n");
         /* We do not have memory - now deallocate cache2 */
@@ -129 +125 @@
 static void slabtest(void *priv)
 {
-        void *data=NULL, *new;
+        void *data = NULL, *new;
 
         thread_detach(THREAD);
@@ -173 +169 @@
         }
 
-
         printf("Thread #%d finished\n", THREAD->tid);
         slab_print_list();
         semaphore_up(&thr_sem);
 }
-
 
 static void multitest(int size)
@@ -196 +190 @@
                                       0);
         semaphore_initialize(&thr_sem,0);
-        for (i=0; i<THREADS; i++) {  
+        for (i = 0; i < THREADS; i++) {  
                 if (!(t = thread_create(slabtest, NULL, TASK, 0, "slabtest")))
-                        panic("could not create thread\n");
-                thread_ready(t);
+                        printf("Could not create thread %d\n", i);
+                else
+                        thread_ready(t);
         }
         thread_sleep(1);
         condvar_broadcast(&thread_starter);
 
-        for (i=0; i<THREADS; i++)
+        for (i = 0; i < THREADS; i++)
                 semaphore_down(&thr_sem);
         
@@ -211 +206 @@
 }
 
-void test_slab2(void)
-{
-#ifdef CONFIG_BENCH
-        uint64_t t0 = get_cycle();
-#endif
-
-        printf("Running reclaim single-thread test .. pass1\n");
+char * test_slab2(void)
+{
+        printf("Running reclaim single-thread test .. pass 1\n");
         totalmemtest();
-        printf("Running reclaim single-thread test .. pass2\n");
+        printf("Running reclaim single-thread test .. pass 2\n");
         totalmemtest();
         printf("Reclaim test OK.\n");
@@ -227 +218 @@
         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
-}
+        
+        return NULL;
+}