[hurd] 89/98: libps: fix process user and system times

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 19689c97a05e0a10691b671c4c37ca0bf51bdd2b
Author: Richard Braun <address@hidden>
Date:   Mon Dec 30 15:08:29 2013 +0100

    libps: fix process user and system times
    
    Include the run time of terminated threads in the user and system times
    of processes.
---
 libps/procstat.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libps/procstat.c b/libps/procstat.c
index e688fa4..e732f75 100644
--- a/libps/procstat.c
+++ b/libps/procstat.c
@@ -352,6 +352,7 @@ summarize_thread_basic_info (struct procinfo *pi)
 {
   int i;
   unsigned num_threads = 0, num_run_threads = 0;
+  task_basic_info_t taskinfo = &pi->taskinfo;
   thread_basic_info_t tbi = malloc (sizeof (struct thread_basic_info));
   int run_base_priority = 0, run_cur_priority = 0;
   int total_base_priority = 0, total_cur_priority = 0;
@@ -426,6 +427,12 @@ summarize_thread_basic_info (struct procinfo *pi)
        }
     }
 
+  /* Include the run time of terminated threads.  */
+  tbi->user_time.seconds += taskinfo->user_time.seconds;
+  tbi->user_time.microseconds += taskinfo->user_time.microseconds;
+  tbi->system_time.seconds += taskinfo->system_time.seconds;
+  tbi->system_time.microseconds += taskinfo->system_time.microseconds;
+
   tbi->user_time.seconds += tbi->user_time.microseconds / 1000000;
   tbi->user_time.microseconds %= 1000000;
   tbi->system_time.seconds += tbi->system_time.microseconds / 1000000;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git