projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bt_port_output_message_iterator_create(): check that graph has no sinks
[babeltrace.git]
/
lib
/
lib-logging.c
diff --git
a/lib/lib-logging.c
b/lib/lib-logging.c
index a71bbefc42a1dcacd51700ac66b157d78e04d4e3..111876489d78e81304bc435b6112c6d71032f9f5 100644
(file)
--- 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/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>
#include <babeltrace/graph/message-internal.h>
#include <babeltrace/graph/message-iterator-internal.h>
#include <babeltrace/graph/message-packet-internal.h>
@@
-479,8
+479,6
@@
static inline void format_trace(char **buf_ch, bool extended,
PRFIELD(trace->streams->len));
}
PRFIELD(trace->streams->len));
}
- BUF_APPEND(", %sis-static=%d", PRFIELD(trace->is_static));
-
if (!trace->class) {
return;
}
if (!trace->class) {
return;
}
@@
-531,7
+529,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-");
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);
}
&stream_class->packet_context_field_pool);
}
@@
-587,7
+585,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-");
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,
}
static inline void format_stream(char **buf_ch, bool extended,
@@
-630,7
+629,7
@@
static inline void format_stream(char **buf_ch, bool extended,
}
SET_TMP_PREFIX("packet-pool-");
}
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,
}
static inline void format_packet(char **buf_ch, bool extended,
@@
-756,16
+755,17
@@
static inline void format_clock_class(char **buf_ch, bool extended,
BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", "
"%soffset-s=%" PRId64 ", "
BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", "
"%soffset-s=%" PRId64 ", "
- "%soffset-cycles=%" PRIu64 ", %s
is-absolute
=%d, "
+ "%soffset-cycles=%" PRIu64 ", %s
origin-is-unix-epoch
=%d, "
"%sbase-offset-ns=%" PRId64,
PRFIELD(clock_class->frozen), PRFIELD(clock_class->precision),
PRFIELD(clock_class->offset_seconds),
PRFIELD(clock_class->offset_cycles),
"%sbase-offset-ns=%" PRId64,
PRFIELD(clock_class->frozen), PRFIELD(clock_class->precision),
PRFIELD(clock_class->offset_seconds),
PRFIELD(clock_class->offset_cycles),
- PRFIELD(clock_class->
is_absolute
),
+ PRFIELD(clock_class->
origin_is_unix_epoch
),
PRFIELD(clock_class->base_offset.value_ns));
SET_TMP_PREFIX("cs-pool-");
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,
}
static inline void format_clock_snapshot(char **buf_ch, bool extended,
@@
-1092,7
+1092,11
@@
static inline void format_graph(char **buf_ch, bool extended,
{
char tmp_prefix[64];
{
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;
if (!extended) {
return;
@@
-1109,13
+1113,13
@@
static inline void format_graph(char **buf_ch, bool extended,
}
SET_TMP_PREFIX("en-pool-");
}
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-");
&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-");
&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);
}
&graph->packet_end_msg_pool);
}
This page took
0.030107 seconds
and
4
git commands to generate.