X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcputop.c;h=4a2a8e8caad5013287a8ebd7e9a846a6ed348e63;hp=c561d47205dd8af3ba8dc192f7da3652c0fe2369;hb=e91044a87b91260e62779769d4faad2a58c5a80c;hpb=3ba84bed69e8eb8e6794a7250da97406dbbe02c2

diff --git a/src/cputop.c b/src/cputop.c
index c561d47..4a2a8e8 100644
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez
+ * Copyright (C) 2011-2012 Julien Desfossez
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -48,13 +48,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_timestamp(call_data);
+	timestamp = bt_ctf_get_real_timestamp(call_data);
 	if (timestamp == -1ULL)
 		goto error;
 
@@ -102,12 +102,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_timestamp(call_data);
+	timestamp = bt_ctf_get_real_timestamp(call_data);
 	if (timestamp == -1ULL)
 		goto error;
 
@@ -120,7 +120,13 @@ enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
 		goto error;
 	}
 
-	tid = get_context_tid(call_data);
+	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+				scope, "_tid"));
+	if (bt_ctf_field_get_error()) {
+		fprintf(stderr, "Missing tid field\n");
+		goto error;
+	}
+
 	death_proc(&lttngtop, tid, comm, timestamp);
 
 	return BT_CB_OK;