Remove useless lttng_metadata probe

We don't use this event anymore since we write the metadata directly
into the ring buffer, no need for an external event. This probe was
the only one in the lttng-probe-lttng module, so we can get rid of
this module as well.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/lttng.h b/instrumentation/events/lttng-module/lttng.h
deleted file mode 100644 (file)
index 6f3d6d1..0000000
--- a/instrumentation/events/lttng-module/lttng.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM lttng
-
-#if !defined(_TRACE_LTTNG_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_LTTNG_H
-
-#include <linux/tracepoint.h>
-
-TRACE_EVENT(lttng_metadata,
-
-       TP_PROTO(const char *str),
-
-       TP_ARGS(str),
-
-       /*
-        * Not exactly a string: more a sequence of bytes (dynamic
-        * array) without the length. This is a dummy anyway: we only
-        * use this declaration to generate an event metadata entry.
-        */
-       TP_STRUCT__entry(
-               __string(       str,            str     )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(str, str)
-       ),
-
-       TP_printk("")
-)
-
-#endif /*  _TRACE_LTTNG_H */
-
-/* This part must be outside protection */
-#include "../../../probes/define_trace.h"

diff --git a/lttng-abi.c b/lttng-abi.c
index 25a350aed19c378be0909dac6235df444b014ce3..2709a855da8bb8d1aef90b01f15e5d570b57efe8 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -296,36 +296,6 @@ static const struct file_operations lttng_fops = {
 #endif
 };
 
-/*
- * We tolerate no failure in this function (if one happens, we print a dmesg
- * error, but cannot return any error, because the channel information is
- * invariant.
- */
-static
-void lttng_metadata_create_events(struct file *channel_file)
-{
-       struct lttng_channel *channel = channel_file->private_data;
-       static struct lttng_kernel_event metadata_params = {
-               .instrumentation = LTTNG_KERNEL_TRACEPOINT,
-               .name = "lttng_metadata",
-       };
-       struct lttng_event *event;
-
-       /*
-        * We tolerate no failure path after event creation. It will stay
-        * invariant for the rest of the session.
-        */
-       event = lttng_event_create(channel, &metadata_params, NULL, NULL);
-       if (!event) {
-               goto create_error;
-       }
-       return;
-
-create_error:
-       WARN_ON(1);
-       return;         /* not allowed to return error */
-}
-
 static
 int lttng_abi_create_channel(struct file *session_file,
                             struct lttng_kernel_channel *chan_param,
@@ -402,7 +372,6 @@ int lttng_abi_create_channel(struct file *session_file,
        fd_install(chan_fd, chan_file);
        if (channel_type == METADATA_CHANNEL) {
                session->metadata = chan;
-               lttng_metadata_create_events(chan_file);
        }
 
        /* The channel created holds a reference on the session */

diff --git a/lttng-probes.c b/lttng-probes.c
index c6dfbc957daa57b028a60d34c3f69bb76e9fa9eb..d6a6cf2e768fafd63bccc7c652531e67bbbd1b75 100644 (file)
--- a/lttng-probes.c
+++ b/lttng-probes.c
@@ -143,11 +143,6 @@ int tp_list_show(struct seq_file *m, void *p)
 {
        const struct lttng_event_desc *probe_desc = p;
 
-       /*
-        * Don't export lttng internal event: lttng_metadata.
-        */
-       if (!strcmp(probe_desc->name, "lttng_metadata"))
-               return 0;
        seq_printf(m,   "event { name = %s; };\n",
                   probe_desc->name);
        return 0;

diff --git a/probes/Makefile b/probes/Makefile
index 08adad5b125612ddf70185aa568f44b49b7b4d78..225803c39747d2790723af3fa7b37092361976db 100644 (file)
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -8,7 +8,6 @@ ifneq ($(CONFIG_TRACEPOINTS),)
 ccflags-y += -I$(PWD)/probes
 obj-m += lttng-types.o
 
-obj-m += lttng-probe-lttng.o
 obj-m += lttng-probe-sched.o
 obj-m += lttng-probe-irq.o
 obj-m += lttng-probe-timer.o

diff --git a/probes/lttng-probe-lttng.c b/probes/lttng-probe-lttng.c
deleted file mode 100644 (file)
index 365e1fc..0000000
--- a/probes/lttng-probe-lttng.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * probes/lttng-probe-core.c
- *
- * LTTng core probes.
- *
- * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <linux/module.h>
-
-/*
- * Create LTTng tracepoint probes.
- */
-#define LTTNG_PACKAGE_BUILD
-#define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
-
-#include "../instrumentation/events/lttng-module/lttng.h"
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
-MODULE_DESCRIPTION("LTTng core probes");