X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Flib-logging.c;h=0011475c50205e757bdd85da53b3eed8032c6352;hb=44fa6151e730c84e5a65a09fca6830b4ba8b24c2;hp=daee2a00e320a28fdeb5ce818a7d3b5ac7193de7;hpb=fae77bd72de280af50611fa2cbf27236b467a54f;p=deliverable%2Fbabeltrace.git

diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index daee2a00e..0011475c5 100644
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -62,7 +62,7 @@
 #include <babeltrace/graph/connection-internal.h>
 #include <babeltrace/graph/graph-internal.h>
 #include <babeltrace/graph/message-event-internal.h>
-#include <babeltrace/graph/message-inactivity-internal.h>
+#include <babeltrace/graph/message-message-iterator-inactivity-internal.h>
 #include <babeltrace/graph/message-internal.h>
 #include <babeltrace/graph/message-iterator-internal.h>
 #include <babeltrace/graph/message-packet-internal.h>
@@ -409,24 +409,34 @@ static inline void format_field_path(char **buf_ch, bool extended,
 {
 	uint64_t i;
 
-	if (field_path->indexes) {
-		BT_ASSERT(field_path->indexes);
-		BUF_APPEND(", %sindex-count=%u",
-			PRFIELD(field_path->indexes->len));
+	if (field_path->items) {
+		BT_ASSERT(field_path->items);
+		BUF_APPEND(", %sitem-count=%u",
+			PRFIELD(field_path->items->len));
 	}
 
-	if (!extended || !field_path->indexes) {
+	if (!extended || !field_path->items) {
 		return;
 	}
 
 	BUF_APPEND(", %spath=[%s",
 		PRFIELD(bt_common_scope_string(field_path->root)));
 
-	for (i = 0; i < field_path->indexes->len; i++) {
-		uint64_t index = bt_field_path_get_index_by_index_inline(
-			field_path, i);
-
-		BUF_APPEND(", %" PRIu64, index);
+	for (i = 0; i < bt_field_path_get_item_count(field_path); i++) {
+		const struct bt_field_path_item *fp_item =
+			bt_field_path_borrow_item_by_index_const(field_path, i);
+
+		switch (bt_field_path_item_get_type(fp_item)) {
+		case BT_FIELD_PATH_ITEM_TYPE_INDEX:
+			BUF_APPEND(", %" PRIu64,
+				bt_field_path_item_index_get_index(fp_item));
+			break;
+		case BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT:
+			BUF_APPEND("%s", ", <CUR>");
+			break;
+		default:
+			abort();
+		}
 	}
 
 	BUF_APPEND("%s", "]");
@@ -479,8 +489,6 @@ static inline void format_trace(char **buf_ch, bool extended,
 			PRFIELD(trace->streams->len));
 	}
 
-	BUF_APPEND(", %sis-static=%d", PRFIELD(trace->is_static));
-
 	if (!trace->class) {
 		return;
 	}
@@ -531,7 +539,7 @@ static inline void format_stream_class(char **buf_ch, bool extended,
 	SET_TMP_PREFIX("trace-class-");
 	format_trace_class(buf_ch, false, tmp_prefix, trace_class);
 	SET_TMP_PREFIX("pcf-pool-");
-	format_object_pool(buf_ch, extended, prefix,
+	format_object_pool(buf_ch, extended, tmp_prefix,
 		&stream_class->packet_context_field_pool);
 }
 
@@ -587,7 +595,8 @@ static inline void format_event_class(char **buf_ch, bool extended,
 	SET_TMP_PREFIX("trace-class-");
 	format_trace_class(buf_ch, false, tmp_prefix, trace_class);
 	SET_TMP_PREFIX("event-pool-");
-	format_object_pool(buf_ch, extended, prefix, &event_class->event_pool);
+	format_object_pool(buf_ch, extended, tmp_prefix,
+		&event_class->event_pool);
 }
 
 static inline void format_stream(char **buf_ch, bool extended,
@@ -630,7 +639,7 @@ static inline void format_stream(char **buf_ch, bool extended,
 	}
 
 	SET_TMP_PREFIX("packet-pool-");
-	format_object_pool(buf_ch, extended, prefix, &stream->packet_pool);
+	format_object_pool(buf_ch, extended, tmp_prefix, &stream->packet_pool);
 }
 
 static inline void format_packet(char **buf_ch, bool extended,
@@ -765,7 +774,8 @@ static inline void format_clock_class(char **buf_ch, bool extended,
 		PRFIELD(clock_class->base_offset.value_ns));
 
 	SET_TMP_PREFIX("cs-pool-");
-	format_object_pool(buf_ch, extended, prefix, &clock_class->cs_pool);
+	format_object_pool(buf_ch, extended, tmp_prefix,
+		&clock_class->cs_pool);
 }
 
 static inline void format_clock_snapshot(char **buf_ch, bool extended,
@@ -1092,7 +1102,11 @@ static inline void format_graph(char **buf_ch, bool extended,
 {
 	char tmp_prefix[64];
 
-	BUF_APPEND(", %sis-canceled=%d", PRFIELD(graph->canceled));
+	BUF_APPEND(", %sis-canceled=%d, %scan-consume=%d, "
+		"%sconfig-state=%s",
+		PRFIELD(graph->canceled),
+		PRFIELD(graph->can_consume),
+		PRFIELD(bt_graph_configuration_state_string(graph->config_state)));
 
 	if (!extended) {
 		return;
@@ -1109,13 +1123,13 @@ static inline void format_graph(char **buf_ch, bool extended,
 	}
 
 	SET_TMP_PREFIX("en-pool-");
-	format_object_pool(buf_ch, extended, prefix,
+	format_object_pool(buf_ch, extended, tmp_prefix,
 		&graph->event_msg_pool);
 	SET_TMP_PREFIX("pbn-pool-");
-	format_object_pool(buf_ch, extended, prefix,
+	format_object_pool(buf_ch, extended, tmp_prefix,
 		&graph->packet_begin_msg_pool);
 	SET_TMP_PREFIX("pen-pool-");
-	format_object_pool(buf_ch, extended, prefix,
+	format_object_pool(buf_ch, extended, tmp_prefix,
 		&graph->packet_end_msg_pool);
 }