X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=e98785a8cfe5e3c06cb65affcc2fa7ff1ecaaf0a;hp=924864b32fb9f50710717ee7ed07642a8c0ffca6;hb=ceb3a2216fed5f405aa77c358328f71f44ed3303;hpb=85db46189f6379c1e517efd4cfc4558d696db988

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 924864b..e98785a 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,19 +225,12 @@ 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 definition *scope;
-	uint64_t cpu_id;
 	struct cputime *cpu;
+	const struct definition *scope;
 
-	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT);
-	cpu_id = bt_ctf_get_uint64(bt_ctf_get_field(event, scope, "cpu_id"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "[error] get cpu_id\n");
-		goto end;
-	}
-	cpu = get_cpu(cpu_id);
+	cpu = get_cpu(get_cpu_id(event));
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
 	extract_perf_counter_scope(event, scope, proc, cpu);
@@ -247,9 +240,6 @@ void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event)
 
 	scope = bt_ctf_get_top_level_scope(event, BT_EVENT_CONTEXT);
 	extract_perf_counter_scope(event, scope, proc, cpu);
-
-end:
-	return;
 }
 
 enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
@@ -258,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 */
@@ -267,25 +256,23 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	if (timestamp == -1ULL)
 		goto error;
 
-	scope = bt_ctf_get_top_level_scope(call_data, BT_STREAM_EVENT_CONTEXT);
-
-	pid = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_pid"));
-	if (bt_ctf_field_get_error()) {
+	pid = get_context_pid(call_data);
+	if (pid == -1ULL) {
 //		fprintf(stderr, "Missing pid context info\n");
 		goto error;
 	}
-	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_tid"));
-	if (bt_ctf_field_get_error()) {
+	tid = get_context_tid(call_data);
+	if (tid == -1ULL) {
 //		fprintf(stderr, "Missing tid context info\n");
 		goto error;
 	}
-	ppid = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_ppid"));
-	if (bt_ctf_field_get_error()) {
+	ppid = get_context_ppid(call_data);
+	if (ppid == -1ULL) {
 //		fprintf(stderr, "Missing ppid context info\n");
 		goto error;
 	}
-	comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data, scope, "_procname"));
-	if (bt_ctf_field_get_error()) {
+	comm = get_context_comm(call_data);
+	if (!comm) {
 //		fprintf(stderr, "Missing procname context info\n");
 		goto error;
 	}
@@ -334,9 +321,10 @@ void init_lttngtop()
 	lttngtop.cpu_table = g_ptr_array_new();
 }
 
-void usage(FILE *fd)
+void usage(FILE *fp)
 {
-
+	fprintf(fp, "LTTngTop %s\n\n", VERSION);
+	fprintf(fp, "Usage : lttngtop /path/to/trace\n");
 }
 
 /*
@@ -397,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;
@@ -430,6 +418,19 @@ void iter_trace(struct bt_context *bt_ctx)
 	bt_ctf_iter_add_callback(iter,
 			g_quark_from_static_string("sys_read"),
 			NULL, 0, handle_sys_read, NULL, NULL, NULL);
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string("sys_open"),
+			NULL, 0, handle_sys_open, NULL, NULL, NULL);
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string("sys_close"),
+			NULL, 0, handle_sys_close, NULL, NULL, NULL);
+/*
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string(
+					"lttng_statedump_file_descriptor"),
+			NULL, 0, handle_statedump_file_descriptor,
+			NULL, NULL, NULL);
+*/
 	while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
 		ret = bt_iter_next(bt_ctf_get_iter(iter));
 		if (ret < 0)
@@ -440,7 +441,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);
 }
 
 /*