X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=96225a21b4846e974ffb1f900c054202759e3b5a;hb=edb62ef53ad89e90b560efdd69d3d1302e9138a3;hp=8d3c7dcf8e8e59f3962c991225b67174a5414d22;hpb=6b453b5e07e90591c955ae14c60c13b7c1ed28a0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 8d3c7dcf8..96225a21b 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -218,7 +218,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 
 	/* Init data structure */
 	lus->id = session_id;
-	lus->start_trace = 0;
+	lus->active = 0;
 
 	/* Set default metadata channel attribute. */
 	lus->metadata_attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
@@ -414,20 +414,12 @@ error:
 	return NULL;
 }
 
-/*
- * Allocate and initialize an UST context.
- *
- * Return pointer to structure or NULL.
- */
-struct ltt_ust_context *trace_ust_create_context(
-		struct lttng_event_context *ctx)
+static
+int trace_ust_context_type_event_to_ust(enum lttng_event_context_type type)
 {
-	struct ltt_ust_context *uctx;
-	enum lttng_ust_context_type utype;
-
-	assert(ctx);
+	int utype;
 
-	switch (ctx->ctx) {
+	switch (type) {
 	case LTTNG_EVENT_CONTEXT_VTID:
 		utype = LTTNG_UST_CONTEXT_VTID;
 		break;
@@ -443,8 +435,70 @@ struct ltt_ust_context *trace_ust_create_context(
 	case LTTNG_EVENT_CONTEXT_IP:
 		utype = LTTNG_UST_CONTEXT_IP;
 		break;
+	case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER:
+		utype = LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER;
+		break;
 	default:
 		ERR("Invalid UST context");
+		utype = -1;
+		break;
+	}
+	return utype;
+}
+
+/*
+ * Return 1 if contexts match, 0 otherwise.
+ */
+int trace_ust_match_context(struct ltt_ust_context *uctx,
+		struct lttng_event_context *ctx)
+{
+	int utype;
+
+	utype = trace_ust_context_type_event_to_ust(ctx->ctx);
+	if (utype < 0) {
+		return 0;
+	}
+	if (uctx->ctx.ctx != utype) {
+		return 0;
+	}
+	switch (utype) {
+	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+		if (uctx->ctx.u.perf_counter.type
+				!= ctx->u.perf_counter.type) {
+			return 0;
+		}
+		if (uctx->ctx.u.perf_counter.config
+				!= ctx->u.perf_counter.config) {
+			return 0;
+		}
+		if (strncmp(uctx->ctx.u.perf_counter.name,
+				ctx->u.perf_counter.name,
+				LTTNG_UST_SYM_NAME_LEN)) {
+			return 0;
+		}
+		break;
+	default:
+		break;
+
+	}
+	return 1;
+}
+
+/*
+ * Allocate and initialize an UST context.
+ *
+ * Return pointer to structure or NULL.
+ */
+struct ltt_ust_context *trace_ust_create_context(
+		struct lttng_event_context *ctx)
+{
+	struct ltt_ust_context *uctx;
+	int utype;
+
+	assert(ctx);
+
+	utype = trace_ust_context_type_event_to_ust(ctx->ctx);
+	if (utype < 0) {
 		return NULL;
 	}
 
@@ -454,9 +508,19 @@ struct ltt_ust_context *trace_ust_create_context(
 		goto error;
 	}
 
-	uctx->ctx.ctx = utype;
+	uctx->ctx.ctx = (enum lttng_ust_context_type) utype;
+	switch (utype) {
+	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+		uctx->ctx.u.perf_counter.type = ctx->u.perf_counter.type;
+		uctx->ctx.u.perf_counter.config = ctx->u.perf_counter.config;
+		strncpy(uctx->ctx.u.perf_counter.name, ctx->u.perf_counter.name,
+				LTTNG_UST_SYM_NAME_LEN);
+		uctx->ctx.u.perf_counter.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+		break;
+	default:
+		break;
+	}
 	lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx);
-	CDS_INIT_LIST_HEAD(&uctx->list);
 
 	return uctx;