text output: wire up clock options, error checking

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

diff --git a/plugins/text/text.c b/plugins/text/text.c
index da659eeb741bbcf6f226f4de19f7c8db4c3e30fc..f5a62c63aeaa69ea82fb8758d7548f92e40c9589 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,26 +66,6 @@ const char *plugin_options[] = {
        "field-trace:vpid",
        "field-loglevel",
        "field-emf",
-       "field-callsite",
-};
-
-static
-const char *loglevel_str [] = {
-       [LOGLEVEL_EMERG] =              "TRACE_EMERG",
-       [LOGLEVEL_ALERT] =              "TRACE_ALERT",
-       [LOGLEVEL_CRIT] =               "TRACE_CRIT",
-       [LOGLEVEL_ERR] =                "TRACE_ERR",
-       [LOGLEVEL_WARNING] =            "TRACE_WARNING",
-       [LOGLEVEL_NOTICE] =             "TRACE_NOTICE",
-       [LOGLEVEL_INFO] =               "TRACE_INFO",
-       [LOGLEVEL_DEBUG_SYSTEM] =       "TRACE_DEBUG_SYSTEM",
-       [LOGLEVEL_DEBUG_PROGRAM] =      "TRACE_DEBUG_PROGRAM",
-       [LOGLEVEL_DEBUG_PROCESS] =      "TRACE_DEBUG_PROCESS",
-       [LOGLEVEL_DEBUG_MODULE] =       "TRACE_DEBUG_MODULE",
-       [LOGLEVEL_DEBUG_UNIT] =         "TRACE_DEBUG_UNIT",
-       [LOGLEVEL_DEBUG_FUNCTION] =     "TRACE_DEBUG_FUNCTION",
-       [LOGLEVEL_DEBUG_LINE] =         "TRACE_DEBUG_LINE",
-       [LOGLEVEL_DEBUG] =              "TRACE_DEBUG",
 };
 
 static
@@ -504,7 +485,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;
@@ -515,7 +495,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;
@@ -526,7 +505,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;
@@ -613,15 +591,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;