X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=91db4a31e4cc43fc504c92243db310cff12e6feb;hb=b70d57a123c4e4a208b988539a7eb8fceb2b63a7;hp=b48c5db7b4274de39f04905cbad53bf2e9452aa1;hpb=6162e6b7a6d907974d954419c2375f654f39eb72;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index b48c5db7..91db4a31 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -33,16 +33,15 @@
 #include <glib.h>
 #include "common/common.h"
 #include "common/uuid.h"
-#include <babeltrace2/trace-ir/event-const.h>
-#include <babeltrace2/trace-ir/packet-const.h>
-#include <babeltrace2/trace-ir/stream-const.h>
-#include <babeltrace2/current-thread.h>
+#include <babeltrace2/babeltrace.h>
 
 #include "logging.h"
 #include "assert-pre.h"
 #include "assert-post.h"
 #include "value.h"
+#include "integer-range-set.h"
 #include "object-pool.h"
+#include "graph/interrupter.h"
 #include "graph/component-class.h"
 #include "graph/component-class-sink-colander.h"
 #include "graph/component-filter.h"
@@ -104,11 +103,17 @@ static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE];
 
 #define PRFIELD_GSTRING(_expr)	PRFIELD((_expr) ? (_expr)->str : NULL)
 
-#define TMP_PREFIX_LEN 64
+#define TMP_PREFIX_LEN 128
 #define SET_TMP_PREFIX(_prefix2)					\
 	do {								\
-		snprintf(tmp_prefix, TMP_PREFIX_LEN - 1, "%s%s",	\
-			prefix, (_prefix2));				\
+		int snprintf_ret =					\
+			snprintf(tmp_prefix, TMP_PREFIX_LEN - 1, "%s%s", \
+				prefix, (_prefix2));			\
+									\
+		if (snprintf_ret < 0 || snprintf_ret >= TMP_PREFIX_LEN - 1) { \
+			abort();					\
+		}							\
+									\
 		tmp_prefix[TMP_PREFIX_LEN - 1] = '\0';			\
 	} while (0)
 
@@ -228,7 +233,7 @@ static inline void format_field_class(char **buf_ch, bool extended,
 	}
 	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
 	{
-		const struct bt_field_class_static_array *array_fc =
+		const struct bt_field_class_array_static *array_fc =
 			(const void *) field_class;
 
 		format_array_field_class(buf_ch, extended, prefix, field_class);
@@ -237,7 +242,7 @@ static inline void format_field_class(char **buf_ch, bool extended,
 	}
 	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
 	{
-		const struct bt_field_class_dynamic_array *array_fc =
+		const struct bt_field_class_array_dynamic *array_fc =
 			(const void *) field_class;
 
 		format_array_field_class(buf_ch, extended, prefix, field_class);
@@ -256,7 +261,9 @@ static inline void format_field_class(char **buf_ch, bool extended,
 
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_VARIANT:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
 	{
 		const struct bt_field_class_variant *var_fc =
 			(const void *) field_class;
@@ -266,16 +273,22 @@ static inline void format_field_class(char **buf_ch, bool extended,
 				PRFIELD(var_fc->common.named_fcs->len));
 		}
 
-		if (var_fc->selector_fc) {
-			SET_TMP_PREFIX("selector-fc-");
-			format_field_class(buf_ch, extended, tmp_prefix,
-				var_fc->selector_fc);
-		}
+		if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
+				field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+			const struct bt_field_class_variant_with_selector *var_with_sel_fc =
+				(const void *) var_fc;
 
-		if (var_fc->selector_field_path) {
-			SET_TMP_PREFIX("selector-field-path-");
-			format_field_path(buf_ch, extended, tmp_prefix,
-				var_fc->selector_field_path);
+			if (var_with_sel_fc->selector_fc) {
+				SET_TMP_PREFIX("selector-fc-");
+				format_field_class(buf_ch, extended, tmp_prefix,
+					var_with_sel_fc->selector_fc);
+			}
+
+			if (var_with_sel_fc->selector_field_path) {
+				SET_TMP_PREFIX("selector-field-path-");
+				format_field_path(buf_ch, extended, tmp_prefix,
+					var_with_sel_fc->selector_field_path);
+			}
 		}
 
 		break;
@@ -381,7 +394,9 @@ static inline void format_field(char **buf_ch, bool extended,
 
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_VARIANT:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
 	{
 		const struct bt_field_variant *var_field = (const void *) field;
 
@@ -518,14 +533,16 @@ static inline void format_stream_class(char **buf_ch, bool extended,
 	}
 
 	BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d, "
-		"%spackets-have-default-beginning-cs=%d, "
-		"%spackets-have-default-end-cs=%d, "
+		"%ssupports-packets=%d, "
+		"%spackets-have-begin-default-cs=%d, "
+		"%spackets-have-end-default-cs=%d, "
 		"%ssupports-discarded-events=%d, "
 		"%sdiscarded-events-have-default-cs=%d, "
 		"%ssupports-discarded-packets=%d, "
 		"%sdiscarded-packets-have-default-cs=%d",
 		PRFIELD(stream_class->assigns_automatic_event_class_id),
 		PRFIELD(stream_class->assigns_automatic_stream_id),
+		PRFIELD(stream_class->supports_packets),
 		PRFIELD(stream_class->packets_have_beginning_default_clock_snapshot),
 		PRFIELD(stream_class->packets_have_end_default_clock_snapshot),
 		PRFIELD(stream_class->supports_discarded_events),
@@ -674,8 +691,6 @@ static inline void format_packet(char **buf_ch, bool extended,
 static inline void format_event(char **buf_ch, bool extended,
 		const char *prefix, const struct bt_event *event)
 {
-	const struct bt_packet *packet;
-	const struct bt_stream *stream;
 	const struct bt_trace_class *trace_class;
 	const struct bt_stream_class *stream_class;
 	char tmp_prefix[TMP_PREFIX_LEN];
@@ -718,22 +733,17 @@ static inline void format_event(char **buf_ch, bool extended,
 		}
 	}
 
-	packet = bt_event_borrow_packet_const(event);
-	if (!packet) {
-		return;
+	if (event->stream) {
+		BUF_APPEND(", %sstream-addr=%p", PRFIELD(event->stream));
+		SET_TMP_PREFIX("stream-");
+		format_stream(buf_ch, false, tmp_prefix, event->stream);
 	}
 
-	BUF_APPEND(", %spacket-addr=%p", PRFIELD(packet));
-	SET_TMP_PREFIX("packet-");
-	format_packet(buf_ch, false, tmp_prefix, packet);
-	stream = bt_packet_borrow_stream_const(packet);
-	if (!stream) {
-		return;
+	if (event->packet) {
+		BUF_APPEND(", %spacket-addr=%p", PRFIELD(event->packet));
+		SET_TMP_PREFIX("packet-");
+		format_packet(buf_ch, false, tmp_prefix, event->packet);
 	}
-
-	BUF_APPEND(", %sstream-addr=%p", PRFIELD(stream));
-	SET_TMP_PREFIX("stream-");
-	format_stream(buf_ch, false, tmp_prefix, stream);
 }
 
 static inline void format_clock_class(char **buf_ch, bool extended,
@@ -798,6 +808,12 @@ static inline void format_clock_snapshot(char **buf_ch, bool extended,
 	}
 }
 
+static inline void format_interrupter(char **buf_ch, bool extended,
+		const char *prefix, const struct bt_interrupter *intr)
+{
+	BUF_APPEND(", %sis-set=%d", PRFIELD(intr->is_set));
+}
+
 static inline void format_value(char **buf_ch, bool extended,
 		const char *prefix, const struct bt_value *value)
 {
@@ -819,13 +835,13 @@ static inline void format_value(char **buf_ch, bool extended,
 	case BT_VALUE_TYPE_UNSIGNED_INTEGER:
 	{
 		BUF_APPEND(", %svalue=%" PRIu64,
-			PRFIELD(bt_value_unsigned_integer_get(value)));
+			PRFIELD(bt_value_integer_unsigned_get(value)));
 		break;
 	}
 	case BT_VALUE_TYPE_SIGNED_INTEGER:
 	{
 		BUF_APPEND(", %svalue=%" PRId64,
-			PRFIELD(bt_value_signed_integer_get(value)));
+			PRFIELD(bt_value_integer_signed_get(value)));
 		break;
 	}
 	case BT_VALUE_TYPE_REAL:
@@ -863,6 +879,19 @@ static inline void format_value(char **buf_ch, bool extended,
 	}
 }
 
+static inline void format_integer_range_set(char **buf_ch, bool extended,
+		const char *prefix,
+		const struct bt_integer_range_set *range_set)
+{
+	BUF_APPEND(", %srange-count=%u", PRFIELD(range_set->ranges->len));
+
+	if (!extended) {
+		return;
+	}
+
+	BUF_APPEND(", %sis-frozen=%d", PRFIELD(range_set->frozen));
+}
+
 static inline void format_message(char **buf_ch, bool extended,
 		const char *prefix, const struct bt_message *msg)
 {
@@ -953,13 +982,13 @@ static inline void format_message(char **buf_ch, bool extended,
 		}
 
 		if (msg_disc_items->default_begin_cs) {
-			SET_TMP_PREFIX("default-begin-cs-");
+			SET_TMP_PREFIX("begin-default-cs-");
 			format_clock_snapshot(buf_ch, true, tmp_prefix,
 				msg_disc_items->default_begin_cs);
 		}
 
 		if (msg_disc_items->default_end_cs) {
-			SET_TMP_PREFIX("default-end-cs-");
+			SET_TMP_PREFIX("end-default-cs-");
 			format_clock_snapshot(buf_ch, true, tmp_prefix,
 				msg_disc_items->default_end_cs);
 		}
@@ -1397,6 +1426,9 @@ static inline void handle_conversion_specifier_bt(void *priv_data,
 	case 'v':
 		format_value(buf_ch, extended, prefix, obj);
 		break;
+	case 'R':
+		format_integer_range_set(buf_ch, extended, prefix, obj);
+		break;
 	case 'n':
 		format_message(buf_ch, extended, prefix, obj);
 		break;
@@ -1421,6 +1453,9 @@ static inline void handle_conversion_specifier_bt(void *priv_data,
 	case 'g':
 		format_graph(buf_ch, extended, prefix, obj);
 		break;
+	case 'z':
+		format_interrupter(buf_ch, extended, prefix, obj);
+		break;
 	case 'o':
 		format_object_pool(buf_ch, extended, prefix, obj);
 		break;