X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=e92ed8d88c2020015041556de8487e710614e415;hp=18d303cac9184cbd82ba0671c4b92e75b8eb91e0;hb=022d91ba14053d6093a6d6a1af02a345c6fd42d2;hpb=cba45edad79e4812a8dcac583778e25509c5e13b

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 18d303cac..e92ed8d88 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -258,8 +258,12 @@ 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_PERF_THREAD_COUNTER:
+		context_type_string = config_event_context_perf_thread_counter;
+		break;
 	default:
 		context_type_string = NULL;
+		break;
 	}
 
 	return context_type_string;
@@ -666,12 +670,6 @@ int save_kernel_context(struct config_writer *writer,
 		goto end;
 	}
 
-	ret = config_writer_open_element(writer, config_element_contexts);
-	if (ret) {
-		ret = LTTNG_ERR_SAVE_IO_FAIL;
-		goto end;
-	}
-
 	ret = config_writer_open_element(writer, config_element_context);
 	if (ret) {
 		ret = LTTNG_ERR_SAVE_IO_FAIL;
@@ -737,6 +735,30 @@ int save_kernel_context(struct config_writer *writer,
 		goto end;
 	}
 
+end:
+	return ret;
+}
+
+static
+int save_kernel_contexts(struct config_writer *writer,
+		struct ltt_kernel_channel *kchan)
+{
+	int ret;
+	struct ltt_kernel_context *ctx;
+
+	ret = config_writer_open_element(writer, config_element_contexts);
+	if (ret) {
+		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		goto end;
+	}
+
+	cds_list_for_each_entry(ctx, &kchan->ctx_list, list) {
+		ret = save_kernel_context(writer, &ctx->ctx);
+		if (ret) {
+			goto end;
+		}
+	}
+
 	/* /contexts */
 	ret = config_writer_close_element(writer);
 	if (ret) {
@@ -844,7 +866,7 @@ int save_kernel_channel(struct config_writer *writer,
 		goto end;
 	}
 
-	ret = save_kernel_context(writer, kchan->ctx);
+	ret = save_kernel_contexts(writer, kchan);
 	if (ret) {
 		goto end;
 	}
@@ -989,7 +1011,7 @@ end:
 
 static
 int save_ust_session(struct config_writer *writer,
-	struct ltt_session *session, int save_jul)
+	struct ltt_session *session, int save_agent)
 {
 	int ret;
 	struct ltt_ust_channel *ust_chan;
@@ -1001,7 +1023,7 @@ int save_ust_session(struct config_writer *writer,
 	assert(session);
 
 	ret = config_writer_write_element_string(writer, config_element_type,
-			save_jul ? config_domain_type_jul : config_domain_type_ust);
+			save_agent ? config_domain_type_jul : config_domain_type_ust);
 	if (ret) {
 		ret = LTTNG_ERR_SAVE_IO_FAIL;
 		goto end;
@@ -1031,11 +1053,11 @@ int save_ust_session(struct config_writer *writer,
 	rcu_read_lock();
 	cds_lfht_for_each_entry(session->ust_session->domain_global.channels->ht,
 			&iter.iter, node, node) {
-		int jul_channel;
+		int agent_channel;
 
 		ust_chan = caa_container_of(node, struct ltt_ust_channel, node);
-		jul_channel = !strcmp(DEFAULT_JUL_CHANNEL_NAME, ust_chan->name);
-		if (!(save_jul ^ jul_channel)) {
+		agent_channel = !strcmp(DEFAULT_JUL_CHANNEL_NAME, ust_chan->name);
+		if (!(save_agent ^ agent_channel)) {
 			ret = save_ust_channel(writer, ust_chan, session->ust_session);
 			if (ret) {
 				rcu_read_unlock();
@@ -1117,7 +1139,7 @@ int save_domains(struct config_writer *writer, struct ltt_session *session)
 	}
 
 	if (session->ust_session &&
-		session->ust_session->domain_jul.being_used) {
+		session->ust_session->agent.being_used) {
 		ret = config_writer_open_element(writer,
 			config_element_domain);
 		if (ret) {
@@ -1544,7 +1566,7 @@ int save_session(struct ltt_session *session,
 				goto end;
 			}
 		} else {
-			ret = config_writer_write_element_signed_int(writer,
+			ret = config_writer_write_element_unsigned_int(writer,
 					config_element_live_timer_interval, session->live_timer);
 			if (ret) {
 				ret = LTTNG_ERR_SAVE_IO_FAIL;