Changeset cd8ad52 in mainline for kernel/test/synch/rwlock4.c

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

File:

• kernel/test/synch/rwlock4.c (modified) (10 diffs)

kernel/test/synch/rwlock4.c

@@ -75 +75 @@
         
         if (!sh_quiet)
-                printf("cpu%d, tid %llu w+ (%d)\n", CPU->id, THREAD->tid, to);
+                printf("cpu%u, tid %" PRIu64 " w+ (%d)\n", CPU->id, THREAD->tid, to);
         
         rc = rwlock_write_lock_timeout(&rwlock, to);
         if (SYNCH_FAILED(rc)) {
                 if (!sh_quiet)
-                        printf("cpu%d, tid %llu w!\n", CPU->id, THREAD->tid);
+                        printf("cpu%u, tid %" PRIu64 " w!\n", CPU->id, THREAD->tid);
                 atomic_dec(&thread_count);
                 return;
@@ -86 +86 @@
         
         if (!sh_quiet)
-                printf("cpu%d, tid %llu w=\n", CPU->id, THREAD->tid);
+                printf("cpu%u, tid %" PRIu64 " w=\n", CPU->id, THREAD->tid);
 
         if (rwlock.readers_in) {
@@ -107 +107 @@
         
         if (!sh_quiet)
-                printf("cpu%d, tid %llu w-\n", CPU->id, THREAD->tid);
+                printf("cpu%u, tid %" PRIu64 " w-\n", CPU->id, THREAD->tid);
         atomic_dec(&thread_count);
 }
@@ -120 +120 @@
         
         if (!sh_quiet)
-                printf("cpu%d, tid %llu r+ (%d)\n", CPU->id, THREAD->tid, to);
+                printf("cpu%u, tid %" PRIu64 " r+ (%d)\n", CPU->id, THREAD->tid, to);
         
         rc = rwlock_read_lock_timeout(&rwlock, to);
         if (SYNCH_FAILED(rc)) {
                 if (!sh_quiet)
-                        printf("cpu%d, tid %llu r!\n", CPU->id, THREAD->tid);
+                        printf("cpu%u, tid %" PRIu64 " r!\n", CPU->id, THREAD->tid);
                 atomic_dec(&thread_count);
                 return;
@@ -131 +131 @@
         
         if (!sh_quiet)
-                printf("cpu%d, tid %llu r=\n", CPU->id, THREAD->tid);
+                printf("cpu%u, tid %" PRIu64 " r=\n", CPU->id, THREAD->tid);
         
         thread_usleep(30000);
@@ -137 +137 @@
         
         if (!sh_quiet)
-                printf("cpu%d, tid %llu r-\n", CPU->id, THREAD->tid);
+                printf("cpu%u, tid %" PRIu64 " r-\n", CPU->id, THREAD->tid);
         atomic_dec(&thread_count);
 }
@@ -160 +160 @@
         context_save(&ctx);
         if (!quiet) {
-                printf("sp=%#x, readers_in=%d\n", ctx.sp, rwlock.readers_in);
-                printf("Creating %d readers\n", rd);
+                printf("sp=%#x, readers_in=%" PRIc "\n", ctx.sp, rwlock.readers_in);
+                printf("Creating %" PRIu32 " readers\n", rd);
         }
         
@@ -169 +169 @@
                         thread_ready(thrd);
                 else if (!quiet)
-                        printf("Could not create reader %d\n", i);
+                        printf("Could not create reader %" PRIu32 "\n", i);
         }
 
         if (!quiet)
-                printf("Creating %d writers\n", wr);
+                printf("Creating %" PRIu32 " writers\n", wr);
         
         for (i = 0; i < wr; i++) {
@@ -180 +180 @@
                         thread_ready(thrd);
                 else if (!quiet)
-                        printf("Could not create writer %d\n", i);
+                        printf("Could not create writer %" PRIu32 "\n", i);
         }
         
@@ -188 +188 @@
         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);
         }