X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=285b98e8d501181241c65fe5a46bff61a68b7782;hb=5c0552753c1d70bbf7cf9808b427c941ac58a256;hp=6e16cf2548f04087ec3d1b6805736d3da1f179b5;hpb=37dddb65504eff070a64fb4a8f1c56ee81c3173c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 6e16cf25..285b98e8 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -60,21 +60,9 @@
 #include "jhash.h"
 
 /*
- * The sessions mutex is the centralized mutex across UST tracing
- * control and probe registration. All operations within this file are
- * called by the communication thread, under ust_lock protection.
+ * All operations within this file are called by the communication
+ * thread, under ust_lock protection.
  */
-static pthread_mutex_t sessions_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void ust_lock(void)
-{
-	pthread_mutex_lock(&sessions_mutex);
-}
-
-void ust_unlock(void)
-{
-	pthread_mutex_unlock(&sessions_mutex);
-}
 
 static CDS_LIST_HEAD(sessions);
 
@@ -112,24 +100,27 @@ int lttng_loglevel_match(int loglevel,
 		enum lttng_ust_loglevel_type req_type,
 		int req_loglevel)
 {
-	if (req_type == LTTNG_UST_LOGLEVEL_ALL)
-		return 1;
 	if (!has_loglevel)
 		loglevel = TRACE_DEFAULT;
 	switch (req_type) {
 	case LTTNG_UST_LOGLEVEL_RANGE:
-		if (loglevel <= req_loglevel || req_loglevel == -1)
+		if (loglevel <= req_loglevel
+				|| (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
 			return 1;
 		else
 			return 0;
 	case LTTNG_UST_LOGLEVEL_SINGLE:
-		if (loglevel == req_loglevel || req_loglevel == -1)
+		if (loglevel == req_loglevel
+				|| (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
 			return 1;
 		else
 			return 0;
 	case LTTNG_UST_LOGLEVEL_ALL:
 	default:
-		return 1;
+		if (loglevel <= TRACE_DEBUG)
+			return 1;
+		else
+			return 0;
 	}
 }
 
@@ -257,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
@@ -296,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;
@@ -686,7 +678,7 @@ int lttng_fix_pending_events(void)
  * Only dump state for the sessions owned by the caller thread, because
  * we don't keep ust_lock across the entire iteration.
  */
-int lttng_handle_pending_statedump(void *owner)
+void lttng_handle_pending_statedump(void *owner)
 {
 	struct lttng_session *session;
 
@@ -694,7 +686,9 @@ int lttng_handle_pending_statedump(void *owner)
 	lttng_ust_baddr_statedump(owner);
 
 	/* Clear pending state dump */
-	ust_lock();
+	if (ust_lock()) {
+		goto end;
+	}
 	cds_list_for_each_entry(session, &sessions, node) {
 		if (session->owner != owner)
 			continue;
@@ -702,8 +696,9 @@ int lttng_handle_pending_statedump(void *owner)
 			continue;
 		session->statedump_pending = 0;
 	}
+end:
 	ust_unlock();
-	return 0;
+	return;
 }
 
 /*
@@ -803,6 +798,17 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
 	switch (context_param->ctx) {
 	case LTTNG_UST_CONTEXT_PTHREAD_ID:
 		return lttng_add_pthread_id_to_ctx(ctx);
+	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+	{
+		struct lttng_ust_perf_counter_ctx *perf_ctx_param;
+
+		perf_ctx_param = &context_param->u.perf_counter;
+		return lttng_add_perf_counter_to_ctx(
+			perf_ctx_param->type,
+			perf_ctx_param->config,
+			perf_ctx_param->name,
+			ctx);
+	}
 	case LTTNG_UST_CONTEXT_VTID:
 		return lttng_add_vtid_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_VPID: