Changeset 077842c in mainline

Timestamp:

2018-09-07T15:46:41Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

e9d2905

Parents:

78de83de

Message:

Convert atomic_t to atomic_size_t (1): remove PRIua macro

Location:

kernel

Files:

• generic/include/atomic.h (modified) (1 diff)
• generic/src/proc/scheduler.c (modified) (2 diffs)
• generic/src/proc/task.c (modified) (2 diffs)
• test/mm/falloc2.c (modified) (1 diff)
• test/synch/semaphore1.c (modified) (2 diffs)
• test/synch/workq-test-core.h (modified) (1 diff)
• test/thread/thread1.c (modified) (1 diff)

kernel/generic/include/atomic.h

@@ -42 +42 @@
 typedef size_t atomic_count_t;
 typedef ssize_t atomic_signed_t;
-
-#define PRIua  "zu"          /**< Format for atomic_count_t. */
 
 typedef struct {

kernel/generic/src/proc/scheduler.c

@@ -530 +530 @@
         log(LF_OTHER, LVL_DEBUG,
             "cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
-            ", nrdy=%" PRIua ")", CPU->id, THREAD->tid, THREAD->priority,
+            ", nrdy=%zu)", CPU->id, THREAD->tid, THREAD->priority,
             THREAD->ticks, atomic_get(&CPU->nrdy));
 #endif
@@ -739 +739 @@
                 irq_spinlock_lock(&cpus[cpu].lock, true);
 
-                printf("cpu%u: address=%p, nrdy=%" PRIua ", needs_relink=%zu\n",
+                printf("cpu%u: address=%p, nrdy=%zu, needs_relink=%zu\n",
                     cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy),
                     cpus[cpu].needs_relink);

kernel/generic/src/proc/task.c

@@ -619 +619 @@
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9" PRIua, task->taskid,
+                printf("%-8" PRIu64 " %9zu", task->taskid,
                     atomic_get(&task->refcount));
         else
@@ -631 +631 @@
         if (*additional)
                 printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
-                    "%9" PRIua "\n", task->taskid, ucycles, usuffix, kcycles,
+                    "%9zu\n", task->taskid, ucycles, usuffix, kcycles,
                     ksuffix, atomic_get(&task->refcount));
         else

kernel/test/mm/falloc2.c

@@ -131 +131 @@
 
         while (atomic_get(&thread_count) > 0) {
-                TPRINTF("Threads left: %" PRIua "\n",
+                TPRINTF("Threads left: %zu\n",
                     atomic_get(&thread_count));
                 thread_sleep(1);

kernel/test/synch/semaphore1.c

@@ -88 +88 @@
                 producers = (4 - i) * PRODUCERS;
 
-                TPRINTF("Creating %" PRIua " consumers and %" PRIua " producers...",
+                TPRINTF("Creating %zu consumers and %zu producers...",
                     consumers, producers);
 
@@ -116 +116 @@
 
                 while ((items_consumed.count != consumers) || (items_produced.count != producers)) {
-                        TPRINTF("%" PRIua " consumers remaining, %" PRIua " producers remaining\n",
+                        TPRINTF("%zu consumers remaining, %zu producers remaining\n",
                             consumers - items_consumed.count, producers - items_produced.count);
                         thread_sleep(1);

kernel/test/synch/workq-test-core.h

@@ -191 +191 @@
         for (int i = 0; i < WAVES; ++i) {
                 if (atomic_get(&call_cnt[i]) == exp_call_cnt) {
-                        TPRINTF("Ok: %" PRIua " calls in wave %d, as expected.\n",
+                        TPRINTF("Ok: %zu calls in wave %d, as expected.\n",
                             atomic_get(&call_cnt[i]), i);
                 } else {
                         success = false;
-                        TPRINTF("Error: %" PRIua " calls in wave %d, but %zu expected.\n",
+                        TPRINTF("Error: %zu calls in wave %d, but %zu expected.\n",
                             atomic_get(&call_cnt[i]), i, exp_call_cnt);
                 }

kernel/test/thread/thread1.c

@@ -77 +77 @@
         atomic_set(&finish, 0);
         while (atomic_get(&threads_finished) < total) {
-                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_finished));
+                TPRINTF("Threads left: %zu\n", total - atomic_get(&threads_finished));
                 thread_sleep(1);
         }