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

Timestamp:

2006-12-12T17:24:58Z (18 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/slab1.c (modified) (6 diffs)

kernel/test/mm/slab1.c

@@ -35 +35 @@
 #include <memstr.h>
 
-#ifdef CONFIG_BENCH
-#include <arch/cycle.h>
-#endif
-
 #define VAL_COUNT   1024
 
@@ -52 +48 @@
                                   SLAB_CACHE_NOMAGAZINE);       
         printf("Allocating %d items...", count);
-        for (i=0; i < count; i++) {
+        for (i = 0; i < count; i++) {
                 data[i] = slab_alloc(cache, 0);
-                memsetb((uintptr_t)data[i], size, 0);
+                memsetb((uintptr_t) data[i], size, 0);
         }
         printf("done.\n");
         printf("Freeing %d items...", count);
-        for (i=0; i < count; i++) {
+        for (i = 0; i < count; i++) {
                 slab_free(cache, data[i]);
         }
@@ -64 +60 @@
 
         printf("Allocating %d items...", count);
-        for (i=0; i < count; i++) {
+        for (i = 0; i < count; i++) {
                 data[i] = slab_alloc(cache, 0);
-                memsetb((uintptr_t)data[i], size, 0);
+                memsetb((uintptr_t) data[i], size, 0);
         }
         printf("done.\n");
 
-        printf("Freeing %d items...", count/2);
-        for (i=count-1; i >= count/2; i--) {
+        printf("Freeing %d items...", count / 2);
+        for (i = count - 1; i >= count / 2; i--) {
                 slab_free(cache, data[i]);
         }
         printf("done.\n");      
 
-        printf("Allocating %d items...", count/2);
-        for (i=count/2; i < count; i++) {
+        printf("Allocating %d items...", count / 2);
+        for (i = count / 2; i < count; i++) {
                 data[i] = slab_alloc(cache, 0);
-                memsetb((uintptr_t)data[i], size, 0);
+                memsetb((uintptr_t) data[i], size, 0);
         }
         printf("done.\n");
         printf("Freeing %d items...", count);
-        for (i=0; i < count; i++) {
+        for (i = 0; i < count; i++) {
                 slab_free(cache, data[i]);
         }
@@ -104 +100 @@
 }
 
-
 #define THREADS     6
 #define THR_MEM_COUNT   1024
 #define THR_MEM_SIZE    128
 
-void * thr_data[THREADS][THR_MEM_COUNT];
-slab_cache_t *thr_cache;
-semaphore_t thr_sem;
+static void * thr_data[THREADS][THR_MEM_COUNT];
+static slab_cache_t *thr_cache;
+static semaphore_t thr_sem;
 
 static void slabtest(void *data)
 {
-        int offs = (int)(unative_t) data;
-        int i,j;
+        int offs = (int) (unative_t) data;
+        int i, j;
         
         thread_detach(THREAD);
         
         printf("Starting thread #%d...\n",THREAD->tid);
-        for (j=0; j<10; j++) {
-                for (i=0; i<THR_MEM_COUNT; i++)
+        for (j = 0; j < 10; j++) {
+                for (i = 0; i < THR_MEM_COUNT; i++)
                         thr_data[offs][i] = slab_alloc(thr_cache,0);
-                for (i=0; i<THR_MEM_COUNT/2; i++)
+                for (i = 0; i < THR_MEM_COUNT / 2; i++)
                         slab_free(thr_cache, thr_data[offs][i]);
-                for (i=0; i< THR_MEM_COUNT/2; i++)
+                for (i = 0; i < THR_MEM_COUNT / 2; i++)
                         thr_data[offs][i] = slab_alloc(thr_cache, 0);
-                for (i=0; i<THR_MEM_COUNT;i++)
+                for (i = 0; i < THR_MEM_COUNT; i++)
                         slab_free(thr_cache, thr_data[offs][i]);
         }
@@ -143 +138 @@
                                       NULL, NULL, 
                                       SLAB_CACHE_NOMAGAZINE);
-        semaphore_initialize(&thr_sem,0);
-        for (i=0; i<THREADS; i++) {  
-                if (!(t = thread_create(slabtest, (void *)(unative_t)i, TASK, 0, "slabtest")))
-                        panic("could not create thread\n");
-                thread_ready(t);
+        semaphore_initialize(&thr_sem, 0);
+        for (i = 0; i < THREADS; i++) {  
+                if (!(t = thread_create(slabtest, (void *) (unative_t) i, TASK, 0, "slabtest")))
+                        printf("Could not create thread %d\n", i);
+                else
+                        thread_ready(t);
         }
 
-        for (i=0; i<THREADS; i++)
+        for (i = 0; i < THREADS; i++)
                 semaphore_down(&thr_sem);
         
@@ -158 +154 @@
 }
 
-void test_slab1(void)
+char * test_slab1(void)
 {
-#ifdef CONFIG_BENCH
-        uint64_t t0 = get_cycle();
-#endif
         testsimple();
         testthreads();
-#ifdef CONFIG_BENCH
-        uint64_t dt = get_cycle() - t0;
-        printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
-#endif
+        
+        return NULL;
 }