X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=91d870493c9052eef6129c0a0396de9c8cf68ad8;hb=4479f682c1c878a565e5ccd0dbdaff098a3cb3e6;hp=b3b7ee427268ff6d24169a037b44eab134eddef9;hpb=c4e361a4de07eef209c85d79e734cfb0f94e006d;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index b3b7ee427..91d870493 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -868,6 +868,17 @@ int viewer_get_new_streams(struct relay_connection *conn)
 	nb_streams = nb_created + nb_unsent;
 	response.streams_count = htobe32(nb_streams);
 
+	/*
+	 * If the session is closed and we have no new streams to send,
+	 * it means that the viewer has already received the whole trace
+	 * for this session and should now close it.
+	 */
+	if (nb_streams == 0 && session->close_flag) {
+		send_streams = 0;
+		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_HUP);
+		goto send_reply;
+	}
+
 send_reply:
 	health_code_update();
 	ret = send_response(conn->sock, &response, sizeof(response));
@@ -926,6 +937,12 @@ int viewer_attach_session(struct relay_connection *conn)
 
 	health_code_update();
 
+	if (!conn->viewer_session) {
+		DBG("Client trying to attach before creating a live viewer session");
+		response.status = htobe32(LTTNG_VIEWER_ATTACH_NO_SESSION);
+		goto send_reply;
+	}
+
 	rcu_read_lock();
 	session = session_find_by_id(conn->sessions_ht,
 			be64toh(request.session_id));
@@ -1491,6 +1508,42 @@ end:
 	return ret;
 }
 
+/*
+ * Create a viewer session.
+ *
+ * Return 0 on success or else a negative value.
+ */
+static
+int viewer_create_session(struct relay_connection *conn)
+{
+	int ret;
+	struct lttng_viewer_create_session_response resp;
+
+	DBG("Viewer create session received");
+
+	resp.status = htobe32(LTTNG_VIEWER_CREATE_SESSION_OK);
+	conn->viewer_session = zmalloc(sizeof(conn->viewer_session));
+	if (!conn->viewer_session) {
+		ERR("Allocation viewer session");
+		resp.status = htobe32(LTTNG_VIEWER_CREATE_SESSION_ERR);
+		goto send_reply;
+	}
+	CDS_INIT_LIST_HEAD(&conn->viewer_session->sessions_head);
+
+send_reply:
+	health_code_update();
+	ret = send_response(conn->sock, &resp, sizeof(resp));
+	if (ret < 0) {
+		goto end;
+	}
+	health_code_update();
+	ret = 0;
+
+end:
+	return ret;
+}
+
+
 /*
  * live_relay_unknown_command: send -1 if received unknown command
  */
@@ -1550,6 +1603,9 @@ int process_control(struct lttng_viewer_cmd *recv_hdr,
 	case LTTNG_VIEWER_GET_NEW_STREAMS:
 		ret = viewer_get_new_streams(conn);
 		break;
+	case LTTNG_VIEWER_CREATE_SESSION:
+		ret = viewer_create_session(conn);
+		break;
 	default:
 		ERR("Received unknown viewer command (%u)", be32toh(recv_hdr->cmd));
 		live_relay_unknown_command(conn);