X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=9c22e38901144a00041d6176d5d5ef887777e5e2;hb=022d91ba14053d6093a6d6a1af02a345c6fd42d2;hp=c08246a25a9f441360fb5ad4a1b6c5ef1a04d7e0;hpb=40024f8ae201b06ead80e55e999ca66b1a00bb9d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index c08246a25..9c22e3890 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -218,7 +218,15 @@ 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;
+	lus->metadata_attr.subbuf_size = default_get_metadata_subbuf_size();
+	lus->metadata_attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
+	lus->metadata_attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER;
+	lus->metadata_attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;
+	lus->metadata_attr.output = LTTNG_UST_MMAP;
 
 	/*
 	 * Default buffer type. This can be changed through an enable channel
@@ -234,7 +242,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 
 	/* Alloc UST global domain channels' HT */
 	lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
-	ret = jul_init_domain(&lus->domain_jul);
+	ret = agent_init(&lus->agent);
 	if (ret < 0) {
 		goto error_consumer;
 	}
@@ -258,7 +266,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 
 error_consumer:
 	ht_cleanup_push(lus->domain_global.channels);
-	jul_destroy_domain(&lus->domain_jul);
+	agent_destroy(&lus->agent);
 	free(lus);
 error:
 	return NULL;
@@ -332,6 +340,7 @@ error:
  * Return pointer to structure or NULL.
  */
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion)
 {
@@ -386,6 +395,7 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 	}
 
 	/* Same layout. */
+	lue->filter_expression = filter_expression;
 	lue->filter = (struct lttng_ust_filter_bytecode *) filter;
 	lue->exclusion = (struct lttng_event_exclusion *) exclusion;
 
@@ -404,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;
@@ -433,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;
 	}
 
@@ -444,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;
 
@@ -503,6 +577,7 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
 	assert(event);
 
 	DBG2("Trace destroy UST event %s", event->attr.name);
+	free(event->filter_expression);
 	free(event->filter);
 	free(event->exclusion);
 	free(event);
@@ -645,7 +720,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
 	/* Cleaning up UST domain */
 	destroy_domain_global(&session->domain_global);
-	jul_destroy_domain(&session->domain_jul);
+	agent_destroy(&session->agent);
 
 	/* Cleanup UID buffer registry object(s). */
 	cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,