Changeset 88dea9d in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2010-04-17T16:28:49Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from measuring branch

File:

• kernel/generic/src/console/cmd.c (modified) (7 diffs)

kernel/generic/src/console/cmd.c

@@ -1049 +1049 @@
         ipl_t ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
-        uint64_t t0 = task_get_accounting(TASK);
+        uint64_t ucycles0, kcycles0;
+        task_get_accounting(TASK, &ucycles0, &kcycles0);
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
@@ -1058 +1059 @@
         
         /* Update and read thread accounting */
+        uint64_t ucycles1, kcycles1; 
         ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
-        uint64_t dt = task_get_accounting(TASK) - t0;
+        task_get_accounting(TASK, &ucycles1, &kcycles1);
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
         
-        uint64_t cycles;
-        char suffix;
-        order(dt, &cycles, &suffix);
-                
-        printf("Time: %" PRIu64 "%c cycles\n", cycles, suffix);
+        uint64_t ucycles, kcycles;
+        char usuffix, ksuffix;
+        order(ucycles1 - ucycles0, &ucycles, &usuffix);
+        order(kcycles1 - kcycles0, &kcycles, &ksuffix);
+                
+        printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n",
+                        ucycles, usuffix, kcycles, ksuffix);
         
         if (ret == NULL) {
@@ -1083 +1087 @@
         uint32_t i;
         bool ret = true;
-        uint64_t cycles;
-        char suffix;
+        uint64_t ucycles, kcycles;
+        char usuffix, ksuffix;
         
         if (cnt < 1)
@@ -1102 +1106 @@
                 ipl_t ipl = interrupts_disable();
                 spinlock_lock(&TASK->lock);
-                uint64_t t0 = task_get_accounting(TASK);
+                uint64_t ucycles0, kcycles0;
+                task_get_accounting(TASK, &ucycles0, &kcycles0);
                 spinlock_unlock(&TASK->lock);
                 interrupts_restore(ipl);
@@ -1113 +1118 @@
                 ipl = interrupts_disable();
                 spinlock_lock(&TASK->lock);
-                uint64_t dt = task_get_accounting(TASK) - t0;
+                uint64_t ucycles1, kcycles1;
+                task_get_accounting(TASK, &ucycles1, &kcycles1);
                 spinlock_unlock(&TASK->lock);
                 interrupts_restore(ipl);
-                
+
                 if (ret != NULL) {
                         printf("%s\n", ret);
@@ -1123 +1129 @@
                 }
                 
-                data[i] = dt;
-                order(dt, &cycles, &suffix);
-                printf("OK (%" PRIu64 "%c cycles)\n", cycles, suffix);
+                data[i] = ucycles1 - ucycles0 + kcycles1 - kcycles0;
+                order(ucycles1 - ucycles0, &ucycles, &usuffix);
+                order(kcycles1 - kcycles0, &kcycles, &ksuffix);
+                printf("OK (%" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles)\n",
+                                ucycles, usuffix, kcycles, ksuffix);
         }
         
@@ -1137 +1145 @@
                 }
                 
-                order(sum / (uint64_t) cnt, &cycles, &suffix);
-                printf("Average\t\t%" PRIu64 "%c\n", cycles, suffix);
+                order(sum / (uint64_t) cnt, &ucycles, &usuffix);
+                printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix);
         }