Fix: quote event name in metadata

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

diff --git a/lttng-events.c b/lttng-events.c
index 4f30904dc0c922d7c865369387a42c4d860a45c9..27a44e4ec7febb468c62a26bfc2daf8c61ac61df 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -31,6 +31,7 @@
 #include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
 #include "wrapper/random.h"
 #include "wrapper/tracepoint.h"
+#include "lttng-kernel-version.h"
 #include "lttng-events.h"
 #include "lttng-tracer.h"
 #include "lttng-abi-old.h"
@@ -53,9 +54,15 @@ int _lttng_session_metadata_statedump(struct lttng_session *session);
 void synchronize_trace(void)
 {
        synchronize_sched();
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#ifdef CONFIG_PREEMPT_RT_FULL
+       synchronize_rcu();
+#endif
+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
 #ifdef CONFIG_PREEMPT_RT
        synchronize_rcu();
 #endif
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
 }
 
 struct lttng_session *lttng_session_create(void)
@@ -394,6 +401,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
                break;
        default:
                WARN_ON_ONCE(1);
+               goto register_error;
        }
        ret = _lttng_event_metadata_statedump(chan->session, chan, event);
        if (ret)
@@ -712,7 +720,7 @@ int _lttng_event_metadata_statedump(struct lttng_session *session,
 
        ret = lttng_metadata_printf(session,
                "event {\n"
-               "       name = %s;\n"
+               "       name = \"%s\";\n"
                "       id = %u;\n"
                "       stream_id = %u;\n",
                event->desc->name,