Changeset cd8ad52 in mainline for kernel/test/mm

Timestamp:

2008-06-03T14:58:05Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b63f8569

Parents:

7ac426e

Message:

proper printf formatting

Location:

kernel/test/mm

Files:

• falloc2.c (modified) (8 diffs)
• slab1.c (modified) (2 diffs)
• slab2.c (modified) (5 diffs)

kernel/test/mm/falloc2.c

@@ -59 +59 @@
         if (frames == NULL) {
                 if (!sh_quiet)
-                        printf("Thread #%llu (cpu%d): Unable to allocate frames\n", THREAD->tid, CPU->id);
+                        printf("Thread #%" PRIu64 " (cpu%u): Unable to allocate frames\n", THREAD->tid, CPU->id);
                 atomic_inc(&thread_fail);
                 atomic_dec(&thread_count);
@@ -70 +70 @@
                 for (order = 0; order <= MAX_ORDER; order++) {
                         if (!sh_quiet)
-                                printf("Thread #%llu (cpu%d): Allocating %d frames blocks ... \n", THREAD->tid, CPU->id, 1 << order);
+                                printf("Thread #%" PRIu64 " (cpu%u): Allocating %d frames blocks ... \n", THREAD->tid, CPU->id, 1 << order);
                         
                         allocated = 0;
@@ -83 +83 @@
                         
                         if (!sh_quiet)
-                                printf("Thread #%llu (cpu%d): %d blocks allocated.\n", THREAD->tid, CPU->id, allocated);
+                                printf("Thread #%" PRIu64 " (cpu%u): %d blocks allocated.\n", THREAD->tid, CPU->id, allocated);
                         
                         if (!sh_quiet)
-                                printf("Thread #%llu (cpu%d): Deallocating ... \n", THREAD->tid, CPU->id);
+                                printf("Thread #%" PRIu64 " (cpu%u): Deallocating ... \n", THREAD->tid, CPU->id);
                         
                         for (i = 0; i < allocated; i++) {
@@ -92 +92 @@
                                         if (((uint8_t *) frames[i])[k] != val) {
                                                 if (!sh_quiet)
-                                                        printf("Thread #%llu (cpu%d): Unexpected data (%d) in block %p offset %#zx\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
+                                                        printf("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %#" PRIi "\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
                                                 atomic_inc(&thread_fail);
                                                 goto cleanup;
@@ -101 +101 @@
                         
                         if (!sh_quiet)
-                                printf("Thread #%llu (cpu%d): Finished run.\n", THREAD->tid, CPU->id);
+                                printf("Thread #%" PRIu64 " (cpu%u): Finished run.\n", THREAD->tid, CPU->id);
                 }
         }
@@ -109 +109 @@
         
         if (!sh_quiet)
-                printf("Thread #%llu (cpu%d): Exiting\n", THREAD->tid, CPU->id);
+                printf("Thread #%" PRIu64 " (cpu%u): Exiting\n", THREAD->tid, CPU->id);
         atomic_dec(&thread_count);
 }
@@ -125 +125 @@
                 if (!thrd) {
                         if (!quiet)
-                                printf("Could not create thread %d\n", i);
+                                printf("Could not create thread %u\n", i);
                         break;
                 }
@@ -133 +133 @@
         while (atomic_get(&thread_count) > 0) {
                 if (!quiet)
-                        printf("Threads left: %d\n", atomic_get(&thread_count));
+                        printf("Threads left: %ld\n", atomic_get(&thread_count));
                 thread_sleep(1);
         }

kernel/test/mm/slab1.c

@@ -138 +138 @@
         
         if (!sh_quiet)
-                printf("Starting thread #%llu...\n", THREAD->tid);
+                printf("Starting thread #%" PRIu64 "...\n", THREAD->tid);
         
         for (j = 0; j < 10; j++) {
@@ -152 +152 @@
         
         if (!sh_quiet)
-                printf("Thread #%llu finished\n", THREAD->tid);
+                printf("Thread #" PRIu64 " finished\n", THREAD->tid);
         
         semaphore_up(&thr_sem);

kernel/test/mm/slab2.c

@@ -151 +151 @@
         
         if (!sh_quiet)
-                printf("Starting thread #%llu...\n",THREAD->tid);
+                printf("Starting thread #%" PRIu64 "...\n", THREAD->tid);
 
         /* Alloc all */
         if (!sh_quiet)
-                printf("Thread #%llu allocating...\n", THREAD->tid);
+                printf("Thread #%" PRIu64 " allocating...\n", THREAD->tid);
         
         while (1) {
@@ -167 +167 @@
         
         if (!sh_quiet)
-                printf("Thread #%llu releasing...\n", THREAD->tid);
+                printf("Thread #%" PRIu64 " releasing...\n", THREAD->tid);
         
         while (data) {
@@ -177 +177 @@
         
         if (!sh_quiet)
-                printf("Thread #%llu allocating...\n", THREAD->tid);
+                printf("Thread #%" PRIu64 " allocating...\n", THREAD->tid);
         
         while (1) {
@@ -189 +189 @@
         
         if (!sh_quiet)
-                printf("Thread #%llu releasing...\n", THREAD->tid);
+                printf("Thread #%" PRIu64 " releasing...\n", THREAD->tid);
         
         while (data) {
@@ -199 +199 @@
         
         if (!sh_quiet)
-                printf("Thread #%llu finished\n", THREAD->tid);
+                printf("Thread #%" PRIu64 " finished\n", THREAD->tid);
         
         slab_print_list();