Changeset 07640dfd in mainline for kernel/generic

Timestamp:

2010-03-29T16:21:29Z (15 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

ea55bc4

Parents:

a2a00e8

Message:

Small changes on kernel & user accounting.

Location:

kernel/generic

Files:

• include/ps/taskinfo.h (modified) (2 diffs)
• src/interrupt/interrupt.c (modified) (1 diff)
• src/proc/task.c (modified) (3 diffs)
• src/proc/thread.c (modified) (3 diffs)
• src/ps/ps.c (modified) (2 diffs)
• src/syscall/syscall.c (modified) (2 diffs)

kernel/generic/include/ps/taskinfo.h

@@ -50 +50 @@
         int thread_count;
         uint64_t cycles;
+        uint64_t ucycles;
+        uint64_t kcycles;
 } task_info_t;
 
@@ -75 +77 @@
         int priority;
         uint64_t cycles;
+        uint64_t ucycles;
+        uint64_t kcycles;
         unsigned int cpu;
 } thread_info_t;

kernel/generic/src/interrupt/interrupt.c

@@ -109 +109 @@
         if (THREAD && THREAD->interrupted && istate_from_uspace(istate))
                 thread_exit();
+
+        if (THREAD)
+                thread_update_accounting(false);
 }
 

kernel/generic/src/proc/task.c

@@ -427 +427 @@
 
 #ifdef __32_BITS__      
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %9" PRIu64 "%c %9"
-                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %9"
+                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as,
                 ucycles, usuffix, kcycles, ksuffix, atomic_get(&t->refcount),
                 atomic_get(&t->active_calls));
@@ -434 +434 @@
 
 #ifdef __64_BITS__
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %9" PRIu64 "%c %9"
-                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %9"
+                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as,
                 ucycles, usuffix, kcycles, ksuffix, atomic_get(&t->refcount),
                 atomic_get(&t->active_calls));
@@ -461 +461 @@
 #ifdef __32_BITS__      
         printf("taskid name         ctx address    as        "
-            " cycles     ucycles    kcycles    threads calls  callee\n");
+            " ucycles    kcycles    threads calls  callee\n");
         printf("------ ------------ --- ---------- ----------"
-            " ---------- ---------- ---------- ------- ------ ------>\n");
+            " ---------- ---------- ------- ------ ------>\n");
 #endif
 
 #ifdef __64_BITS__
         printf("taskid name         ctx address            as                "
-            " cycles     ucycles    kcycles    threads calls  callee\n");
+            " ucycles    kcycles    threads calls  callee\n");
         printf("------ ------------ --- ------------------ ------------------"
-            " ---------- ---------- ---------- ---------- ------- ------ ------>\n");
+            " ---------- ---------- ---------- ------- ------ ------>\n");
 #endif
 

kernel/generic/src/proc/thread.c

@@ -630 +630 @@
 
 #ifdef __32_BITS__
-        printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %9" PRIu64 "%c %9" PRIu64 "%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
-        t->task->context, t->thread_code, t->kstack, cycles, suffix, ucycles, usuffix, kcycles, ksuffix);
+        printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9"
+                PRIu64 "%c %9" PRIu64 "%c ", t->tid, t->name, t,
+                thread_states[t->state], t->task, t->task->context, t->thread_code,
+                t->kstack, ucycles, usuffix, kcycles, ksuffix);
 #endif
 
 #ifdef __64_BITS__
-        printf("%-6" PRIu64" %-10s %18p %-8s %18p %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %9" PRIu64 "%c %9" PRIu64 "%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
-        t->task->context, t->thread_code, t->kstack, cycles, suffix, ucycles, usuffix, kcycles, ksuffix);
+        printf("%-6" PRIu64" %-10s %18p %-8s %18p %-3" PRIu32 " %18p %18p %9"
+                PRIu64 "%c %9" PRIu64 "%c ", t->tid, t->name, t,
+                thread_states[t->state], t->task, t->task->context, t->thread_code,
+                t->kstack, ucycles, usuffix, kcycles, ksuffix);
 #endif
                         
@@ -672 +674 @@
 #ifdef __32_BITS__      
         printf("tid    name       address    state    task       "
-                "ctx code       stack      cycles     ucycles    kcycles    cpu  "
+                "ctx code       stack      ucycles    kcycles    cpu  "
                 "waitqueue\n");
         printf("------ ---------- ---------- -------- ---------- "
-                "--- ---------- ---------- ---------- ---------- ---------- ---- "
+                "--- ---------- ---------- ---------- ---------- ---- "
                 "----------\n");
 #endif
@@ -681 +683 @@
 #ifdef __64_BITS__
         printf("tid    name       address            state    task               "
-                "ctx code               stack              cycles     ucycles    kcycles    cpu  "
+                "ctx code               stack              ucycles    kcycles    cpu  "
                 "waitqueue\n");
         printf("------ ---------- ------------------ -------- ------------------ "
-                "--- ------------------ ------------------ ---------- ---------- ---------- ---- "
+                "--- ------------------ ------------------ ---------- ---------- ---- "
                 "------------------\n");
 #endif

kernel/generic/src/ps/ps.c

@@ -136 +136 @@
         uint64_t cycles = task_get_accounting(t, &ucycles, &kcycles);
         copy_to_uspace(&uspace_info->cycles, &cycles, sizeof(cycles));
+        copy_to_uspace(&uspace_info->ucycles, &ucycles, sizeof(cycles));
+        copy_to_uspace(&uspace_info->kcycles, &kcycles, sizeof(cycles));
 
         size_t pages = get_pages_count(t->as);
@@ -171 +173 @@
         result.priority = t->priority;
         result.cycles = t->cycles;
+        result.ucycles = t->ucycles;
+        result.kcycles = t->kcycles;
 
         if (t->cpu)

kernel/generic/src/syscall/syscall.c

@@ -62 +62 @@
         unative_t rc;
 
+        /* Do userpace accounting */
+        thread_update_accounting(true);
+
 #ifdef CONFIG_UDEBUG
         /*
@@ -96 +99 @@
         }
 #endif
+
+        /* Do kernel accounting */
+        thread_update_accounting(false);
         
         return rc;