Changeset e6a78b9 in mainline for kernel/test
- Timestamp:
- 2012-06-29T15:31:44Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 9432f08
- Parents:
- 34ab31c0 (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- kernel/test
- Files:
-
- 7 edited
-
mm/falloc1.c (modified) (2 diffs)
-
mm/falloc2.c (modified) (8 diffs)
-
mm/slab1.c (modified) (1 diff)
-
mm/slab2.c (modified) (2 diffs)
-
synch/semaphore1.c (modified) (2 diffs)
-
synch/semaphore2.c (modified) (1 diff)
-
thread/thread1.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
kernel/test/mm/falloc1.c
r34ab31c0 re6a78b9 37 37 #include <align.h> 38 38 39 #define MAX_FRAMES 1024 39 #define MAX_FRAMES 1024U 40 40 #define MAX_ORDER 8 41 41 #define TEST_RUNS 2 42 42 43 const char *test_falloc1(void) { 44 uintptr_t *frames 45 = (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), 0); 46 int results[MAX_ORDER + 1]; 47 48 int i, order, run; 49 int allocated; 50 43 const char *test_falloc1(void) 44 { 51 45 if (TEST_RUNS < 2) 52 46 return "Test is compiled with TEST_RUNS < 2"; 53 47 48 uintptr_t *frames = (uintptr_t *) 49 malloc(MAX_FRAMES * sizeof(uintptr_t), 0); 54 50 if (frames == NULL) 55 51 return "Unable to allocate frames"; 56 52 57 for (run = 0; run < TEST_RUNS; run++) { 58 for (order = 0; order <= MAX_ORDER; order++) { 59 TPRINTF("Allocating %d frames blocks ... ", 1 << order); 53 unsigned int results[MAX_ORDER + 1]; 54 for (unsigned int run = 0; run < TEST_RUNS; run++) { 55 for (unsigned int order = 0; order <= MAX_ORDER; order++) { 56 TPRINTF("Allocating %u frames blocks ... ", 1 << order); 60 57 61 allocated = 0; 62 for (i = 0; i < MAX_FRAMES >> order; i++) { 63 frames[allocated] = (uintptr_t) frame_alloc(order, FRAME_ATOMIC | FRAME_KA); 58 unsigned int allocated = 0; 59 for (unsigned int i = 0; i < (MAX_FRAMES >> order); i++) { 60 frames[allocated] = (uintptr_t) 61 frame_alloc(order, FRAME_ATOMIC | FRAME_KA); 64 62 65 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) { 66 TPRINTF("Block at address %p (size %dK) is not aligned\n", 63 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != 64 frames[allocated]) { 65 TPRINTF("Block at address %p (size %u) is not aligned\n", 67 66 (void *) frames[allocated], (FRAME_SIZE << order) >> 10); 68 67 return "Test failed"; … … 87 86 TPRINTF("Deallocating ... "); 88 87 89 for ( i = 0; i < allocated; i++)88 for (unsigned int i = 0; i < allocated; i++) 90 89 frame_free(KA2PA(frames[i])); 91 90 -
kernel/test/mm/falloc2.c
r34ab31c0 re6a78b9 40 40 #include <arch.h> 41 41 42 #define MAX_FRAMES 256 42 #define MAX_FRAMES 256U 43 43 #define MAX_ORDER 8 44 44 … … 51 51 static void falloc(void *arg) 52 52 { 53 int order, run, allocated, i;54 53 uint8_t val = THREAD->tid % THREADS; 55 size_t k;56 54 57 void **frames = (void **) malloc(MAX_FRAMES * sizeof(void *), FRAME_ATOMIC); 55 void **frames = (void **) 56 malloc(MAX_FRAMES * sizeof(void *), FRAME_ATOMIC); 58 57 if (frames == NULL) { 59 TPRINTF("Thread #%" PRIu64 " (cpu%u): Unable to allocate frames\n", THREAD->tid, CPU->id); 58 TPRINTF("Thread #%" PRIu64 " (cpu%u): " 59 "Unable to allocate frames\n", THREAD->tid, CPU->id); 60 60 atomic_inc(&thread_fail); 61 61 atomic_dec(&thread_count); … … 65 65 thread_detach(THREAD); 66 66 67 for (run = 0; run < THREAD_RUNS; run++) { 68 for (order = 0; order <= MAX_ORDER; order++) { 69 TPRINTF("Thread #%" PRIu64 " (cpu%u): Allocating %d frames blocks ... \n", THREAD->tid, CPU->id, 1 << order); 67 for (unsigned int run = 0; run < THREAD_RUNS; run++) { 68 for (unsigned int order = 0; order <= MAX_ORDER; order++) { 69 TPRINTF("Thread #%" PRIu64 " (cpu%u): " 70 "Allocating %u frames blocks ... \n", THREAD->tid, 71 CPU->id, 1 << order); 70 72 71 allocated = 0; 72 for (i = 0; i < (MAX_FRAMES >> order); i++) { 73 frames[allocated] = frame_alloc(order, FRAME_ATOMIC | FRAME_KA); 73 unsigned int allocated = 0; 74 for (unsigned int i = 0; i < (MAX_FRAMES >> order); i++) { 75 frames[allocated] = 76 frame_alloc(order, FRAME_ATOMIC | FRAME_KA); 74 77 if (frames[allocated]) { 75 78 memsetb(frames[allocated], FRAME_SIZE << order, val); … … 79 82 } 80 83 81 TPRINTF("Thread #%" PRIu64 " (cpu%u): %d blocks allocated.\n", THREAD->tid, CPU->id, allocated); 82 TPRINTF("Thread #%" PRIu64 " (cpu%u): Deallocating ... \n", THREAD->tid, CPU->id); 84 TPRINTF("Thread #%" PRIu64 " (cpu%u): " 85 "%u blocks allocated.\n", THREAD->tid, CPU->id, 86 allocated); 87 TPRINTF("Thread #%" PRIu64 " (cpu%u): " 88 "Deallocating ... \n", THREAD->tid, CPU->id); 83 89 84 for (i = 0; i < allocated; i++) { 85 for (k = 0; k <= (((size_t) FRAME_SIZE << order) - 1); k++) { 90 for (unsigned int i = 0; i < allocated; i++) { 91 for (size_t k = 0; k <= (((size_t) FRAME_SIZE << order) - 1); 92 k++) { 86 93 if (((uint8_t *) frames[i])[k] != val) { 87 TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %zu\n", 88 THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k); 94 TPRINTF("Thread #%" PRIu64 " (cpu%u): " 95 "Unexpected data (%c) in block %p offset %zu\n", 96 THREAD->tid, CPU->id, ((char *) frames[i])[k], 97 frames[i], k); 89 98 atomic_inc(&thread_fail); 90 99 goto cleanup; … … 94 103 } 95 104 96 TPRINTF("Thread #%" PRIu64 " (cpu%u): Finished run.\n", THREAD->tid, CPU->id); 105 TPRINTF("Thread #%" PRIu64 " (cpu%u): " 106 "Finished run.\n", THREAD->tid, CPU->id); 97 107 } 98 108 } … … 101 111 free(frames); 102 112 103 TPRINTF("Thread #%" PRIu64 " (cpu%u): Exiting\n", THREAD->tid, CPU->id); 113 TPRINTF("Thread #%" PRIu64 " (cpu%u): Exiting\n", 114 THREAD->tid, CPU->id); 104 115 atomic_dec(&thread_count); 105 116 } … … 107 118 const char *test_falloc2(void) 108 119 { 109 unsigned int i;110 111 120 atomic_set(&thread_count, THREADS); 112 121 atomic_set(&thread_fail, 0); 113 122 114 for (i = 0; i < THREADS; i++) { 115 thread_t * thrd = thread_create(falloc, NULL, TASK, 0, "falloc", false); 123 for (unsigned int i = 0; i < THREADS; i++) { 124 thread_t *thrd = thread_create(falloc, NULL, TASK, 125 THREAD_FLAG_NONE, "falloc2"); 116 126 if (!thrd) { 117 127 TPRINTF("Could not create thread %u\n", i); … … 122 132 123 133 while (atomic_get(&thread_count) > 0) { 124 TPRINTF("Threads left: %" PRIua "\n", atomic_get(&thread_count)); 134 TPRINTF("Threads left: %" PRIua "\n", 135 atomic_get(&thread_count)); 125 136 thread_sleep(1); 126 137 } -
kernel/test/mm/slab1.c
r34ab31c0 re6a78b9 155 155 156 156 semaphore_initialize(&thr_sem, 0); 157 for (i = 0; i < THREADS; i++) { 158 if (!(t = thread_create(slabtest, (void *) (sysarg_t) i, TASK, 0, "slabtest", false))) {157 for (i = 0; i < THREADS; i++) { 158 if (!(t = thread_create(slabtest, (void *) (sysarg_t) i, TASK, THREAD_FLAG_NONE, "slabtest"))) { 159 159 TPRINTF("Could not create thread %d\n", i); 160 160 } else -
kernel/test/mm/slab2.c
r34ab31c0 re6a78b9 52 52 void *olddata1 = NULL, *olddata2 = NULL; 53 53 54 cache1 = slab_cache_create(" cache1_tst", ITEM_SIZE, 0, NULL, NULL, 0);55 cache2 = slab_cache_create(" cache2_tst", ITEM_SIZE, 0, NULL, NULL, 0);54 cache1 = slab_cache_create("test_cache1", ITEM_SIZE, 0, NULL, NULL, 0); 55 cache2 = slab_cache_create("test_cache2", ITEM_SIZE, 0, NULL, NULL, 0); 56 56 57 57 TPRINTF("Allocating..."); … … 210 210 thr_cache = slab_cache_create("thread_cache", size, 0, NULL, NULL, 0); 211 211 semaphore_initialize(&thr_sem,0); 212 for (i = 0; i < THREADS; i++) { 213 if (!(t = thread_create(slabtest, NULL, TASK, 0, "slabtest", false))) {212 for (i = 0; i < THREADS; i++) { 213 if (!(t = thread_create(slabtest, NULL, TASK, THREAD_FLAG_NONE, "slabtest"))) { 214 214 TPRINTF("Could not create thread %d\n", i); 215 215 } else -
kernel/test/synch/semaphore1.c
r34ab31c0 re6a78b9 93 93 for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) { 94 94 for (k = 0; k < i; k++) { 95 thrd = thread_create(consumer, NULL, TASK, 0, "consumer", false); 95 thrd = thread_create(consumer, NULL, TASK, 96 THREAD_FLAG_NONE, "consumer"); 96 97 if (thrd) 97 98 thread_ready(thrd); … … 100 101 } 101 102 for (k = 0; k < (4 - i); k++) { 102 thrd = thread_create(producer, NULL, TASK, 0, "producer", false); 103 thrd = thread_create(producer, NULL, TASK, 104 THREAD_FLAG_NONE, "producer"); 103 105 if (thrd) 104 106 thread_ready(thrd); -
kernel/test/synch/semaphore2.c
r34ab31c0 re6a78b9 93 93 TPRINTF("Creating %" PRIu32 " consumers\n", k); 94 94 for (i = 0; i < k; i++) { 95 thrd = thread_create(consumer, NULL, TASK, 0, "consumer", false); 95 thrd = thread_create(consumer, NULL, TASK, 96 THREAD_FLAG_NONE, "consumer"); 96 97 if (thrd) 97 98 thread_ready(thrd); -
kernel/test/thread/thread1.c
r34ab31c0 re6a78b9 63 63 for (i = 0; i < THREADS; i++) { 64 64 thread_t *t; 65 if (!(t = thread_create(threadtest, NULL, TASK, 0, "threadtest", false))) { 65 if (!(t = thread_create(threadtest, NULL, TASK, 66 THREAD_FLAG_NONE, "threadtest"))) { 66 67 TPRINTF("Could not create thread %d\n", i); 67 68 break;
Note:
See TracChangeset
for help on using the changeset viewer.
