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

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index ad374f3b..285b98e8 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -54,29 +54,23 @@
 #include "tracepoint-internal.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
+#include "lttng-ust-baddr.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
 #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);
-}
+static CDS_LIST_HEAD(sessions);
 
-void ust_unlock(void)
+struct cds_list_head *_lttng_get_sessions(void)
 {
-	pthread_mutex_unlock(&sessions_mutex);
+	return &sessions;
 }
 
-static CDS_LIST_HEAD(sessions);
-
 static void _lttng_event_destroy(struct lttng_event *event);
 
 static
@@ -106,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;
 	}
 }
 
@@ -251,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
@@ -290,9 +285,15 @@ 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;
+
+	session->statedump_pending = 1;
+	lttng_ust_sockinfo_session_enabled(session->owner);
 end:
 	return ret;
 }
@@ -491,6 +492,31 @@ static
 int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 		struct lttng_enabler *enabler)
 {
+	struct lttng_ust_excluder_node *excluder;
+
+	/* If event matches with an excluder, return 'does not match' */
+	cds_list_for_each_entry(excluder, &enabler->excluder_head, node) {
+		int count;
+
+		for (count = 0; count < excluder->excluder.count; count++) {
+			int found, len;
+			char *excluder_name;
+
+			excluder_name = (char *) (excluder->excluder.names)
+					+ count * LTTNG_UST_SYM_NAME_LEN;
+			len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
+			if (len > 0 && excluder_name[len - 1] == '*') {
+				found = !strncmp(desc->name, excluder_name,
+						len - 1);
+			} else {
+				found = !strncmp(desc->name, excluder_name,
+						LTTNG_UST_SYM_NAME_LEN - 1);
+			}
+			if (found) {
+				return 0;
+			}
+		}
+	}
 	switch (enabler->type) {
 	case LTTNG_ENABLER_WILDCARD:
 		return lttng_desc_match_wildcard_enabler(desc, enabler);
@@ -647,6 +673,34 @@ int lttng_fix_pending_events(void)
 	return 0;
 }
 
+/*
+ * For each session of the owner thread, execute pending statedump.
+ * Only dump state for the sessions owned by the caller thread, because
+ * we don't keep ust_lock across the entire iteration.
+ */
+void lttng_handle_pending_statedump(void *owner)
+{
+	struct lttng_session *session;
+
+	/* Execute state dump */
+	lttng_ust_baddr_statedump(owner);
+
+	/* Clear pending state dump */
+	if (ust_lock()) {
+		goto end;
+	}
+	cds_list_for_each_entry(session, &sessions, node) {
+		if (session->owner != owner)
+			continue;
+		if (!session->statedump_pending)
+			continue;
+		session->statedump_pending = 0;
+	}
+end:
+	ust_unlock();
+	return;
+}
+
 /*
  * Only used internally at session destruction.
  */
@@ -721,6 +775,15 @@ int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
 	return 0;
 }
 
+int lttng_enabler_attach_exclusion(struct lttng_enabler *enabler,
+		struct lttng_ust_excluder_node *excluder)
+{
+	excluder->enabler = enabler;
+	cds_list_add_tail(&excluder->node, &enabler->excluder_head);
+	lttng_session_lazy_sync_enablers(enabler->chan->session);
+	return 0;
+}
+
 int lttng_attach_context(struct lttng_ust_context *context_param,
 		struct lttng_ctx **ctx, struct lttng_session *session)
 {
@@ -735,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: