X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=e9afb80656da61d7bb1cdbbc5dbdd28183e540d4;hb=9b4f9b425f2efce9a6ccc25f7ae062ebc1116a7d;hp=f36e33909fb9157daaf7e673019cc355d4e426f1;hpb=9c08c816a55bbc538957648b49d41354e43c7cdf;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index f36e3390..e9afb806 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -39,7 +39,9 @@
 #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"
@@ -806,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)
 {
@@ -871,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)
 {
@@ -1099,9 +1120,7 @@ static inline void format_graph(char **buf_ch, bool extended,
 {
 	char tmp_prefix[TMP_PREFIX_LEN];
 
-	BUF_APPEND(", %sis-canceled=%d, %scan-consume=%d, "
-		"%sconfig-state=%s",
-		PRFIELD(graph->canceled),
+	BUF_APPEND(", %scan-consume=%d, %sconfig-state=%s",
 		PRFIELD(graph->can_consume),
 		PRFIELD(bt_graph_configuration_state_string(graph->config_state)));
 
@@ -1405,6 +1424,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;
@@ -1429,6 +1451,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;