X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=25b4962583a833811014cf50558f46ea4a5aa7e3;hb=6b0ddc3d2c4774c4a02d1bb3b266d83b5aa8ef0e;hp=0cab2f49ad2d544718a3c14159ada235319a75f3;hpb=d58d145447ffcc9497801769e1fe754b30dca5b8;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 0cab2f49..25b49625 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -54,7 +54,7 @@
 #include "tracepoint-internal.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
-#include "lttng-ust-baddr.h"
+#include "lttng-ust-statedump.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
 #include "jhash.h"
@@ -105,19 +105,19 @@ int lttng_loglevel_match(int loglevel,
 	switch (req_type) {
 	case LTTNG_UST_LOGLEVEL_RANGE:
 		if (loglevel <= req_loglevel
-				|| (req_loglevel == -1 && loglevel <= TRACE_DEFAULT))
+				|| (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
 			return 1;
 		else
 			return 0;
 	case LTTNG_UST_LOGLEVEL_SINGLE:
 		if (loglevel == req_loglevel
-				|| (req_loglevel == -1 && loglevel <= TRACE_DEFAULT))
+				|| (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
 			return 1;
 		else
 			return 0;
 	case LTTNG_UST_LOGLEVEL_ALL:
 	default:
-		if (loglevel <= TRACE_DEFAULT)
+		if (loglevel <= TRACE_DEBUG)
 			return 1;
 		else
 			return 0;
@@ -248,8 +248,6 @@ int lttng_session_enable(struct lttng_session *session)
 
 	/* Set transient enabler state to "enabled" */
 	session->tstate = 1;
-	/* We need to sync enablers with session before activation. */
-	lttng_session_sync_enablers(session);
 
 	/*
 	 * Snapshot the number of events per channel to know the type of header
@@ -287,6 +285,9 @@ int lttng_session_enable(struct lttng_session *session)
 		}
 	}
 
+	/* We need to sync enablers with session before activation. */
+	lttng_session_sync_enablers(session);
+
 	/* Set atomically the state to "active" */
 	CMM_ACCESS_ONCE(session->active) = 1;
 	CMM_ACCESS_ONCE(session->been_active) = 1;
@@ -682,7 +683,7 @@ void lttng_handle_pending_statedump(void *owner)
 	struct lttng_session *session;
 
 	/* Execute state dump */
-	lttng_ust_baddr_statedump(owner);
+	do_lttng_ust_statedump(owner);
 
 	/* Clear pending state dump */
 	if (ust_lock()) {
@@ -745,7 +746,7 @@ struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
 		sizeof(enabler->event_param));
 	enabler->chan = chan;
 	/* ctx left NULL */
-	enabler->enabled = 1;
+	enabler->enabled = 0;
 	cds_list_add(&enabler->node, &enabler->chan->session->enablers_head);
 	lttng_session_lazy_sync_enablers(enabler->chan->session);
 	return enabler;
@@ -816,6 +817,8 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
 		return lttng_add_procname_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_IP:
 		return lttng_add_ip_to_ctx(ctx);
+	case LTTNG_UST_CONTEXT_CPU_ID:
+		return lttng_add_cpu_id_to_ctx(ctx);
 	default:
 		return -EINVAL;
 	}