Changeset c1b073b7 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2023-02-04T17:20:04Z (2 years ago)

Author:

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

Branches:

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

Children:

c030818

Parents:

30b56d9

Message:

Remove some unnecessary #ifdefs

%p does not care about specified number of digits,
so that distinction was unnecessary to begin with.
Splitting the line for 64b pointers is also more harmful
than helpful, the line is not that long.
For spacing, replaced #ifdef with regular C if.

File:

• kernel/generic/src/proc/thread.c (modified) (3 diffs)

kernel/generic/src/proc/thread.c

@@ -719 +719 @@
                 name = thread->name;
 
-#ifdef __32_BITS__
         if (additional)
-                printf("%-8" PRIu64 " %10p %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
+                printf("%-8" PRIu64 " %p %p %9" PRIu64 "%c %9" PRIu64 "%c ",
                     thread->tid, thread->thread_code, thread->kstack,
                     ucycles, usuffix, kcycles, ksuffix);
         else
-                printf("%-8" PRIu64 " %-14s %10p %-8s %10p %-5" PRIu32 "\n",
+                printf("%-8" PRIu64 " %-14s %p %-8s %p %-5" PRIu32 "\n",
                     thread->tid, name, thread, thread_states[thread->state],
                     thread->task, thread->task->container);
-#endif
-
-#ifdef __64_BITS__
-        if (additional)
-                printf("%-8" PRIu64 " %18p %18p\n"
-                    "         %9" PRIu64 "%c %9" PRIu64 "%c ",
-                    thread->tid, thread->thread_code, thread->kstack,
-                    ucycles, usuffix, kcycles, ksuffix);
-        else
-                printf("%-8" PRIu64 " %-14s %18p %-8s %18p %-5" PRIu32 "\n",
-                    thread->tid, name, thread, thread_states[thread->state],
-                    thread->task, thread->task->container);
-#endif
 
         if (additional) {
@@ -749 +735 @@
 
                 if (thread->state == Sleeping) {
-#ifdef __32_BITS__
-                        printf(" %10p", thread->sleep_queue);
-#endif
-
-#ifdef __64_BITS__
-                        printf(" %18p", thread->sleep_queue);
-#endif
+                        printf(" %p", thread->sleep_queue);
                 }
 
@@ -774 +754 @@
         irq_spinlock_lock(&threads_lock, true);
 
-#ifdef __32_BITS__
-        if (additional)
-                printf("[id    ] [code    ] [stack   ] [ucycles ] [kcycles ]"
-                    " [cpu] [waitqueue]\n");
-        else
-                printf("[id    ] [name        ] [address ] [state ] [task    ]"
-                    " [ctn]\n");
-#endif
-
-#ifdef __64_BITS__
-        if (additional) {
-                printf("[id    ] [code            ] [stack           ]\n"
-                    "         [ucycles ] [kcycles ] [cpu] [waitqueue       ]\n");
-        } else
-                printf("[id    ] [name        ] [address         ] [state ]"
-                    " [task            ] [ctn]\n");
-#endif
+        if (sizeof(void *) <= 4) {
+                if (additional)
+                        printf("[id    ] [code    ] [stack   ] [ucycles ] [kcycles ]"
+                            " [cpu] [waitqueue]\n");
+                else
+                        printf("[id    ] [name        ] [address ] [state ] [task    ]"
+                            " [ctn]\n");
+        } else {
+                if (additional) {
+                        printf("[id    ] [code            ] [stack           ] [ucycles ] [kcycles ]"
+                            " [cpu] [waitqueue       ]\n");
+                } else
+                        printf("[id    ] [name        ] [address         ] [state ]"
+                            " [task            ] [ctn]\n");
+        }
 
         thread = thread_first();