X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttngtop.c;h=cc0ca882c80b2e5a2ebf4064563df4506569564c;hb=3ba84bed69e8eb8e6794a7250da97406dbbe02c2;hp=0133fe3666ba304cdcabdc9bea38b8a300dc30ef;hpb=1dec520a9e8e0654fa7fab2310a0191b2836d424;p=lttngtop.git

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 0133fe3..cc0ca88 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -10,10 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -23,6 +22,7 @@
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/ctf/events.h>
 #include <babeltrace/ctf/callbacks.h>
+#include <babeltrace/ctf/iterator.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <popt.h>
@@ -195,8 +195,8 @@ void update_perf_value(struct processtop *proc, struct cputime *cpu,
 	}
 }
 
-void extract_perf_counter_scope(struct bt_ctf_event *event,
-		struct definition *scope,
+void extract_perf_counter_scope(const struct bt_ctf_event *event,
+		const struct definition *scope,
 		struct processtop *proc,
 		struct cputime *cpu)
 {
@@ -213,7 +213,7 @@ void extract_perf_counter_scope(struct bt_ctf_event *event,
 
 	for (i = 0; i < count; i++) {
 		const char *name = bt_ctf_field_name(list[i]);
-		if (strncmp(name, "_perf_", 6) == 0) {
+		if (strncmp(name, "perf_", 5) == 0) {
 			int value = bt_ctf_get_uint64(list[i]);
 			if (bt_ctf_field_get_error())
 				continue;
@@ -225,10 +225,10 @@ end:
 	return;
 }
 
-void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event)
+void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *event)
 {
 	struct cputime *cpu;
-	struct definition *scope;
+	const struct definition *scope;
 
 	cpu = get_cpu(get_cpu_id(event));
 
@@ -248,7 +248,6 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	int pid, tid, ppid;
 	char *comm;
 	struct processtop *parent, *child;
-	struct definition *scope;
 	unsigned long timestamp;
 
 	/* FIXME : display nice error when missing context pid, tid, ppid and comm */
@@ -386,7 +385,7 @@ void iter_trace(struct bt_context *bt_ctx)
 {
 	struct bt_ctf_iter *iter;
 	struct bt_iter_pos begin_pos;
-	struct bt_ctf_event *event;
+	const struct bt_ctf_event *event;
 	int ret = 0;
 
 	begin_pos.type = BT_SEEK_BEGIN;
@@ -436,7 +435,7 @@ void iter_trace(struct bt_context *bt_ctx)
 	sem_wait(&end_trace_sem);
 
 end_iter:
-	bt_iter_destroy(bt_ctf_get_iter(iter));
+	bt_ctf_iter_destroy(iter);
 }
 
 /*