statedump: fix include circular dep

[lttng-modules.git] / lttng-events.c

diff --git a/lttng-events.c b/lttng-events.c
index 674494bd6b0c30998ed3ada2083ccd765f7fafc7..a3758229c745ef53fa0929d766fc95dce8d66bec 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -14,6 +14,7 @@
 #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"
@@ -112,6 +113,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:
@@ -938,6 +944,21 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
        if (ret)
                goto end;
 
+       ret = lttng_metadata_printf(session,
+               "env {\n"
+               "       domain = \"%s\";\n"
+               "       sysname = \"%s\";\n"
+               "       release = \"%s\";\n"
+               "       version = \"%s\";\n"
+               "};\n\n",
+               "kernel",
+               utsname()->sysname,
+               utsname()->release,
+               utsname()->version
+               );
+       if (ret)
+               goto end;
+
        ret = lttng_metadata_printf(session,
                "clock {\n"
                "       name = %s;\n",