projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bt_value_copy(): put output parameter as last parameter
[babeltrace.git]
/
plugins
/
text
/
pretty
/
print.c
diff --git
a/plugins/text/pretty/print.c
b/plugins/text/pretty/print.c
index 92de19095412075db2d1ea454bdf34ba59b668eb..46e3236d9ad2055bf8559d6e0f204a53fe9c6896 100644
(file)
--- a/
plugins/text/pretty/print.c
+++ b/
plugins/text/pretty/print.c
@@
-222,7
+222,6
@@
int print_event_timestamp(struct pretty_component *pretty,
int ret = 0;
const struct bt_stream *stream = NULL;
const struct bt_stream_class *stream_class = NULL;
int ret = 0;
const struct bt_stream *stream = NULL;
const struct bt_stream_class *stream_class = NULL;
- const struct bt_trace *trace = NULL;
const struct bt_clock_value *clock_value = NULL;
enum bt_clock_value_status cv_status;
const struct bt_clock_value *clock_value = NULL;
enum bt_clock_value_status cv_status;
@@
-237,11
+236,6
@@
int print_event_timestamp(struct pretty_component *pretty,
ret = -1;
goto end;
}
ret = -1;
goto end;
}
- trace = bt_stream_class_borrow_trace_const(stream_class);
- if (!trace) {
- ret = -1;
- goto end;
- }
cv_status = bt_event_borrow_default_clock_value_const(event,
&clock_value);
cv_status = bt_event_borrow_default_clock_value_const(event,
&clock_value);
@@
-320,25
+314,19
@@
int print_event_header(struct pretty_component *pretty,
int ret = 0;
const struct bt_event_class *event_class = NULL;
const struct bt_stream_class *stream_class = NULL;
int ret = 0;
const struct bt_event_class *event_class = NULL;
const struct bt_stream_class *stream_class = NULL;
- const struct bt_trace *trace_class = NULL;
+ const struct bt_trace_class *trace_class = NULL;
+ const struct bt_packet *packet = NULL;
+ const struct bt_stream *stream = NULL;
+ const struct bt_trace *trace = NULL;
int dom_print = 0;
enum bt_property_availability prop_avail;
event_class = bt_event_borrow_class_const(event);
int dom_print = 0;
enum bt_property_availability prop_avail;
event_class = bt_event_borrow_class_const(event);
- if (!event_class) {
- ret = -1;
- goto end;
- }
stream_class = bt_event_class_borrow_stream_class_const(event_class);
stream_class = bt_event_class_borrow_stream_class_const(event_class);
- if (!stream_class) {
- ret = -1;
- goto end;
- }
- trace_class = bt_stream_class_borrow_trace_const(stream_class);
- if (!trace_class) {
- ret = -1;
- goto end;
- }
+ trace_class = bt_stream_class_borrow_trace_class_const(stream_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);
if (ret) {
goto end;
ret = print_event_timestamp(pretty, event, &pretty->start_line);
if (ret) {
goto end;
@@
-346,7
+334,7
@@
int print_event_header(struct pretty_component *pretty,
if (pretty->options.print_trace_field) {
const char *name;
if (pretty->options.print_trace_field) {
const char *name;
- name = bt_trace_get_name(trace
_class
);
+ name = bt_trace_get_name(trace);
if (name) {
if (!pretty->start_line) {
g_string_append(pretty->string, ", ");
if (name) {
if (!pretty->start_line) {
g_string_append(pretty->string, ", ");
@@
-365,7
+353,7
@@
int print_event_header(struct pretty_component *pretty,
if (pretty->options.print_trace_hostname_field) {
const struct bt_value *hostname_str;
if (pretty->options.print_trace_hostname_field) {
const struct bt_value *hostname_str;
- hostname_str = bt_trace_borrow_environment_entry_value_by_name_const(
+ hostname_str = bt_trace_
class_
borrow_environment_entry_value_by_name_const(
trace_class, "hostname");
if (hostname_str) {
const char *str;
trace_class, "hostname");
if (hostname_str) {
const char *str;
@@
-384,7
+372,7
@@
int print_event_header(struct pretty_component *pretty,
if (pretty->options.print_trace_domain_field) {
const struct bt_value *domain_str;
if (pretty->options.print_trace_domain_field) {
const struct bt_value *domain_str;
- domain_str = bt_trace_borrow_environment_entry_value_by_name_const(
+ domain_str = bt_trace_
class_
borrow_environment_entry_value_by_name_const(
trace_class, "domain");
if (domain_str) {
const char *str;
trace_class, "domain");
if (domain_str) {
const char *str;
@@
-405,7
+393,7
@@
int print_event_header(struct pretty_component *pretty,
if (pretty->options.print_trace_procname_field) {
const struct bt_value *procname_str;
if (pretty->options.print_trace_procname_field) {
const struct bt_value *procname_str;
- procname_str = bt_trace_borrow_environment_entry_value_by_name_const(
+ procname_str = bt_trace_
class_
borrow_environment_entry_value_by_name_const(
trace_class, "procname");
if (procname_str) {
const char *str;
trace_class, "procname");
if (procname_str) {
const char *str;
@@
-426,7
+414,7
@@
int print_event_header(struct pretty_component *pretty,
if (pretty->options.print_trace_vpid_field) {
const struct bt_value *vpid_value;
if (pretty->options.print_trace_vpid_field) {
const struct bt_value *vpid_value;
- vpid_value = bt_trace_borrow_environment_entry_value_by_name_const(
+ vpid_value = bt_trace_
class_
borrow_environment_entry_value_by_name_const(
trace_class, "vpid");
if (vpid_value) {
int64_t value;
trace_class, "vpid");
if (vpid_value) {
int64_t value;
This page took
0.025402 seconds
and
4
git commands to generate.