Text output identical with babeltrace 1

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

diff --git a/plugins/text/text.c b/plugins/text/text.c
index a270fd4820ad046c62e2529a8a452ca457a7b3bf..3e2727622dca85cef6309ed2cc99103dac71cc39 100644 (file)
--- a/plugins/text/text.c
+++ b/plugins/text/text.c
@@ -28,16 +28,16 @@
  */
 
 #include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/component/component.h>
-#include <babeltrace/component/private-component.h>
-#include <babeltrace/component/component-sink.h>
-#include <babeltrace/component/port.h>
-#include <babeltrace/component/private-port.h>
-#include <babeltrace/component/connection.h>
-#include <babeltrace/component/private-connection.h>
-#include <babeltrace/component/notification/notification.h>
-#include <babeltrace/component/notification/iterator.h>
-#include <babeltrace/component/notification/event.h>
+#include <babeltrace/graph/component.h>
+#include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/component-sink.h>
+#include <babeltrace/graph/port.h>
+#include <babeltrace/graph/private-port.h>
+#include <babeltrace/graph/connection.h>
+#include <babeltrace/graph/private-connection.h>
+#include <babeltrace/graph/notification.h>
+#include <babeltrace/graph/notification-iterator.h>
+#include <babeltrace/graph/notification-event.h>
 #include <babeltrace/values.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/common-internal.h>
@@ -74,6 +74,7 @@ const char *plugin_options[] = {
        "field-trace:vpid",
        "field-loglevel",
        "field-emf",
+       "field-callsite",
 };
 
 static
@@ -129,10 +130,8 @@ enum bt_component_status handle_notification(struct text_component *text,
 
        switch (bt_notification_get_type(notification)) {
        case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               puts("<packet>");
                break;
        case BT_NOTIFICATION_TYPE_PACKET_END:
-               puts("</packet>");
                break;
        case BT_NOTIFICATION_TYPE_EVENT:
        {
@@ -151,7 +150,6 @@ enum bt_component_status handle_notification(struct text_component *text,
                break;
        }
        case BT_NOTIFICATION_TYPE_STREAM_END:
-               puts("</stream>");
                break;
        default:
                puts("Unhandled notification type");
@@ -194,31 +192,25 @@ enum bt_component_status run(struct bt_private_component *component)
        struct bt_notification_iterator *it;
        struct text_component *text =
                bt_private_component_get_user_data(component);
+       enum bt_notification_iterator_status it_ret;
 
        it = text->input_iterator;
 
-       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;
-                       BT_PUT(text->input_iterator);
-                       goto end;
-               default:
-                       break;
-               }
-       }
-       notification = bt_notification_iterator_get_notification(it);
-       if (!notification) {
+       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;
+               BT_PUT(text->input_iterator);
+               goto end;
+       default:
+               break;
        }
 
+       notification = bt_notification_iterator_get_notification(it);
+       assert(notification);
        ret = handle_notification(text, notification);
        text->processed_first_event = true;
 end:
@@ -565,7 +557,7 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_trace_vpid_field = true;
                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;
@@ -575,7 +567,7 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_trace_vpid_field = true;
                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;
@@ -585,7 +577,7 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_trace_vpid_field = false;
                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;
@@ -664,12 +656,12 @@ enum bt_component_status apply_params(struct text_component *text,
 
        value = false;
        found = false;
-       ret = apply_one_bool("field-emf", params, &value, &found);
+       ret = apply_one_bool("field-callsite", params, &value, &found);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
        }
        if (found) {
-               text->options.print_emf_field = value;
+               text->options.print_callsite_field = value;
        }
 
 end: