X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=a117a1f1cfc8dd12cd02049455dbe82384825e04;hb=868e733e4078dc417c58039003ee8744059b7727;hp=746f21e456f663b02cd7b8f5a00d913788d3cbd9;hpb=f45e313daba4dc617f3036ca0ce0e6de305a4ba5;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 746f21e45..a117a1f1c 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -390,6 +390,51 @@ static void stop_threads(void)
 	futex_nto1_wake(&ust_cmd_queue.futex);
 }
 
+/*
+ * Close every consumer sockets.
+ */
+static void close_consumer_sockets(void)
+{
+	int ret;
+
+	if (kconsumer_data.err_sock >= 0) {
+		ret = close(kconsumer_data.err_sock);
+		if (ret < 0) {
+			PERROR("kernel consumer err_sock close");
+		}
+	}
+	if (ustconsumer32_data.err_sock >= 0) {
+		ret = close(ustconsumer32_data.err_sock);
+		if (ret < 0) {
+			PERROR("UST consumer32 err_sock close");
+		}
+	}
+	if (ustconsumer64_data.err_sock >= 0) {
+		ret = close(ustconsumer64_data.err_sock);
+		if (ret < 0) {
+			PERROR("UST consumer64 err_sock close");
+		}
+	}
+	if (kconsumer_data.cmd_sock >= 0) {
+		ret = close(kconsumer_data.cmd_sock);
+		if (ret < 0) {
+			PERROR("kernel consumer cmd_sock close");
+		}
+	}
+	if (ustconsumer32_data.cmd_sock >= 0) {
+		ret = close(ustconsumer32_data.cmd_sock);
+		if (ret < 0) {
+			PERROR("UST consumer32 cmd_sock close");
+		}
+	}
+	if (ustconsumer64_data.cmd_sock >= 0) {
+		ret = close(ustconsumer64_data.cmd_sock);
+		if (ret < 0) {
+			PERROR("UST consumer64 cmd_sock close");
+		}
+	}
+}
+
 /*
  * Cleanup the daemon
  */
@@ -458,6 +503,8 @@ static void cleanup(void)
 		modprobe_remove_lttng_all();
 	}
 
+	close_consumer_sockets();
+
 	/* <fun> */
 	DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
 			"Matthew, BEET driven development works!%c[%dm",
@@ -646,7 +693,8 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 
 						pthread_mutex_lock(socket->lock);
 						ret = kernel_consumer_send_channel_stream(socket,
-								channel, ksess);
+								channel, ksess,
+								session->output_traces ? 1 : 0);
 						pthread_mutex_unlock(socket->lock);
 						if (ret < 0) {
 							rcu_read_unlock();
@@ -2377,6 +2425,7 @@ static int create_ust_session(struct ltt_session *session,
 
 	lus->uid = session->uid;
 	lus->gid = session->gid;
+	lus->output_traces = session->output_traces;
 	session->ust_session = lus;
 
 	/* Copy session output to the newly created UST session */
@@ -2433,6 +2482,7 @@ static int create_kernel_session(struct ltt_session *session)
 
 	session->kernel_session->uid = session->uid;
 	session->kernel_session->gid = session->gid;
+	session->kernel_session->output_traces = session->output_traces;
 
 	return LTTNG_OK;
 
@@ -2494,6 +2544,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_START_TRACE:
 	case LTTNG_STOP_TRACE:
 	case LTTNG_DATA_PENDING:
+	case LTTNG_SNAPSHOT_ADD_OUTPUT:
+	case LTTNG_SNAPSHOT_DEL_OUTPUT:
+	case LTTNG_SNAPSHOT_LIST_OUTPUT:
+	case LTTNG_SNAPSHOT_RECORD:
 		need_domain = 0;
 		break;
 	default:
@@ -2562,12 +2616,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 		session_lock_list();
 		cmd_ctx->session = session_find_by_name(cmd_ctx->lsm->session.name);
 		if (cmd_ctx->session == NULL) {
-			if (cmd_ctx->lsm->session.name != NULL) {
-				ret = LTTNG_ERR_SESS_NOT_FOUND;
-			} else {
-				/* If no session name specified */
-				ret = LTTNG_ERR_SELECT_SESS;
-			}
+			ret = LTTNG_ERR_SESS_NOT_FOUND;
 			goto error;
 		} else {
 			/* Acquire lock for the session */
@@ -3181,6 +3230,67 @@ skip_domain:
 		ret = cmd_data_pending(cmd_ctx->session);
 		break;
 	}
+	case LTTNG_SNAPSHOT_ADD_OUTPUT:
+	{
+		struct lttcomm_lttng_output_id reply;
+
+		ret = cmd_snapshot_add_output(cmd_ctx->session,
+				&cmd_ctx->lsm->u.snapshot_output.output, &reply.id);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		ret = setup_lttng_msg(cmd_ctx, sizeof(reply));
+		if (ret < 0) {
+			goto setup_error;
+		}
+
+		/* Copy output list into message payload */
+		memcpy(cmd_ctx->llm->payload, &reply, sizeof(reply));
+		ret = LTTNG_OK;
+		break;
+	}
+	case LTTNG_SNAPSHOT_DEL_OUTPUT:
+	{
+		ret = cmd_snapshot_del_output(cmd_ctx->session,
+				&cmd_ctx->lsm->u.snapshot_output.output);
+		break;
+	}
+	case LTTNG_SNAPSHOT_LIST_OUTPUT:
+	{
+		ssize_t nb_output;
+		struct lttng_snapshot_output *outputs = NULL;
+
+		nb_output = cmd_snapshot_list_outputs(cmd_ctx->session, &outputs);
+		if (nb_output < 0) {
+			ret = -nb_output;
+			goto error;
+		}
+
+		ret = setup_lttng_msg(cmd_ctx,
+				nb_output * sizeof(struct lttng_snapshot_output));
+		if (ret < 0) {
+			free(outputs);
+			goto setup_error;
+		}
+
+		if (outputs) {
+			/* Copy output list into message payload */
+			memcpy(cmd_ctx->llm->payload, outputs,
+					nb_output * sizeof(struct lttng_snapshot_output));
+			free(outputs);
+		}
+
+		ret = LTTNG_OK;
+		break;
+	}
+	case LTTNG_SNAPSHOT_RECORD:
+	{
+		ret = cmd_snapshot_record(cmd_ctx->session,
+				&cmd_ctx->lsm->u.snapshot_record.output,
+				cmd_ctx->lsm->u.snapshot_record.wait);
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UND;
 		break;
@@ -4261,7 +4371,7 @@ int main(int argc, char **argv)
 		DBG2("Kernel consumer cmd path: %s",
 				kconsumer_data.cmd_unix_sock_path);
 	} else {
-		home_path = get_home_dir();
+		home_path = utils_get_home_dir();
 		if (home_path == NULL) {
 			/* TODO: Add --socket PATH option */
 			ERR("Can't get HOME directory for sockets creation.");