fix add_proc with hostname

[lttngtop.git] / src / cputop.c

diff --git a/src/cputop.c b/src/cputop.c
index 4a2a8e8caad5013287a8ebd7e9a846a6ed348e63..65cafb5fdb992703a01c0d72422207be724caa45 100644 (file)
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -22,7 +22,7 @@
 #include "cputop.h"
 
 void update_cputop_data(unsigned long timestamp, int64_t cpu, int prev_pid,
-               int next_pid, char *prev_comm, char *next_comm)
+               int next_pid, char *prev_comm, char *next_comm, char *hostname)
 {
        struct cputime *tmpcpu;
        unsigned long elapsed;
@@ -33,12 +33,14 @@ void update_cputop_data(unsigned long timestamp, int64_t cpu, int prev_pid,
                elapsed = timestamp - tmpcpu->task_start;
                tmpcpu->current_task->totalcpunsec += elapsed;
                tmpcpu->current_task->threadstotalcpunsec += elapsed;
-               if (tmpcpu->current_task->pid != tmpcpu->current_task->tid)
+               if (tmpcpu->current_task->threadparent &&
+                               tmpcpu->current_task->pid != tmpcpu->current_task->tid)
                        tmpcpu->current_task->threadparent->threadstotalcpunsec += elapsed;
        }
 
        if (next_pid != 0)
-               tmpcpu->current_task = get_proc(&lttngtop, next_pid, next_comm, timestamp);
+               tmpcpu->current_task = get_proc(&lttngtop, next_pid, next_comm,
+                               timestamp, hostname);
        else
                tmpcpu->current_task = NULL;
 
@@ -53,8 +55,9 @@ enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
        uint64_t cpu_id;
        char *prev_comm, *next_comm;
        int prev_tid, next_tid;
+       char *hostname = NULL;
 
-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);
        if (timestamp == -1ULL)
                goto error;
 
@@ -91,7 +94,7 @@ enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
        cpu_id = get_cpu_id(call_data);
 
        update_cputop_data(timestamp, cpu_id, prev_tid, next_tid,
-                       prev_comm, next_comm);
+                       prev_comm, next_comm, hostname);
 
        return BT_CB_OK;
 
@@ -107,7 +110,7 @@ enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
        char *comm;
        int tid;
 
-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);
        if (timestamp == -1ULL)
                goto error;