Changeset be06914 in mainline for kernel/generic/src

Timestamp:

2010-06-11T12:41:35Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b3b7e14a

Parents:

48dcc69

Message:

nicer top printouts
fix typos (recieved → received)

Location:

kernel/generic/src

Files:

• ipc/ipc.c (modified) (4 diffs)
• proc/task.c (modified) (4 diffs)

kernel/generic/src/ipc/ipc.c

@@ -442 +442 @@
         irq_spinlock_lock(&box->lock, true);
         if (!list_empty(&box->irq_notifs)) {
-                /* Count recieved IRQ notification */
+                /* Count received IRQ notification */
                 irq_cnt++;
                 
@@ -452 +452 @@
                 irq_spinlock_unlock(&box->irq_lock, false);
         } else if (!list_empty(&box->answers)) {
-                /* Count recieved answer */
+                /* Count received answer */
                 answer_cnt++;
                 
@@ -460 +460 @@
                 atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
-                /* Count recieved call */
+                /* Count received call */
                 call_cnt++;
                 
@@ -477 +477 @@
         irq_spinlock_pass(&box->lock, &TASK->lock);
         
-        TASK->ipc_info.irq_notif_recieved += irq_cnt;
-        TASK->ipc_info.answer_recieved += answer_cnt;
-        TASK->ipc_info.call_recieved += call_cnt;
+        TASK->ipc_info.irq_notif_received += irq_cnt;
+        TASK->ipc_info.answer_received += answer_cnt;
+        TASK->ipc_info.call_received += call_cnt;
         
         irq_spinlock_unlock(&TASK->lock, true);

kernel/generic/src/proc/task.c

@@ -197 +197 @@
         
         task->ipc_info.call_sent = 0;
-        task->ipc_info.call_recieved = 0;
+        task->ipc_info.call_received = 0;
         task->ipc_info.answer_sent = 0;
-        task->ipc_info.answer_recieved = 0;
-        task->ipc_info.irq_notif_recieved = 0;
+        task->ipc_info.answer_received = 0;
+        task->ipc_info.irq_notif_received = 0;
         task->ipc_info.forwarded = 0;
         
@@ -478 +478 @@
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9ld %7ld", task->taskid,
+                printf("%-8" PRIu64 " %9lu %7lu", task->taskid,
                     atomic_get(&task->refcount), atomic_get(&task->active_calls));
         else
@@ -489 +489 @@
 #ifdef __64_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c %9ld %7ld",
+                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c %9lu %7lu",
                     task->taskid, ucycles, usuffix, kcycles, ksuffix,
                     atomic_get(&task->refcount), atomic_get(&task->active_calls));
@@ -530 +530 @@
 #ifdef __64_BITS__
         if (additional)
-                printf("[taskid] [ucycles ] [kcycles ] [threads] [calls]"
+                printf("[id    ] [ucycles ] [kcycles ] [threads] [calls]"
                     " [callee\n");
         else
-                printf("[taskid] [name        ] [ctx] [address         ]"
+                printf("[id    ] [name        ] [ctx] [address         ]"
                     " [as              ]\n");
 #endif