static
void print_timestamp_cycles(struct pretty_component *pretty,
- const bt_event *event)
+ const bt_clock_snapshot *clock_snapshot, bool update_last)
{
- const bt_clock_snapshot *clock_snapshot;
uint64_t cycles;
- enum bt_clock_snapshot_state cs_state;
-
- cs_state = bt_event_borrow_default_clock_snapshot_const(event, &clock_snapshot);
- if (cs_state != BT_CLOCK_SNAPSHOT_STATE_KNOWN || !clock_snapshot) {
- g_string_append(pretty->string, "????????????????????");
- return;
- }
cycles = bt_clock_snapshot_get_value(clock_snapshot);
g_string_append_printf(pretty->string, "%020" PRIu64, cycles);
- if (pretty->last_cycles_timestamp != -1ULL) {
- pretty->delta_cycles = cycles - pretty->last_cycles_timestamp;
+ if (update_last) {
+ if (pretty->last_cycles_timestamp != -1ULL) {
+ pretty->delta_cycles = cycles - pretty->last_cycles_timestamp;
+ }
+
+ pretty->last_cycles_timestamp = cycles;
}
- pretty->last_cycles_timestamp = cycles;
}
static
void print_timestamp_wall(struct pretty_component *pretty,
- const bt_clock_snapshot *clock_snapshot)
+ const bt_clock_snapshot *clock_snapshot, bool update_last)
{
int ret;
int64_t ts_nsec = 0; /* add configurable offset */
return;
}
- if (pretty->last_real_timestamp != -1ULL) {
- pretty->delta_real_timestamp = ts_nsec - pretty->last_real_timestamp;
+ if (update_last) {
+ if (pretty->last_real_timestamp != -1ULL) {
+ pretty->delta_real_timestamp = ts_nsec - pretty->last_real_timestamp;
+ }
+
+ pretty->last_real_timestamp = ts_nsec;
}
- pretty->last_real_timestamp = ts_nsec;
ts_sec += ts_nsec / NSEC_PER_SEC;
ts_nsec = ts_nsec % NSEC_PER_SEC;
static
int print_event_timestamp(struct pretty_component *pretty,
- const bt_event *event, bool *start_line)
+ const bt_message *event_msg, bool *start_line)
{
bool print_names = pretty->options.print_header_field_names;
int ret = 0;
- const bt_stream *stream = NULL;
- const bt_stream_class *stream_class = NULL;
const bt_clock_snapshot *clock_snapshot = NULL;
- enum bt_clock_snapshot_state cs_state;
- stream = bt_event_borrow_stream_const(event);
- if (!stream) {
- ret = -1;
- goto end;
- }
-
- stream_class = bt_stream_borrow_class_const(stream);
- if (!stream_class) {
- ret = -1;
+ if (!bt_message_event_borrow_stream_class_default_clock_class_const(
+ event_msg)) {
+ /* No default clock class: skip the timestamp without an error */
goto end;
}
- cs_state = bt_event_borrow_default_clock_snapshot_const(event,
- &clock_snapshot);
- if (cs_state != BT_CLOCK_SNAPSHOT_STATE_KNOWN || !clock_snapshot) {
- /* No default clock value: skip the timestamp without an error */
+ if (bt_message_event_borrow_default_clock_snapshot_const(event_msg,
+ &clock_snapshot) != BT_CLOCK_SNAPSHOT_STATE_KNOWN) {
+ /*
+ * No known default clock value: skip the timestamp
+ * without an error.
+ */
goto end;
}
g_string_append(pretty->string, COLOR_TIMESTAMP);
}
if (pretty->options.print_timestamp_cycles) {
- print_timestamp_cycles(pretty, event);
+ print_timestamp_cycles(pretty, clock_snapshot, true);
} else {
- clock_snapshot = NULL;
- cs_state = bt_event_borrow_default_clock_snapshot_const(event,
- &clock_snapshot);
- print_timestamp_wall(pretty, clock_snapshot);
+ print_timestamp_wall(pretty, clock_snapshot, true);
}
if (pretty->use_colors) {
g_string_append(pretty->string, COLOR_RST);
if (pretty->options.print_timestamp_cycles) {
if (pretty->delta_cycles == -1ULL) {
g_string_append(pretty->string,
- "+??????????\?\?) "); /* Not a trigraph. */
+ "+??????????\?\?"); /* Not a trigraph. */
} else {
g_string_append_printf(pretty->string,
"+%012" PRIu64, pretty->delta_cycles);
static
int print_event_header(struct pretty_component *pretty,
- const bt_event *event)
+ const bt_message *event_msg)
{
bool print_names = pretty->options.print_header_field_names;
int ret = 0;
const bt_packet *packet = NULL;
const bt_stream *stream = NULL;
const bt_trace *trace = NULL;
+ const bt_event *event = bt_message_event_borrow_event_const(event_msg);
int dom_print = 0;
- enum bt_property_availability prop_avail;
+ bt_property_availability prop_avail;
event_class = bt_event_borrow_class_const(event);
stream_class = bt_event_class_borrow_stream_class_const(event_class);
packet = bt_event_borrow_packet_const(event);
stream = bt_packet_borrow_stream_const(packet);
trace = bt_stream_borrow_trace_const(stream);
- ret = print_event_timestamp(pretty, event, &pretty->start_line);
+ ret = print_event_timestamp(pretty, event_msg, &pretty->start_line);
if (ret) {
goto end;
}
g_string_append(pretty->string, name);
- if (!print_names) {
- g_string_append(pretty->string, " ");
+ if (print_names) {
+ g_string_append(pretty->string, ", ");
}
}
}
} else if (dom_print) {
g_string_append(pretty->string, ":");
}
- value = bt_value_integer_get(vpid_value);
+ value = bt_value_signed_integer_get(vpid_value);
g_string_append_printf(pretty->string,
"(%" PRId64 ")", value);
dom_print = 1;
[ BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE ] = "TRACE_DEBUG_LINE",
[ BT_EVENT_CLASS_LOG_LEVEL_DEBUG ] = "TRACE_DEBUG",
};
- enum bt_event_class_log_level log_level;
+ bt_event_class_log_level log_level;
const char *log_level_str = NULL;
prop_avail = bt_event_class_get_log_level(event_class,
const bt_field *field)
{
int ret = 0;
- enum bt_field_class_integer_preferred_display_base base;
+ bt_field_class_integer_preferred_display_base base;
const bt_field_class *int_fc;
union {
uint64_t u;
int64_t s;
} v;
bool rst_color = false;
- enum bt_field_class_type ft_type;
+ bt_field_class_type ft_type;
int_fc = bt_field_borrow_class_const(field);
BT_ASSERT(int_fc);
int ret = 0;
const char *field_name;
const bt_field *field = NULL;
- const bt_field_class *field_class = NULL;;
+ const bt_field_class_structure_member *member;
field = bt_field_structure_borrow_member_field_by_index_const(_struct, i);
if (!field) {
goto end;
}
- bt_field_class_structure_borrow_member_by_index_const(struct_class, i,
- &field_name, &field_class);
+ member = bt_field_class_structure_borrow_member_by_index_const(
+ struct_class, i);
+ field_name = bt_field_class_structure_member_get_name(member);
if (filter_fields && !filter_field_name(pretty, field_name,
filter_fields, filter_array_len)) {
const bt_field *field, bool print_names,
GQuark *filter_fields, int filter_array_len)
{
- enum bt_field_class_type class_id;
+ bt_field_class_type class_id;
class_id = bt_field_get_class_type(field);
switch (class_id) {
return ret;
}
-static
-int print_event_header_raw(struct pretty_component *pretty,
- const bt_event *event)
-{
- int ret = 0;
- const bt_field *main_field = NULL;
-
- main_field = bt_event_borrow_header_field_const(event);
- if (!main_field) {
- goto end;
- }
- if (!pretty->start_line) {
- g_string_append(pretty->string, ", ");
- }
- pretty->start_line = false;
- if (pretty->options.print_scope_field_names) {
- print_name_equal(pretty, "stream.event.header");
- }
- ret = print_field(pretty, main_field,
- pretty->options.print_header_field_names, NULL, 0);
-
-end:
- return ret;
-}
-
static
int print_stream_event_context(struct pretty_component *pretty,
const bt_event *event)
BT_ASSERT(event);
pretty->start_line = true;
g_string_assign(pretty->string, "");
- ret = print_event_header(pretty, event);
+ ret = print_event_header(pretty, event_msg);
if (ret != 0) {
goto end;
}
goto end;
}
- if (pretty->options.verbose) {
- ret = print_event_header_raw(pretty, event);
- if (ret != 0) {
- goto end;
- }
- }
-
ret = print_stream_event_context(pretty, event);
if (ret != 0) {
goto end;
}
static
-int print_discarded_elements_msg(
- struct pretty_component *pretty, const bt_packet *packet,
+int print_discarded_elements_msg(struct pretty_component *pretty,
+ const bt_stream *stream,
+ const bt_clock_snapshot *begin_clock_snapshot,
+ const bt_clock_snapshot *end_clock_snapshot,
uint64_t count, const char *elem_type)
{
-#if 0
int ret = 0;
- const bt_stream *stream = NULL;
const bt_stream_class *stream_class = NULL;
const bt_trace *trace = NULL;
const char *stream_name;
const char *trace_name;
- const unsigned char *trace_uuid;
+ bt_uuid trace_uuid;
int64_t stream_class_id;
int64_t stream_id;
- bt_clock_snapshot *begin_clock_snapshot = NULL;
- bt_clock_snapshot *end_clock_snapshot = NULL;
+ const char *init_msg;
/* Stream name */
- BT_ASSERT(packet);
- stream = bt_packet_borrow_stream_const(packet);
- BT_ASSERT(stream);
stream_name = bt_stream_get_name(stream);
+ if (!stream_name) {
+ stream_name = "(unknown)";
+ }
/* Stream class ID */
stream_class = bt_stream_borrow_class_const(stream);
stream_id = bt_stream_get_id(stream);
/* Trace name */
- trace = bt_stream_class_borrow_trace_const(stream_class);
+ trace = bt_stream_borrow_trace_const(stream);
BT_ASSERT(trace);
trace_name = bt_trace_get_name(trace);
if (!trace_name) {
}
/* Trace UUID */
- trace_uuid = bt_trace_get_uuid(trace);
-
- /* Beginning and end times */
- (void) bt_packet_borrow_previous_packet_default_end_clock_snapshot_const(
- packet, &begin_clock_snapshot);
- (void) bt_packet_borrow_default_end_clock_snapshot_const(packet,
- &end_clock_snapshot);
+ trace_uuid = bt_trace_class_get_uuid(
+ bt_trace_borrow_class_const(trace));
/* Format message */
g_string_assign(pretty->string, "");
+
+ if (count == UINT64_C(-1)) {
+ init_msg = "Tracer may have discarded";
+ } else {
+ init_msg = "Tracer discarded";
+ }
+
g_string_append_printf(pretty->string,
- "%s%sWARNING%s%s: Tracer discarded %" PRId64 " %s%s ",
+ "%s%sWARNING%s%s: %s ",
bt_common_color_fg_yellow(),
bt_common_color_bold(),
bt_common_color_reset(),
- bt_common_color_fg_yellow(),
- count, elem_type, count == 1 ? "" : "s");
+ bt_common_color_fg_yellow(), init_msg);
+
+ if (count == UINT64_C(-1)) {
+ g_string_append_printf(pretty->string, "%ss", elem_type);
+ } else {
+ g_string_append_printf(pretty->string,
+ "%" PRIu64 " %s%s", count, elem_type,
+ count == 1 ? "" : "s");
+ }
if (begin_clock_snapshot && end_clock_snapshot) {
- g_string_append(pretty->string, "between [");
- print_timestamp_wall(pretty, begin_clock_snapshot);
+ g_string_append(pretty->string, " between [");
+ print_timestamp_wall(pretty, begin_clock_snapshot, false);
g_string_append(pretty->string, "] and [");
- print_timestamp_wall(pretty, end_clock_snapshot);
+ print_timestamp_wall(pretty, end_clock_snapshot, false);
g_string_append(pretty->string, "]");
} else {
g_string_append(pretty->string, "(unknown time range)");
}
g_string_append_printf(pretty->string,
- "within stream \"%s\" (stream class ID: %" PRId64 ", ",
+ "within stream \"%s\" (stream class ID: %" PRIu64 ", ",
stream_name, stream_class_id);
if (stream_id >= 0) {
g_string_append_printf(pretty->string,
- "stream ID: %" PRId64, stream_id);
+ "stream ID: %" PRIu64, stream_id);
} else {
g_string_append(pretty->string, "no stream ID");
}
}
return ret;
-#endif
- return 0;
}
BT_HIDDEN
-int pretty_print_packet(struct pretty_component *pretty,
- const bt_message *packet_beginning_msg)
+int pretty_print_discarded_items(struct pretty_component *pretty,
+ const bt_message *msg)
{
-#if 0
- const bt_packet *packet = bt_message_packet_beginning_borrow_packet_const(
- packet_beginning_msg);
- uint64_t count;
- int status = 0;
-
- if (bt_packet_get_discarded_event_count(packet, &count) ==
- BT_PACKET_PROPERTY_AVAILABILITY_AVAILABLE &&
- count > 0) {
- status = print_discarded_elements_msg(pretty, packet,
- count, "event");
- if (status != 0) {
- goto end;
+ const bt_clock_snapshot *begin = NULL;
+ const bt_clock_snapshot *end = NULL;
+ const bt_stream *stream;
+ const bt_stream_class *stream_class;
+ uint64_t count = UINT64_C(-1);
+ const char *elem_type;
+
+ switch (bt_message_get_type(msg)) {
+ case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+ stream = bt_message_discarded_events_borrow_stream_const(msg);
+
+ if (bt_message_discarded_events_get_count(msg, &count) ==
+ BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE) {
+ count = UINT64_C(-1);
+ }
+
+ elem_type = "event";
+ break;
+ case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
+ stream = bt_message_discarded_packets_borrow_stream_const(msg);
+
+ if (bt_message_discarded_packets_get_count(msg, &count) ==
+ BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE) {
+ count = UINT64_C(-1);
}
+
+ elem_type = "packet";
+ break;
+ default:
+ abort();
}
- if (bt_packet_get_discarded_packet_count(packet, &count) ==
- BT_PACKET_PROPERTY_AVAILABILITY_AVAILABLE &&
- count > 0) {
- status = print_discarded_elements_msg(pretty, packet,
- count, "packet");
- if (status != 0) {
- goto end;
+ BT_ASSERT(stream);
+ stream_class = bt_stream_borrow_class_const(stream);
+
+ if (bt_stream_class_borrow_default_clock_class_const(stream_class)) {
+ switch (bt_message_get_type(msg)) {
+ case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+ bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const(
+ msg, &begin);
+ bt_message_discarded_events_borrow_default_end_clock_snapshot_const(
+ msg, &end);
+ break;
+ case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
+ bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const(
+ msg, &begin);
+ bt_message_discarded_packets_borrow_default_end_clock_snapshot_const(
+ msg, &end);
+ break;
+ default:
+ abort();
}
}
-end:
- return status;
-#endif
+ print_discarded_elements_msg(pretty, stream, begin, end,
+ count, elem_type);
return 0;
}
projects / babeltrace.git / blobdiff