X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=c4dc4ced60fc0098f307bf5d490c13ff24dec61d;hp=8dc96ae33e27be3d7732313f79074af225511b9f;hb=71bd7ce14826a0d7067c45657f33080e546cd5dc;hpb=b093de8aa1ac7555d20b3aa4227d4675b39ef008

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 8dc96ae..c4dc4ce 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
@@ -227,17 +226,10 @@ end:
 
 void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event)
 {
-	struct definition *scope;
-	uint64_t cpu_id;
 	struct cputime *cpu;
+	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 +239,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 +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 */
@@ -267,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;
 	}