X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fiostreamtop.c;h=c47926f80945f661f3d373ddc6b79fb153c4daf6;hb=06570214a7aa236670706a1aac01c3f352e7454d;hp=dfffd1d81512e3b993a2ca4201d62a7e6bbde2b1;hpb=d67167cde319ac9d257f5b59b5a4664e558f4cb4;p=lttngtop.git

diff --git a/src/iostreamtop.c b/src/iostreamtop.c
index dfffd1d..c47926f 100644
--- a/src/iostreamtop.c
+++ b/src/iostreamtop.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.
  */
 
 #include <stdlib.h>
@@ -177,21 +176,8 @@ enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data,
 	if (timestamp == -1ULL)
 		goto error;
 
-	scope = bt_ctf_get_top_level_scope(call_data,
-			BT_STREAM_EVENT_CONTEXT);
-	comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
-				scope, "_procname"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing procname context info\n");
-		goto error;
-	}
-
-	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
-				scope, "_tid"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing tid context info\n");
-		goto error;
-	}
+	comm = get_context_comm(call_data);
+	tid = get_context_tid(call_data);
 
 	scope = bt_ctf_get_top_level_scope(call_data,
 			BT_EVENT_FIELDS);
@@ -234,22 +220,8 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
 	if (timestamp == -1ULL)
 		goto error;
 
-	scope = bt_ctf_get_top_level_scope(call_data,
-			BT_STREAM_EVENT_CONTEXT);
-	comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
-				scope, "_procname"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing procname context info\n");
-		goto error;
-	}
-
-	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
-				scope, "_tid"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing tid context info\n");
-		goto error;
-	}
-
+	comm = get_context_comm(call_data);
+	tid = get_context_tid(call_data);
 	cpu_id = get_cpu_id(call_data);
 
 	scope = bt_ctf_get_top_level_scope(call_data,
@@ -287,22 +259,8 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
 	if (timestamp == -1ULL)
 		goto error;
 
-	scope = bt_ctf_get_top_level_scope(call_data,
-			BT_STREAM_EVENT_CONTEXT);
-	comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
-				scope, "_procname"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing procname context info\n");
-		goto error;
-	}
-
-	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
-				scope, "_tid"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing tid context info\n");
-		goto error;
-	}
-
+	comm = get_context_comm(call_data);
+	tid = get_context_tid(call_data);
 	cpu_id = get_cpu_id(call_data);
 
 	scope = bt_ctf_get_top_level_scope(call_data,
@@ -342,22 +300,8 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
 	if (timestamp == -1ULL)
 		goto error;
 
-	scope = bt_ctf_get_top_level_scope(call_data,
-			BT_STREAM_EVENT_CONTEXT);
-	comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
-				scope, "_procname"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing procname context info\n");
-		goto error;
-	}
-
-	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
-				scope, "_tid"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing tid context info\n");
-		goto error;
-	}
-
+	comm = get_context_comm(call_data);
+	tid = get_context_tid(call_data);
 	cpu_id = get_cpu_id(call_data);
 
 	scope = bt_ctf_get_top_level_scope(call_data,
@@ -395,21 +339,8 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
 	if (timestamp == -1ULL)
 		goto error;
 
-	scope = bt_ctf_get_top_level_scope(call_data,
-			BT_STREAM_EVENT_CONTEXT);
-	comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
-				scope, "_procname"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing procname context info\n");
-		goto error;
-	}
-
-	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
-				scope, "_tid"));
-	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing tid context info\n");
-		goto error;
-	}
+	comm = get_context_comm(call_data);
+	tid = get_context_tid(call_data);
 
 	scope = bt_ctf_get_top_level_scope(call_data,
 			BT_EVENT_FIELDS);