X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcputop.c;h=2e0ccddfdc3111dbb0cab02653fd559478818197;hp=6adbacdb122cafd4532e2a2d5106cef077ea084e;hb=050f9cf91c01ff380df000bd0daa559285b7e787;hpb=094632060f50c0a268794c70e0650167c5c51fb8

diff --git a/src/cputop.c b/src/cputop.c
index 6adbacd..2e0ccdd 100644
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -33,7 +33,8 @@ 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;
 	}
 
@@ -48,13 +49,13 @@ void update_cputop_data(unsigned long timestamp, int64_t cpu, int prev_pid,
 enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	uint64_t cpu_id;
 	char *prev_comm, *next_comm;
 	int prev_tid, next_tid;
 
-	timestamp = bt_ctf_get_real_timestamp(call_data);
+	timestamp = bt_ctf_get_timestamp(call_data);
 	if (timestamp == -1ULL)
 		goto error;
 
@@ -102,12 +103,12 @@ error:
 enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	char *comm;
 	int tid;
 
-	timestamp = bt_ctf_get_real_timestamp(call_data);
+	timestamp = bt_ctf_get_timestamp(call_data);
 	if (timestamp == -1ULL)
 		goto error;