Changeset 280a27e in mainline for generic/src/proc

Timestamp:

2006-04-16T13:16:44Z (20 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

50de918

Parents:

c624b96

Message:

Printf ported back from uspace to kernel.
Printf calls changed to match new conventions.

Location:

generic/src/proc

Files:

• scheduler.c (modified) (3 diffs)
• task.c (modified) (1 diff)
• thread.c (modified) (1 diff)

generic/src/proc/scheduler.c

@@ -450 +450 @@
 
 #ifdef SCHEDULER_VERBOSE
-        printf("cpu%d: tid %d (priority=%d,ticks=%d,nrdy=%d)\n", CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks, atomic_get(&CPU->nrdy));
+        printf("cpu%d: tid %d (priority=%d,ticks=%lld,nrdy=%ld)\n", CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks, atomic_get(&CPU->nrdy));
 #endif  
 
@@ -570 +570 @@
                                 spinlock_lock(&t->lock);
 #ifdef KCPULB_VERBOSE
-                                printf("kcpulb%d: TID %d -> cpu%d, nrdy=%d, avg=%d\n", CPU->id, t->tid, CPU->id, atomic_get(&CPU->nrdy), atomic_get(&nrdy) / config.cpu_active);
+                                printf("kcpulb%d: TID %d -> cpu%d, nrdy=%ld, avg=%nd\n", CPU->id, t->tid, CPU->id, atomic_get(&CPU->nrdy), atomic_get(&nrdy) / config.cpu_active);
 #endif
                                 t->flags |= X_STOLEN;
@@ -634 +634 @@
 
                 spinlock_lock(&cpus[cpu].lock);
-                printf("cpu%d: address=%P, nrdy=%d, needs_relink=%d\n",
+                printf("cpu%d: address=%P, nrdy=%ld, needs_relink=%ld\n",
                        cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink);
                 

generic/src/proc/task.c

@@ -213 +213 @@
                 
                         spinlock_lock(&t->lock);
-                        printf("%s: address=%P, taskid=%Q, as=%P, ActiveCalls: %d",
+                        printf("%s: address=%#zX, taskid=%#llX, as=%#zX, ActiveCalls: %zd",
                                 t->name, t, t->taskid, t->as, atomic_get(&t->active_calls));
                         for (j=0; j < IPC_MAX_PHONES; j++) {
                                 if (t->phones[j].callee)
-                                        printf(" Ph(%d): %P ", j, t->phones[j].callee);
+                                        printf(" Ph(%zd): %#zX ", j, t->phones[j].callee);
                         }
                         printf("\n");

generic/src/proc/thread.c

@@ -419 +419 @@
                 
                         t = (thread_t *) node->value[i];
-                        printf("%s: address=%P, tid=%d, state=%s, task=%P, code=%P, stack=%P, cpu=",
+                        printf("%s: address=%#zX, tid=%zd, state=%s, task=%#zX, code=%#zX, stack=%#zX, cpu=",
                                 t->name, t, t->tid, thread_states[t->state], t->task, t->thread_code, t->kstack);
                         if (t->cpu)
-                                printf("cpu%d ", t->cpu->id);
+                                printf("cpu%zd ", t->cpu->id);
                         else
                                 printf("none");