X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=b33287855e373ef0b9f253d02eb78294ccaab3e7;hp=a6fea46ce55e5e9d3dcca669bf4bd1d8839ce1f4;hb=045fc61744f711fd2e4ca84c6339d97f1eafc71d;hpb=12dfd2b961163e9c076f49b37bc42334f3bc463e

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index a6fea46ce..b33287855 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -261,6 +261,9 @@ const char *get_ust_context_type_string(
 	case LTTNG_UST_CONTEXT_PTHREAD_ID:
 		context_type_string = config_event_context_pthread_id;
 		break;
+	case LTTNG_UST_CONTEXT_APP_CONTEXT:
+		context_type_string = config_event_context_app;
+		break;
 	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
 		/*
 		 * Error, should not be stored in the XML, perf contexts
@@ -845,7 +848,8 @@ int save_kernel_context(struct config_writer *writer,
 	}
 
 	if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER) {
-		ret = config_writer_open_element(writer, config_element_perf);
+		ret = config_writer_open_element(writer,
+				config_element_context_perf);
 		if (ret) {
 			ret = LTTNG_ERR_SAVE_IO_FAIL;
 			goto end;
@@ -942,6 +946,124 @@ end:
 	return ret;
 }
 
+static
+int save_ust_context_perf_thread_counter(struct config_writer *writer,
+		struct ltt_ust_context *ctx)
+{
+	int ret;
+
+	assert(writer);
+	assert(ctx);
+
+	/* Perf contexts are saved as event_perf_context_type */
+	ret = config_writer_open_element(writer, config_element_context_perf);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	ret = config_writer_write_element_unsigned_int(writer,
+			config_element_type, ctx->ctx.u.perf_counter.type);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	ret = config_writer_write_element_unsigned_int(writer,
+			config_element_config, ctx->ctx.u.perf_counter.config);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	ret = config_writer_write_element_string(writer, config_element_name,
+			ctx->ctx.u.perf_counter.name);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	/* /perf */
+	ret = config_writer_close_element(writer);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+end:
+	return ret;
+}
+
+static
+int save_ust_context_app_ctx(struct config_writer *writer,
+		struct ltt_ust_context *ctx)
+{
+	int ret;
+
+	assert(writer);
+	assert(ctx);
+
+	/* Application contexts are saved as application_context_type */
+	ret = config_writer_open_element(writer, config_element_context_app);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	ret = config_writer_write_element_string(writer,
+			config_element_context_app_provider_name,
+			ctx->ctx.u.app_ctx.provider_name);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	ret = config_writer_write_element_string(writer,
+			config_element_context_app_ctx_name,
+			ctx->ctx.u.app_ctx.ctx_name);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	/* /app */
+	ret = config_writer_close_element(writer);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+end:
+	return ret;
+}
+
+static
+int save_ust_context_generic(struct config_writer *writer,
+		struct ltt_ust_context *ctx)
+{
+	int ret;
+	const char *context_type_string;
+
+	assert(writer);
+	assert(ctx);
+
+	/* Save context as event_context_type_type */
+	context_type_string = get_ust_context_type_string(
+			ctx->ctx.ctx);
+	if (!context_type_string) {
+		ERR("Unsupported UST context type.");
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	ret = config_writer_write_element_string(writer,
+			config_element_type, context_type_string);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+end:
+	return ret;
+}
+
 static
 int save_ust_context(struct config_writer *writer,
 	struct cds_list_head *ctx_list)
@@ -959,9 +1081,6 @@ int save_ust_context(struct config_writer *writer,
 	}
 
 	cds_list_for_each_entry(ctx, ctx_list, list) {
-		const char *context_type_string;
-
-
 		ret = config_writer_open_element(writer,
 			config_element_context);
 		if (ret) {
@@ -969,61 +1088,19 @@ int save_ust_context(struct config_writer *writer,
 			goto end;
 		}
 
-		if (ctx->ctx.ctx == LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER) {
-			/* Perf contexts are saved as event_perf_context_type */
-			ret = config_writer_open_element(writer,
-				config_element_perf);
-			if (ret) {
-				ret = LTTNG_ERR_SAVE_IO_FAIL;
-				goto end;
-			}
-
-			ret = config_writer_write_element_unsigned_int(writer,
-				config_element_type,
-				ctx->ctx.u.perf_counter.type);
-			if (ret) {
-				ret = LTTNG_ERR_SAVE_IO_FAIL;
-				goto end;
-			}
-
-			ret = config_writer_write_element_unsigned_int(writer,
-				config_element_config,
-				ctx->ctx.u.perf_counter.config);
-			if (ret) {
-				ret = LTTNG_ERR_SAVE_IO_FAIL;
-				goto end;
-			}
-
-			ret = config_writer_write_element_string(writer,
-				config_element_name,
-				ctx->ctx.u.perf_counter.name);
-			if (ret) {
-				ret = LTTNG_ERR_SAVE_IO_FAIL;
-				goto end;
-			}
-
-			/* /perf */
-			ret = config_writer_close_element(writer);
-			if (ret) {
-				ret = LTTNG_ERR_SAVE_IO_FAIL;
-				goto end;
-			}
-		} else {
-			/* Save context as event_context_type_type */
-			context_type_string = get_ust_context_type_string(
-				ctx->ctx.ctx);
-			if (!context_type_string) {
-				ERR("Unsupported UST context type.")
-					ret = LTTNG_ERR_INVALID;
-				goto end;
-			}
-
-			ret = config_writer_write_element_string(writer,
-				config_element_type, context_type_string);
-			if (ret) {
-				ret = LTTNG_ERR_SAVE_IO_FAIL;
-				goto end;
-			}
+		switch (ctx->ctx.ctx) {
+		case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+			ret = save_ust_context_perf_thread_counter(writer, ctx);
+			break;
+		case LTTNG_UST_CONTEXT_APP_CONTEXT:
+			ret = save_ust_context_app_ctx(writer, ctx);
+			break;
+		default:
+			/* Save generic context. */
+			ret = save_ust_context_generic(writer, ctx);
+		}
+		if (ret) {
+			goto end;
 		}
 
 		/* /context */