Changeset 98000fb in mainline for kernel/test

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

Location:

kernel/test

Files:

• avltree/avltree1.c (modified) (4 diffs)
• mm/falloc2.c (modified) (2 diffs)
• mm/purge1.c (modified) (1 diff)
• synch/rwlock4.c (modified) (1 diff)

kernel/test/avltree/avltree1.c

@@ -195 +195 @@
 }
 
-static void test_tree_insert(avltree_t *tree, count_t node_count)
+static void test_tree_insert(avltree_t *tree, size_t node_count)
 {
         unsigned int i;
@@ -202 +202 @@
         avltree_create(tree);
         
-        TPRINTF("Inserting %" PRIc " nodes...", node_count);
+        TPRINTF("Inserting %" PRIs " nodes...", node_count);
         
         for (i = 0; i < node_count; i++) {
@@ -215 +215 @@
 }
 
-static void test_tree_delete(avltree_t *tree, count_t node_count,
+static void test_tree_delete(avltree_t *tree, size_t node_count,
     int node_position)
 {
@@ -246 +246 @@
 }
 
-static void test_tree_delmin(avltree_t *tree, count_t node_count)
+static void test_tree_delmin(avltree_t *tree, size_t node_count)
 {
         unsigned int i = 0;

kernel/test/mm/falloc2.c

@@ -53 +53 @@
         int order, run, allocated, i;
         uint8_t val = THREAD->tid % THREADS;
-        index_t k;
+        size_t k;
         
         void **frames =  (void **) malloc(MAX_FRAMES * sizeof(void *), FRAME_ATOMIC);
@@ -83 +83 @@
                         
                         for (i = 0; i < allocated; i++) {
-                                for (k = 0; k <= (((index_t) FRAME_SIZE << order) - 1); k++) {
+                                for (k = 0; k <= (((size_t) FRAME_SIZE << order) - 1); k++) {
                                         if (((uint8_t *) frames[i])[k] != val) {
-                                                TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %#" PRIi "\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
+                                                TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %#" PRIs "\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
                                                 atomic_inc(&thread_fail);
                                                 goto cleanup;

kernel/test/mm/purge1.c

@@ -38 +38 @@
 
 extern void tlb_invalidate_all(void);
-extern void tlb_invalidate_pages(asid_t asid, uintptr_t va, count_t cnt);
+extern void tlb_invalidate_pages(asid_t asid, uintptr_t va, size_t cnt);
 
 char *test_purge1(void)

kernel/test/synch/rwlock4.c

@@ -149 +149 @@
         
         context_save(&ctx);
-        TPRINTF("sp=%#x, readers_in=%" PRIc "\n", ctx.sp, rwlock.readers_in);
+        TPRINTF("sp=%#x, readers_in=%" PRIs "\n", ctx.sp, rwlock.readers_in);
         TPRINTF("Creating %" PRIu32 " readers\n", rd);