Remove callsite text output code

Not supported in babeltrace 2 anymore.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c
index 1ca58e0a3c1464854eb2ff5275d80048667e40ee..6094b127ad5e62143107ab29e0257d9c1822ed74 100644 (file)
--- a/converter/babeltrace-cfg.c
+++ b/converter/babeltrace-cfg.c
@@ -734,8 +734,7 @@ void print_legacy_usage(FILE *fp)
        fprintf(fp, "                               (default: `/usr/lib/debug`)\n");
        fprintf(fp, "  -f, --fields=NAME[,NAME]...  Print additional fields:\n");
        fprintf(fp, "                                 all, trace, trace:hostname, trace:domain,\n");
-       fprintf(fp, "                                 trace:procname, trace:vpid, loglevel, emf,\n");
-       fprintf(fp, "                                 callsite\n");
+       fprintf(fp, "                                 trace:procname, trace:vpid, loglevel, emf\n");
        fprintf(fp, "                                 (default: trace:hostname, trace:procname,\n");
        fprintf(fp, "                                           trace:vpid)\n");
        fprintf(fp, "  -n, --names=NAME[,NAME]...   Print field names:\n");

diff --git a/plugins/text/print.c b/plugins/text/print.c
index 53adab4c738d56bd43aa65a3f4cc7cc8da23c0f3..97c526ff71bde0a139d8d0dac0a351ec120e3d53 100644 (file)
--- a/plugins/text/print.c
+++ b/plugins/text/print.c
@@ -433,16 +433,6 @@ enum bt_component_status print_event_header(struct text_component *text,
                        bt_put(uri_str);
                }
        }
-       if (text->options.print_callsite_field) {
-               if (!text->start_line) {
-                       fputs(", ", text->out);
-               }
-               text->start_line = false;
-               if (print_names) {
-                       fputs("callsite = ", text->out);
-               }
-               /* TODO */
-       }
        if (!text->start_line) {
                fputs(", ", text->out);
        }

diff --git a/plugins/text/text.c b/plugins/text/text.c
index f9134b778fedea0d9d32b75aa0de68159dc6c62f..720c431f3de893c397befec3198f132f02017a35 100644 (file)
--- a/plugins/text/text.c
+++ b/plugins/text/text.c
@@ -65,7 +65,6 @@ const char *plugin_options[] = {
        "field-trace:vpid",
        "field-loglevel",
        "field-emf",
-       "field-callsite",
 };
 
 static
@@ -485,7 +484,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 +494,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 +504,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 +590,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;

diff --git a/plugins/text/text.h b/plugins/text/text.h
index 103dc07977d5be48e89d9a0f7b9494c973cd0c9e..2c846da8b4c6401398a0873bb6aee0ae1c2fd9f7 100644 (file)
--- a/plugins/text/text.h
+++ b/plugins/text/text.h
@@ -53,7 +53,6 @@ struct text_options {
        bool print_delta_field;
        bool print_loglevel_field;
        bool print_emf_field;
-       bool print_callsite_field;
        bool print_trace_field;
        bool print_trace_domain_field;
        bool print_trace_procname_field;