Update ring buffer and pretty print

[lttng-modules.git] / ltt-debugfs-abi.c

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 41b9f8fa55d7108a01290ec37bab95b3a4d14f7d..4f283a1835a33475254bb330c79c90a1bda68c46 100644 (file)
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -32,6 +32,7 @@
 #include "wrapper/ringbuffer/vfs.h"
 #include "ltt-debugfs-abi.h"
 #include "ltt-events.h"
+#include "ltt-tracer.h"
 
 /*
  * This is LTTng's own personal way to create a system call as an external
@@ -83,6 +84,21 @@ fd_error:
        return ret;
 }
 
+static
+long lttng_abi_tracer_version(struct file *file, 
+       struct lttng_kernel_tracer_version __user *uversion_param)
+{
+       struct lttng_kernel_tracer_version v;
+
+       v.version = LTTNG_VERSION;
+       v.patchlevel = LTTNG_PATCHLEVEL;
+       v.sublevel = LTTNG_SUBLEVEL;
+
+       if (copy_to_user(uversion_param, &v, sizeof(v)))
+               return -EFAULT;
+       return 0;
+}
+
 /**
  *     lttng_ioctl - lttng syscall through ioctl
  *
@@ -102,6 +118,9 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        switch (cmd) {
        case LTTNG_KERNEL_SESSION:
                return lttng_abi_create_session();
+       case LTTNG_KERNEL_TRACER_VERSION:
+               return lttng_abi_tracer_version(file,
+                               (struct lttng_kernel_tracer_version __user *) arg);
        default:
                return -ENOIOCTLCMD;
        }
@@ -123,22 +142,18 @@ static
 void lttng_metadata_create_events(struct file *channel_file)
 {
        struct ltt_channel *channel = channel_file->private_data;
-       char *event_name = "lttng_metadata";
-       const struct lttng_event_desc *event_desc;
+       static struct lttng_kernel_event metadata_params = {
+               .instrumentation = LTTNG_KERNEL_TRACEPOINTS,
+               .name = "lttng_metadata",
+       };
        struct ltt_event *event;
        int ret;
 
-       event_desc = ltt_event_get(event_name);
-       if (!event_desc) {
-               ret = -ENOENT;
-               goto get_error;
-       }
        /*
         * We tolerate no failure path after event creation. It will stay
         * invariant for the rest of the session.
         */
-       event = ltt_event_create(channel, event_name, LTTNG_KERNEL_TRACEPOINTS,
-                                event_desc, NULL);
+       event = ltt_event_create(channel, &metadata_params, NULL);
        if (!event) {
                goto create_error;
                ret = -EEXIST;
@@ -146,8 +161,6 @@ void lttng_metadata_create_events(struct file *channel_file)
        return;
 
 create_error:
-       ltt_event_put(event_desc);
-get_error:
        WARN_ON(1);
        return;         /* not allowed to return error */
 }
@@ -211,8 +224,8 @@ int lttng_abi_create_channel(struct file *session_file,
        chan_file->private_data = chan;
        fd_install(chan_fd, chan_file);
        if (channel_type == METADATA_CHANNEL) {
-               lttng_metadata_create_events(chan_file);
                session->metadata = chan;
+               lttng_metadata_create_events(chan_file);
        }
 
        /* The channel created holds a reference on the session */
@@ -340,28 +353,23 @@ int lttng_abi_create_event(struct file *channel_file,
                           struct lttng_kernel_event __user *uevent_param)
 {
        struct ltt_channel *channel = channel_file->private_data;
-       const struct lttng_event_desc *event_desc;
        struct ltt_event *event;
-       char *event_name;
        struct lttng_kernel_event event_param;
        int event_fd, ret;
        struct file *event_file;
 
        if (copy_from_user(&event_param, uevent_param, sizeof(event_param)))
                return -EFAULT;
-       event_name = kmalloc(PATH_MAX, GFP_KERNEL);
-       if (!event_name)
-               return -ENOMEM;
-       if (strncpy_from_user(event_name, uevent_param->name, PATH_MAX) < 0) {
-               ret = -EFAULT;
-               goto name_error;
-       }
-       event_name[PATH_MAX - 1] = '\0';
-
-       event_desc = ltt_event_get(event_name);
-       if (!event_desc) {
-               ret = -ENOENT;
-               goto get_error;
+       event_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+       switch (event_param.instrumentation) {
+       case LTTNG_KERNEL_KPROBES:
+               event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+               break;
+       case LTTNG_KERNEL_FUNCTION_TRACER:
+               event_param.u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+               break;
+       default:
+               break;
        }
        event_fd = get_unused_fd();
        if (event_fd < 0) {
@@ -379,17 +387,15 @@ int lttng_abi_create_event(struct file *channel_file,
         * We tolerate no failure path after event creation. It will stay
         * invariant for the rest of the session.
         */
-       event = ltt_event_create(channel, event_name, event_param.instrumentation,
-                                event_desc, NULL);
+       event = ltt_event_create(channel, &event_param, NULL);
        if (!event) {
-               goto event_error;
                ret = -EEXIST;
+               goto event_error;
        }
        event_file->private_data = event;
        fd_install(event_fd, event_file);
        /* The event holds a reference on the channel */
        atomic_long_inc(&channel_file->f_count);
-       kfree(event_name);
        return event_fd;
 
 event_error:
@@ -397,10 +403,6 @@ event_error:
 file_error:
        put_unused_fd(event_fd);
 fd_error:
-       ltt_event_put(event_desc);
-get_error:
-name_error:
-       kfree(event_name);
        return ret;
 }
 
@@ -520,10 +522,8 @@ int lttng_event_release(struct inode *inode, struct file *file)
 {
        struct ltt_event *event = file->private_data;
 
-       if (event) {
-               ltt_event_unregister(event);
+       if (event)
                fput(event->chan->file);
-       }
        return 0;
 }