X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=f741a29b536d20a74e9d96a38ef0136b3c5782c8;hp=3051f7e3b62b0ab7ac0d5c8cf6d74d291bfc48fa;hb=2e0a1190d76a53891ca22cfd6082d9b45581d83e;hpb=928f18a6c02cf1eaafb7b60cb72860ed68d7456b

diff --git a/src/common.c b/src/common.c
index 3051f7e..f741a29 100644
--- a/src/common.c
+++ b/src/common.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
@@ -23,7 +23,7 @@
 
 uint64_t get_cpu_id(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t cpu_id;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT);
@@ -38,7 +38,7 @@ uint64_t get_cpu_id(const struct bt_ctf_event *event)
 
 uint64_t get_context_tid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t tid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -54,7 +54,7 @@ uint64_t get_context_tid(const struct bt_ctf_event *event)
 
 uint64_t get_context_pid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t pid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -70,7 +70,7 @@ uint64_t get_context_pid(const struct bt_ctf_event *event)
 
 uint64_t get_context_ppid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t ppid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -86,7 +86,7 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
 
 char *get_context_comm(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	char *comm;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -360,11 +360,9 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 	dst->process_table = g_ptr_array_new();
 	dst->files_table = g_ptr_array_new();
 	dst->cpu_table = g_ptr_array_new();
-	dst->perf_list = g_hash_table_new(g_str_hash, g_str_equal);
 
 	rotate_cputime(end);
 
-	g_hash_table_foreach(lttngtop.perf_list, copy_perf_counter, dst->perf_list);
 	for (i = 0; i < lttngtop.process_table->len; i++) {
 		tmp = g_ptr_array_index(lttngtop.process_table, i);
 		new = g_new0(struct processtop, 1);
@@ -466,7 +464,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	struct processtop *proc;
 	unsigned long timestamp;
 	int64_t pid, tid;