projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Version 2.1.3
[lttng-modules.git] / lttng-events.c
diff --git a/lttng-events.c b/lttng-events.c
index 674494bd6b0c30998ed3ada2083ccd765f7fafc7..4f30904dc0c922d7c865369387a42c4d860a45c9 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -1,11 +1,23 @@
 /*
  * lttng-events.c
  *
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * Holds LTTng per-session event registry.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * 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>
@@ -14,11 +26,14 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
+#include <linux/utsname.h>
 #include "wrapper/uuid.h"
 #include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
 #include "wrapper/random.h"
+#include "wrapper/tracepoint.h"
 #include "lttng-events.h"
 #include "lttng-tracer.h"
+#include "lttng-abi-old.h"
 
 static LIST_HEAD(sessions);
 static LIST_HEAD(lttng_transport_list);
@@ -112,6 +127,11 @@ int lttng_session_enable(struct lttng_session *session)
        ACCESS_ONCE(session->active) = 1;
        ACCESS_ONCE(session->been_active) = 1;
        ret = _lttng_session_metadata_statedump(session);
+       if (ret) {
+               ACCESS_ONCE(session->active) = 0;
+               goto end;
+       }
+       ret = lttng_statedump_start(session);
        if (ret)
                ACCESS_ONCE(session->active) = 0;
 end:
@@ -226,9 +246,9 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session,
         * headers. Therefore the "chan" information used as input
         * should be already accessible.
         */
-       chan->chan = transport->ops.channel_create("[lttng]", chan, buf_addr,
-                       subbuf_size, num_subbuf, switch_timer_interval,
-                       read_timer_interval);
+       chan->chan = transport->ops.channel_create(transport_name,
+                       chan, buf_addr, subbuf_size, num_subbuf,
+                       switch_timer_interval, read_timer_interval);
        if (!chan->chan)
                goto create_error;
        chan->enabled = 1;
@@ -274,7 +294,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
        int ret;
 
        mutex_lock(&sessions_mutex);
-       if (chan->free_event_id == -1UL)
+       if (chan->free_event_id == -1U)
                goto full;
        /*
         * This is O(n^2) (for each event, the loop is called at event
@@ -298,7 +318,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
                event->desc = lttng_event_get(event_param->name);
                if (!event->desc)
                        goto register_error;
-               ret = tracepoint_probe_register(event_param->name,
+               ret = kabi_2635_tracepoint_probe_register(event_param->name,
                                event->desc->probe_callback,
                                event);
                if (ret)
@@ -402,7 +422,7 @@ int _lttng_event_unregister(struct lttng_event *event)
 
        switch (event->instrumentation) {
        case LTTNG_KERNEL_TRACEPOINT:
-               ret = tracepoint_probe_unregister(event->desc->name,
+               ret = kabi_2635_tracepoint_probe_unregister(event->desc->name,
                                                  event->desc->probe_callback,
                                                  event);
                if (ret)
@@ -797,9 +817,9 @@ int _lttng_stream_packet_context_declare(struct lttng_session *session)
                "struct packet_context {\n"
                "       uint64_clock_monotonic_t timestamp_begin;\n"
                "       uint64_clock_monotonic_t timestamp_end;\n"
-               "       uint32_t events_discarded;\n"
-               "       uint32_t content_size;\n"
-               "       uint32_t packet_size;\n"
+               "       uint64_t content_size;\n"
+               "       uint64_t packet_size;\n"
+               "       unsigned long events_discarded;\n"
                "       uint32_t cpu_id;\n"
                "};\n\n"
                );
@@ -869,7 +889,7 @@ uint64_t measure_clock_offset(void)
        local_irq_restore(flags);
 
        offset = (monotonic[0] + monotonic[1]) >> 1;
-       realtime = rts.tv_sec * NSEC_PER_SEC;
+       realtime = (uint64_t) rts.tv_sec * NSEC_PER_SEC;
        realtime += rts.tv_nsec;
        offset = realtime - offset;
        return offset;
@@ -908,6 +928,7 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
                "typealias integer { size = 16; align = %u; signed = false; } := uint16_t;\n"
                "typealias integer { size = 32; align = %u; signed = false; } := uint32_t;\n"
                "typealias integer { size = 64; align = %u; signed = false; } := uint64_t;\n"
+               "typealias integer { size = %u; align = %u; signed = false; } := unsigned long;\n"
                "typealias integer { size = 5; align = 1; signed = false; } := uint5_t;\n"
                "typealias integer { size = 27; align = 1; signed = false; } := uint27_t;\n"
                "\n"
@@ -926,8 +947,10 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
                lttng_alignof(uint16_t) * CHAR_BIT,
                lttng_alignof(uint32_t) * CHAR_BIT,
                lttng_alignof(uint64_t) * CHAR_BIT,
-               CTF_VERSION_MAJOR,
-               CTF_VERSION_MINOR,
+               sizeof(unsigned long) * CHAR_BIT,
+               lttng_alignof(unsigned long) * CHAR_BIT,
+               CTF_SPEC_MAJOR,
+               CTF_SPEC_MINOR,
                uuid_s,
 #ifdef __BIG_ENDIAN
                "be"
@@ -938,6 +961,29 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
        if (ret)
                goto end;
 
+       ret = lttng_metadata_printf(session,
+               "env {\n"
+               "       hostname = \"%s\";\n"
+               "       domain = \"kernel\";\n"
+               "       sysname = \"%s\";\n"
+               "       kernel_release = \"%s\";\n"
+               "       kernel_version = \"%s\";\n"
+               "       tracer_name = \"lttng-modules\";\n"
+               "       tracer_major = %d;\n"
+               "       tracer_minor = %d;\n"
+               "       tracer_patchlevel = %d;\n"
+               "};\n\n",
+               current->nsproxy->uts_ns->name.nodename,
+               utsname()->sysname,
+               utsname()->release,
+               utsname()->version,
+               LTTNG_MODULES_MAJOR_VERSION,
+               LTTNG_MODULES_MINOR_VERSION,
+               LTTNG_MODULES_PATCHLEVEL_VERSION
+               );
+       if (ret)
+               goto end;
+
        ret = lttng_metadata_printf(session,
                "clock {\n"
                "       name = %s;\n",
LTTng 2.0/0.x modules
This page took 0.025217 seconds and 4 git commands to generate.