X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=95bd383e6d8b4f4b8f8d5c11cfe114b7f16b5052;hp=6bb03ac760c20c1a3f9daa121475af0c7fd72b70;hb=06570214a7aa236670706a1aac01c3f352e7454d;hpb=d67167cde319ac9d257f5b59b5a4664e558f4cb4

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 6bb03ac..95bd383 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
@@ -213,7 +212,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;
@@ -248,7 +247,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 */
@@ -257,25 +255,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;
 	}
@@ -438,7 +434,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);
 }
 
 /*