Rename bt_notification_packet_start to "begin"

[babeltrace.git] / plugins / text / text.c

diff --git a/plugins/text/text.c b/plugins/text/text.c
index f9134b778fedea0d9d32b75aa0de68159dc6c62f..2712dd684db95d8de215cf24dc94a356e3faf71e 100644 (file)
--- a/plugins/text/text.c
+++ b/plugins/text/text.c
@@ -4,6 +4,7 @@
  * Babeltrace CTF Text Output Plugin
  *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -65,7 +66,6 @@ const char *plugin_options[] = {
        "field-trace:vpid",
        "field-loglevel",
        "field-emf",
-       "field-callsite",
 };
 
 static
@@ -119,7 +119,7 @@ enum bt_component_status handle_notification(struct text_component *text,
        }
 
        switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_START:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
                puts("<packet>");
                break;
        case BT_NOTIFICATION_TYPE_PACKET_END:
@@ -164,15 +164,21 @@ enum bt_component_status run(struct bt_component *component)
                goto end;
        }
 
-       if (!text->processed_first_event) {
-               ret = bt_notification_iterator_next(it);
-               if (ret != BT_COMPONENT_STATUS_OK) {
+       if (likely(text->processed_first_event)) {
+               enum bt_notification_iterator_status it_ret;
+
+               it_ret = bt_notification_iterator_next(it);
+               switch (it_ret) {
+               case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
+                       ret = BT_COMPONENT_STATUS_ERROR;
                        goto end;
+               case BT_NOTIFICATION_ITERATOR_STATUS_END:
+                       ret = BT_COMPONENT_STATUS_END;
+                       goto end;
+               default:
+                       break;
                }
-       } else {
-               text->processed_first_event = true;
        }
-
        notification = bt_notification_iterator_get_notification(it);
        if (!notification) {
                ret = BT_COMPONENT_STATUS_ERROR;
@@ -180,6 +186,7 @@ enum bt_component_status run(struct bt_component *component)
        }
 
        ret = handle_notification(text, notification);
+       text->processed_first_event = true;
 end:
        bt_put(it);
        bt_put(notification);
@@ -485,7 +492,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_loglevel_field = false;
                text->options.print_emf_field = false;
                text->options.print_emf_field = false;
-               text->options.print_callsite_field = false;
                break;
        case TEXT_DEFAULT_SHOW:
                text->options.print_trace_field = true;
@@ -496,7 +502,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_loglevel_field = true;
                text->options.print_emf_field = true;
                text->options.print_emf_field = true;
-               text->options.print_callsite_field = true;
                break;
        case TEXT_DEFAULT_HIDE:
                text->options.print_trace_field = false;
@@ -507,7 +512,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_loglevel_field = false;
                text->options.print_emf_field = false;
                text->options.print_emf_field = false;
-               text->options.print_callsite_field = false;
                break;
        default:
                ret = BT_COMPONENT_STATUS_ERROR;
@@ -594,15 +598,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_emf_field = value;
        }
 
-       value = false;
-       found = false;
-       ret = apply_one_bool("field-callsite", params, &value, &found);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto end;
-       }
-       if (found) {
-               text->options.print_callsite_field = value;
-       }
 end:
        bt_put(text->plugin_opt_map);
        text->plugin_opt_map = NULL;
@@ -625,6 +620,12 @@ enum bt_component_status text_component_init(
        text->out = stdout;
        text->err = stderr;
 
+       text->delta_cycles = -1ULL;
+       text->last_cycles_timestamp = -1ULL;
+
+       text->delta_real_timestamp = -1ULL;
+       text->last_real_timestamp = -1ULL;
+
        ret = apply_params(text, params);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;