Changeset 7e752b2 in mainline for kernel/test


Ignore:
Timestamp:
2010-11-26T01:33:20Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bf61d3a
Parents:
202f57b
Message:
  • correct printf() formatting strings and corresponding arguments
  • minor cstyle changes and other small fixes
Location:
kernel/test
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • kernel/test/avltree/avltree1.c

    r202f57b r7e752b2  
    202202        avltree_create(tree);
    203203       
    204         TPRINTF("Inserting %" PRIs " nodes...", node_count);
     204        TPRINTF("Inserting %zu nodes...", node_count);
    205205       
    206206        for (i = 0; i < node_count; i++) {

  • kernel/test/fpu/fpu1_ia64.c

    r202f57b r7e752b2  
    161161       
    162162        while (atomic_get(&threads_ok) != total) {
    163                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     163                TPRINTF("Threads left: %" PRIua "\n",
     164                    total - atomic_get(&threads_ok));
    164165                thread_sleep(1);
    165166        }

  • kernel/test/fpu/fpu1_x86.c

    r202f57b r7e752b2  
    8282               
    8383                if ((int) (100000000 * e) != E_10e8) {
    84                         TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
     84                        TPRINTF("tid%" PRIu64 ": e*10e8=%" PRIun " should be %" PRIun "\n",
     85                            THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
    8586                        atomic_inc(&threads_fault);
    8687                        break;
    … …  
    115116               
    116117                if ((int) (100000000 * pi) != PI_10e8) {
    117                         TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
     118                        TPRINTF("tid%" PRIu64 ": pi*10e8=%" PRIun " should be %" PRIun "\n",
     119                            THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
    118120                        atomic_inc(&threads_fault);
    119121                        break;
    … …  
    158160       
    159161        while (atomic_get(&threads_ok) != total) {
    160                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     162                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
    161163                thread_sleep(1);
    162164        }

  • kernel/test/fpu/sse1.c

    r202f57b r7e752b2  
    142142       
    143143        while (atomic_get(&threads_ok) != total) {
    144                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     144                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
    145145                thread_sleep(1);
    146146        }

  • kernel/test/mm/falloc1.c

    r202f57b r7e752b2  
    6464                               
    6565                                if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
    66                                         TPRINTF("Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
     66                                        TPRINTF("Block at address %p (size %dK) is not aligned\n",
     67                                            (void *) frames[allocated], (FRAME_SIZE << order) >> 10);
    6768                                        return "Test failed";
    6869                                }

  • kernel/test/mm/falloc2.c

    r202f57b r7e752b2  
    8585                                for (k = 0; k <= (((size_t) FRAME_SIZE << order) - 1); k++) {
    8686                                        if (((uint8_t *) frames[i])[k] != val) {
    87                                                 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);
     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);
    8889                                                atomic_inc(&thread_fail);
    8990                                                goto cleanup;
    … …  
    121122       
    122123        while (atomic_get(&thread_count) > 0) {
    123                 TPRINTF("Threads left: %ld\n", atomic_get(&thread_count));
     124                TPRINTF("Threads left: %" PRIua "\n", atomic_get(&thread_count));
    124125                thread_sleep(1);
    125126        }

  • kernel/test/mm/mapping1.c

    r202f57b r7e752b2  
    3939#define PAGE1  (PAGE0 + PAGE_SIZE)
    4040
    41 #define VALUE0  0x01234567
    42 #define VALUE1  0x89abcdef
     41#define VALUE0  UINT32_C(0x01234567)
     42#define VALUE1  UINT32_C(0x89abcdef)
    4343
    4444const char *test_mapping1(void)
    … …  
    5050        frame1 = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_KA);
    5151       
    52         TPRINTF("Writing %#x to physical address %p.\n", VALUE0, KA2PA(frame0));
     52        TPRINTF("Writing %#" PRIx32 " to physical address %p.\n",
     53            (uint32_t) VALUE0, (void *) KA2PA(frame0));
    5354        *((uint32_t *) frame0) = VALUE0;
    5455       
    55         TPRINTF("Writing %#x to physical address %p.\n", VALUE1, KA2PA(frame1));
     56        TPRINTF("Writing %#" PRIx32 " to physical address %p.\n",
     57            (uint32_t) VALUE1, (void *) KA2PA(frame1));
    5658        *((uint32_t *) frame1) = VALUE1;
    5759       
    58         TPRINTF("Mapping virtual address %p to physical address %p.\n", PAGE0, KA2PA(frame0));
     60        TPRINTF("Mapping virtual address %p to physical address %p.\n",
     61            (void *) PAGE0, (void *) KA2PA(frame0));
    5962        page_mapping_insert(AS_KERNEL, PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE);
    6063       
    61         TPRINTF("Mapping virtual address %p to physical address %p.\n", PAGE1, KA2PA(frame1));
     64        TPRINTF("Mapping virtual address %p to physical address %p.\n",
     65            (void *) PAGE1, (void *) KA2PA(frame1));
    6266        page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE);
    6367       
    6468        v0 = *((uint32_t *) PAGE0);
    6569        v1 = *((uint32_t *) PAGE1);
    66         TPRINTF("Value at virtual address %p is %#x.\n", PAGE0, v0);
    67         TPRINTF("Value at virtual address %p is %#x.\n", PAGE1, v1);
     70        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
     71            (void *) PAGE0, v0);
     72        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
     73            (void *) PAGE1, v1);
    6874       
    6975        if (v0 != VALUE0)
    … …  
    7278                return "Value at v1 not equal to VALUE1";
    7379       
    74         TPRINTF("Writing %#x to virtual address %p.\n", 0, PAGE0);
     80        TPRINTF("Writing %#" PRIx32 " to virtual address %p.\n",
     81            (uint32_t) 0, (void *) PAGE0);
    7582        *((uint32_t *) PAGE0) = 0;
    7683       
    77         TPRINTF("Writing %#x to virtual address %p.\n", 0, PAGE1);
     84        TPRINTF("Writing %#" PRIx32 " to virtual address %p.\n",
     85            (uint32_t) 0, (void *) PAGE1);
    7886        *((uint32_t *) PAGE1) = 0;
    7987       
    … …  
    8189        v1 = *((uint32_t *) PAGE1);
    8290       
    83         TPRINTF("Value at virtual address %p is %#x.\n", PAGE0, *((uint32_t *) PAGE0));
    84         TPRINTF("Value at virtual address %p is %#x.\n", PAGE1, *((uint32_t *) PAGE1));
     91        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
     92            (void *) PAGE0, *((uint32_t *) PAGE0));
     93        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
     94            (void *) PAGE1, *((uint32_t *) PAGE1));
    8595       
    8696        if (v0 != 0)

  • kernel/test/synch/semaphore1.c

    r202f57b r7e752b2  
    8888                producers = (4 - i) * PRODUCERS;
    8989               
    90                 TPRINTF("Creating %d consumers and %d producers...", consumers, producers);
     90                TPRINTF("Creating %" PRIua " consumers and %" PRIua " producers...",
     91                    consumers, producers);
    9192               
    9293                for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) {
    … …  
    113114               
    114115                while ((items_consumed.count != consumers) || (items_produced.count != producers)) {
    115                         TPRINTF("%d consumers remaining, %d producers remaining\n", consumers - items_consumed.count, producers - items_produced.count);
     116                        TPRINTF("%" PRIua " consumers remaining, %" PRIua " producers remaining\n",
     117                            consumers - items_consumed.count, producers - items_produced.count);
    116118                        thread_sleep(1);
    117119                }

  • kernel/test/thread/thread1.c

    r202f57b r7e752b2  
    7676        atomic_set(&finish, 0);
    7777        while (atomic_get(&threads_finished) < total) {
    78                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_finished));
     78                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_finished));
    7979                thread_sleep(1);
    8080        }
Note: See TracChangeset for help on using the changeset viewer.