X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=8c716dbde9852e1de1b9a04261fb59c22035e767;hp=23cf09eebb6960b0e5436900ffa6e2250529d9cc;hb=528f2ffaebbc88b3fd541fa404b567b878aa5255;hpb=58eb9381cd933f0644e6a5b89750dbd6d9b14570 diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c index 23cf09eeb..8c716dbde 100644 --- a/src/bin/lttng-relayd/live.c +++ b/src/bin/lttng-relayd/live.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -153,32 +154,33 @@ ssize_t send_response(struct lttcomm_sock *sock, void *buf, size_t size) } /* - * Atomically check if new streams got added in the session since the last - * check and reset the flag to 0. + * Atomically check if new streams got added in one of the sessions attached + * and reset the flag to 0. * * Returns 1 if new streams got added, 0 if nothing changed, a negative value * on error. */ static -int check_new_streams(uint64_t session_id, struct lttng_ht *sessions_ht) +int check_new_streams(struct relay_connection *conn) { - int ret; - unsigned long current_val; struct relay_session *session; + unsigned long current_val; + int ret = 0; - assert(sessions_ht); - - session = session_find_by_id(sessions_ht, session_id); - if (!session) { - DBG("Relay session %" PRIu64 " not found", session_id); - ret = -1; - goto error; + if (!conn->viewer_session) { + goto end; + } + cds_list_for_each_entry(session, + &conn->viewer_session->sessions_head, + viewer_session_list) { + current_val = uatomic_cmpxchg(&session->new_streams, 1, 0); + ret = current_val; + if (ret == 1) { + goto end; + } } - current_val = uatomic_cmpxchg(&session->new_streams, 1, 0); - ret = current_val; - -error: +end: return ret; } @@ -349,7 +351,7 @@ void stop_threads(void) /* Stopping all threads */ DBG("Terminating all live threads"); - ret = notify_thread_pipe(live_conn_pipe[1]); + ret = notify_thread_pipe(thread_quit_pipe[1]); if (ret < 0) { ERR("write error on thread quit pipe"); } @@ -378,7 +380,7 @@ int create_thread_poll_set(struct lttng_poll_event *events, int size) } /* Add quit pipe */ - ret = lttng_poll_add(events, live_conn_pipe[0], LPOLLIN | LPOLLERR); + ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR); if (ret < 0) { goto error; } @@ -395,9 +397,9 @@ error: * Return 1 if it was triggered else 0; */ static -int check_live_conn_pipe(int fd, uint32_t events) +int check_thread_quit_pipe(int fd, uint32_t events) { - if (fd == live_conn_pipe[0] && (events & LPOLLIN)) { + if (fd == thread_quit_pipe[0] && (events & LPOLLIN)) { return 1; } @@ -514,7 +516,7 @@ restart: pollfd = LTTNG_POLL_GETFD(&events, i); /* Thread quit pipe has been closed. Killing thread. */ - ret = check_live_conn_pipe(pollfd, revents); + ret = check_thread_quit_pipe(pollfd, revents); if (ret) { err = 0; goto exit; @@ -693,6 +695,7 @@ int viewer_connect(struct relay_connection *conn) health_code_update(); + memset(&reply, 0, sizeof(reply)); reply.major = RELAYD_VERSION_COMM_MAJOR; reply.minor = RELAYD_VERSION_COMM_MINOR; @@ -712,9 +715,9 @@ int viewer_connect(struct relay_connection *conn) conn->minor = be32toh(msg.minor); } - if (be32toh(msg.type) == VIEWER_CLIENT_COMMAND) { + if (be32toh(msg.type) == LTTNG_VIEWER_CLIENT_COMMAND) { conn->type = RELAY_VIEWER_COMMAND; - } else if (be32toh(msg.type) == VIEWER_CLIENT_NOTIFICATION) { + } else if (be32toh(msg.type) == LTTNG_VIEWER_CLIENT_NOTIFICATION) { conn->type = RELAY_VIEWER_NOTIFICATION; } else { ERR("Unknown connection type : %u", be32toh(msg.type)); @@ -809,6 +812,98 @@ end: return ret; } +/* + * Check if a connection is attached to a session. + * Return 1 if attached, 0 if not attached, a negative value on error. + */ +static +int session_attached(struct relay_connection *conn, uint64_t session_id) +{ + struct relay_session *session; + int found = 0; + + if (!conn->viewer_session) { + goto end; + } + cds_list_for_each_entry(session, + &conn->viewer_session->sessions_head, + viewer_session_list) { + if (session->id == session_id) { + found = 1; + goto end; + } + } + +end: + return found; +} + +/* + * Delete all streams for a specific session ID. + */ +static void destroy_viewer_streams_by_session(struct relay_session *session) +{ + struct relay_viewer_stream *stream; + struct lttng_ht_iter iter; + + assert(session); + + rcu_read_lock(); + cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter, stream, + stream_n.node) { + struct ctf_trace *ctf_trace; + + health_code_update(); + if (stream->session_id != session->id) { + continue; + } + + ctf_trace = ctf_trace_find_by_path(session->ctf_traces_ht, + stream->path_name); + assert(ctf_trace); + + viewer_stream_delete(stream); + + if (stream->metadata_flag) { + ctf_trace->metadata_sent = 0; + ctf_trace->viewer_metadata_stream = NULL; + } + + viewer_stream_destroy(ctf_trace, stream); + } + rcu_read_unlock(); +} + +static void try_destroy_streams(struct relay_session *session) +{ + struct ctf_trace *ctf_trace; + struct lttng_ht_iter iter; + + assert(session); + + cds_lfht_for_each_entry(session->ctf_traces_ht->ht, &iter.iter, ctf_trace, + node.node) { + /* Attempt to destroy the ctf trace of that session. */ + ctf_trace_try_destroy(session, ctf_trace); + } +} + +/* + * Cleanup a session. + */ +static void cleanup_session(struct relay_connection *conn, + struct relay_session *session) +{ + /* + * Very important that this is done before destroying the session so we + * can put back every viewer stream reference from the ctf_trace. + */ + destroy_viewer_streams_by_session(session); + try_destroy_streams(session); + cds_list_del(&session->viewer_session_list); + session_viewer_try_destroy(conn->sessions_ht, session); +} + /* * Send the viewer the list of current sessions. */ @@ -820,6 +915,7 @@ int viewer_get_new_streams(struct relay_connection *conn) struct lttng_viewer_new_streams_request request; struct lttng_viewer_new_streams_response response; struct relay_session *session; + uint64_t session_id; assert(conn); @@ -832,34 +928,30 @@ int viewer_get_new_streams(struct relay_connection *conn) if (ret < 0) { goto error; } + session_id = be64toh(request.session_id); health_code_update(); + memset(&response, 0, sizeof(response)); + rcu_read_lock(); - session = session_find_by_id(conn->sessions_ht, - be64toh(request.session_id)); + session = session_find_by_id(conn->sessions_ht, session_id); if (!session) { - DBG("Relay session %" PRIu64 " not found", - be64toh(request.session_id)); - response.status = htobe32(VIEWER_NEW_STREAMS_ERR); + DBG("Relay session %" PRIu64 " not found", session_id); + response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_ERR); goto send_reply; } - if (conn->session_id == session->id) { - /* We confirmed the viewer is asking for the same session. */ - send_streams = 1; - response.status = htobe32(VIEWER_NEW_STREAMS_OK); - } else { + if (!session_attached(conn, session_id)) { send_streams = 0; - response.status = htobe32(VIEWER_NEW_STREAMS_ERR); + response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_ERR); goto send_reply; } - if (!send_streams) { - goto send_reply; - } + send_streams = 1; + response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_OK); - ret = make_viewer_streams(session, VIEWER_SEEK_LAST, NULL, &nb_unsent, + ret = make_viewer_streams(session, LTTNG_VIEWER_SEEK_LAST, NULL, &nb_unsent, &nb_created); if (ret < 0) { goto end_unlock; @@ -868,6 +960,23 @@ 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); + /* + * Remove the session from the attached list of the connection + * and try to destroy it. + */ + cds_list_del(&session->viewer_session_list); + cleanup_session(conn, session); + goto send_reply; + } + send_reply: health_code_update(); ret = send_response(conn->sock, &response, sizeof(response)); @@ -926,13 +1035,21 @@ int viewer_attach_session(struct relay_connection *conn) health_code_update(); + memset(&response, 0, sizeof(response)); + + 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)); if (!session) { DBG("Relay session %" PRIu64 " not found", be64toh(request.session_id)); - response.status = htobe32(VIEWER_ATTACH_UNK); + response.status = htobe32(LTTNG_VIEWER_ATTACH_UNK); goto send_reply; } session_viewer_attach(session); @@ -940,36 +1057,32 @@ int viewer_attach_session(struct relay_connection *conn) if (uatomic_read(&session->viewer_refcount) > 1) { DBG("Already a viewer attached"); - response.status = htobe32(VIEWER_ATTACH_ALREADY); + response.status = htobe32(LTTNG_VIEWER_ATTACH_ALREADY); session_viewer_detach(session); goto send_reply; } else if (session->live_timer == 0) { DBG("Not live session"); - response.status = htobe32(VIEWER_ATTACH_NOT_LIVE); + response.status = htobe32(LTTNG_VIEWER_ATTACH_NOT_LIVE); goto send_reply; } else { send_streams = 1; - response.status = htobe32(VIEWER_ATTACH_OK); - conn->session_id = session->id; - conn->session = session; + response.status = htobe32(LTTNG_VIEWER_ATTACH_OK); + cds_list_add(&session->viewer_session_list, + &conn->viewer_session->sessions_head); } switch (be32toh(request.seek)) { - case VIEWER_SEEK_BEGINNING: - case VIEWER_SEEK_LAST: + case LTTNG_VIEWER_SEEK_BEGINNING: + case LTTNG_VIEWER_SEEK_LAST: seek_type = be32toh(request.seek); break; default: ERR("Wrong seek parameter"); - response.status = htobe32(VIEWER_ATTACH_SEEK_ERR); + response.status = htobe32(LTTNG_VIEWER_ATTACH_SEEK_ERR); send_streams = 0; goto send_reply; } - if (!send_streams) { - goto send_reply; - } - ret = make_viewer_streams(session, seek_type, &nb_streams, NULL, NULL); if (ret < 0) { goto end_unlock; @@ -1005,6 +1118,129 @@ error: return ret; } +/* + * Open the index file if needed for the given vstream. + * + * If an index file is successfully opened, the index_read_fd of the stream is + * set with it. + * + * Return 0 on success, a negative value on error (-ENOENT if not ready yet). + */ +static int try_open_index(struct relay_viewer_stream *vstream, + struct relay_stream *rstream) +{ + int ret = 0; + + assert(vstream); + assert(rstream); + + if (vstream->index_read_fd >= 0) { + goto end; + } + + /* + * First time, we open the index file and at least one index is ready. The + * race between the read and write of the total_index_received is + * acceptable here since the client will be notified to simply come back + * and get the next index. + */ + if (rstream->total_index_received <= 0) { + ret = -ENOENT; + goto end; + } + ret = index_open(vstream->path_name, vstream->channel_name, + vstream->tracefile_count, vstream->tracefile_count_current); + if (ret >= 0) { + vstream->index_read_fd = ret; + ret = 0; + goto end; + } + +end: + return ret; +} + +/* + * Check the status of the index for the given stream. This function updates + * the index structure if needed and can destroy the vstream also for the HUP + * situation. + * + * Return 0 means that we can proceed with the index. A value of 1 means that + * the index has been updated and is ready to be send to the client. A negative + * value indicates an error that can't be handled. + */ +static int check_index_status(struct relay_viewer_stream *vstream, + struct relay_stream *rstream, struct ctf_trace *trace, + struct lttng_viewer_index *index) +{ + int ret; + + assert(vstream); + assert(rstream); + assert(index); + assert(trace); + + if (!rstream->close_flag) { + /* Rotate on abort (overwrite). */ + if (vstream->abort_flag) { + DBG("Viewer stream %" PRIu64 " rotate because of overwrite", + vstream->stream_handle); + ret = viewer_stream_rotate(vstream, rstream); + if (ret < 0) { + goto error; + } else if (ret == 1) { + /* EOF */ + index->status = htobe32(LTTNG_VIEWER_INDEX_HUP); + goto hup; + } + /* ret == 0 means successful so we continue. */ + } + + /* Check if we are in the same trace file at this point. */ + if (rstream->tracefile_count_current == vstream->tracefile_count_current) { + if (rstream->beacon_ts_end != -1ULL && + vstream->last_sent_index == rstream->total_index_received) { + /* + * We've received a synchronization beacon and the last index + * available has been sent, the index for now is inactive. + */ + index->status = htobe32(LTTNG_VIEWER_INDEX_INACTIVE); + index->timestamp_end = htobe64(rstream->beacon_ts_end); + index->stream_id = htobe64(rstream->ctf_stream_id); + goto index_ready; + } else if (rstream->total_index_received <= vstream->last_sent_index + && !vstream->close_write_flag) { + /* + * Reader and writer are working in the same tracefile, so we care + * about the number of index received and sent. Otherwise, we read + * up to EOF. + */ + index->status = htobe32(LTTNG_VIEWER_INDEX_RETRY); + goto index_ready; + } + } + /* Nothing to do with the index, continue with it. */ + ret = 0; + } else if (rstream->close_flag && vstream->close_write_flag && + vstream->total_index_received == vstream->last_sent_index) { + /* Last index sent and current tracefile closed in write */ + index->status = htobe32(LTTNG_VIEWER_INDEX_HUP); + goto hup; + } else { + vstream->close_write_flag = 1; + ret = 0; + } + +error: + return ret; + +hup: + viewer_stream_delete(vstream); + viewer_stream_destroy(trace, vstream); +index_ready: + return 1; +} + /* * Send the next index for a stream. * @@ -1014,6 +1250,7 @@ static int viewer_get_next_index(struct relay_connection *conn) { int ret; + ssize_t read_ret; struct lttng_viewer_get_next_index request_index; struct lttng_viewer_index viewer_index; struct ctf_packet_index packet_index; @@ -1035,14 +1272,14 @@ int viewer_get_next_index(struct relay_connection *conn) health_code_update(); rcu_read_lock(); - session = session_find_by_id(conn->sessions_ht, conn->session_id); - if (!session) { + vstream = viewer_stream_find_by_id(be64toh(request_index.stream_id)); + if (!vstream) { ret = -1; goto end_unlock; } - vstream = viewer_stream_find_by_id(be64toh(request_index.stream_id)); - if (!vstream) { + session = session_find_by_id(conn->sessions_ht, vstream->session_id); + if (!session) { ret = -1; goto end_unlock; } @@ -1056,137 +1293,106 @@ int viewer_get_next_index(struct relay_connection *conn) * The viewer should not ask for index on metadata stream. */ if (vstream->metadata_flag) { - viewer_index.status = htobe32(VIEWER_INDEX_HUP); + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_HUP); goto send_reply; } - /* First time, we open the index file */ - if (vstream->index_read_fd < 0) { - ret = index_open(vstream->path_name, vstream->channel_name, - vstream->tracefile_count, vstream->tracefile_count_current); + rstream = stream_find_by_id(relay_streams_ht, vstream->stream_handle); + assert(rstream); + + /* Try to open an index if one is needed for that stream. */ + ret = try_open_index(vstream, rstream); + if (ret < 0) { if (ret == -ENOENT) { /* * The index is created only when the first data packet arrives, it * might not be ready at the beginning of the session */ - viewer_index.status = htobe32(VIEWER_INDEX_RETRY); - goto send_reply; - } else if (ret < 0) { - viewer_index.status = htobe32(VIEWER_INDEX_ERR); - goto send_reply; + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_RETRY); + } else { + /* Unhandled error. */ + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR); } - vstream->index_read_fd = ret; + goto send_reply; } - rstream = stream_find_by_id(relay_streams_ht, vstream->stream_handle); - assert(rstream); - - if (!rstream->close_flag) { - if (vstream->abort_flag) { - /* Rotate on abort (overwrite). */ - DBG("Viewer rotate because of overwrite"); - ret = viewer_stream_rotate(vstream, rstream); - if (ret < 0) { - goto end_unlock; - } else if (ret == 1) { - viewer_index.status = htobe32(VIEWER_INDEX_HUP); - viewer_stream_delete(vstream); - viewer_stream_destroy(ctf_trace, vstream); - goto send_reply; - } - /* ret == 0 means successful so we continue. */ - } - - pthread_mutex_lock(&rstream->viewer_stream_rotation_lock); - if (rstream->tracefile_count_current == vstream->tracefile_count_current) { - if (rstream->beacon_ts_end != -1ULL && - vstream->last_sent_index == rstream->total_index_received) { - viewer_index.status = htobe32(VIEWER_INDEX_INACTIVE); - viewer_index.timestamp_end = htobe64(rstream->beacon_ts_end); - pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); - goto send_reply; - } else if (rstream->total_index_received <= vstream->last_sent_index - && !vstream->close_write_flag) { - /* - * Reader and writer are working in the same tracefile, so we care - * about the number of index received and sent. Otherwise, we read - * up to EOF. - */ - pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); - /* No new index to send, retry later. */ - viewer_index.status = htobe32(VIEWER_INDEX_RETRY); - goto send_reply; - } - } - pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); - } else if (rstream->close_flag && vstream->close_write_flag && - vstream->total_index_received == vstream->last_sent_index) { - /* Last index sent and current tracefile closed in write */ - viewer_index.status = htobe32(VIEWER_INDEX_HUP); - viewer_stream_delete(vstream); - viewer_stream_destroy(ctf_trace, vstream); + pthread_mutex_lock(&rstream->viewer_stream_rotation_lock); + ret = check_index_status(vstream, rstream, ctf_trace, &viewer_index); + pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); + if (ret < 0) { + goto end; + } else if (ret == 1) { + /* + * This means the viewer index data structure has been populated by the + * check call thus we now send back the reply to the client. + */ goto send_reply; - } else { - vstream->close_write_flag = 1; } + /* At this point, ret MUST be 0 thus we continue with the get. */ + assert(!ret); if (!ctf_trace->metadata_received || ctf_trace->metadata_received > ctf_trace->metadata_sent) { viewer_index.flags |= LTTNG_VIEWER_FLAG_NEW_METADATA; } - ret = check_new_streams(vstream->session_id, conn->sessions_ht); + ret = check_new_streams(conn); if (ret < 0) { goto end_unlock; } else if (ret == 1) { viewer_index.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM; } + pthread_mutex_lock(&rstream->viewer_stream_rotation_lock); pthread_mutex_lock(&vstream->overwrite_lock); if (vstream->abort_flag) { - /* - * The file is being overwritten by the writer, we cannot * use it. - */ - viewer_index.status = htobe32(VIEWER_INDEX_RETRY); + /* The file is being overwritten by the writer, we cannot use it. */ pthread_mutex_unlock(&vstream->overwrite_lock); ret = viewer_stream_rotate(vstream, rstream); + pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); if (ret < 0) { goto end_unlock; } else if (ret == 1) { - viewer_index.status = htobe32(VIEWER_INDEX_HUP); + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_HUP); viewer_stream_delete(vstream); viewer_stream_destroy(ctf_trace, vstream); - goto send_reply; + } else { + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_RETRY); } goto send_reply; } - ret = lttng_read(vstream->index_read_fd, &packet_index, + read_ret = lttng_read(vstream->index_read_fd, &packet_index, sizeof(packet_index)); pthread_mutex_unlock(&vstream->overwrite_lock); - if (ret < sizeof(packet_index)) { - /* - * The tracefile is closed in write, so we read up to EOF. - */ - if (vstream->close_write_flag == 1) { - viewer_index.status = htobe32(VIEWER_INDEX_RETRY); - /* Rotate on normal EOF */ + pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); + if (read_ret < 0) { + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_HUP); + viewer_stream_delete(vstream); + viewer_stream_destroy(ctf_trace, vstream); + goto send_reply; + } else if (read_ret < sizeof(packet_index)) { + pthread_mutex_lock(&rstream->viewer_stream_rotation_lock); + if (vstream->close_write_flag) { ret = viewer_stream_rotate(vstream, rstream); if (ret < 0) { + pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); goto end_unlock; } else if (ret == 1) { - viewer_index.status = htobe32(VIEWER_INDEX_HUP); + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_HUP); viewer_stream_delete(vstream); viewer_stream_destroy(ctf_trace, vstream); - goto send_reply; + } else { + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_RETRY); } } else { - PERROR("Relay reading index file %d", vstream->index_read_fd); - viewer_index.status = htobe32(VIEWER_INDEX_ERR); + ERR("Relay reading index file %d", vstream->index_read_fd); + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR); } + pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock); goto send_reply; } else { - viewer_index.status = htobe32(VIEWER_INDEX_OK); + viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_OK); vstream->last_sent_index++; } @@ -1236,6 +1442,7 @@ int viewer_get_packet(struct relay_connection *conn) struct lttng_viewer_get_packet get_packet_info; struct lttng_viewer_trace_packet reply; struct relay_viewer_stream *stream; + struct relay_session *session; struct ctf_trace *ctf_trace; assert(conn); @@ -1259,7 +1466,13 @@ int viewer_get_packet(struct relay_connection *conn) goto error; } - ctf_trace = ctf_trace_find_by_path(conn->session->ctf_traces_ht, + session = session_find_by_id(conn->sessions_ht, stream->session_id); + if (!session) { + ret = -1; + goto error; + } + + ctf_trace = ctf_trace_find_by_path(session->ctf_traces_ht, stream->path_name); assert(ctf_trace); @@ -1292,16 +1505,16 @@ int viewer_get_packet(struct relay_connection *conn) if (!ctf_trace->metadata_received || ctf_trace->metadata_received > ctf_trace->metadata_sent) { - reply.status = htobe32(VIEWER_GET_PACKET_ERR); + reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR); reply.flags |= LTTNG_VIEWER_FLAG_NEW_METADATA; goto send_reply; } - ret = check_new_streams(stream->session_id, conn->sessions_ht); + ret = check_new_streams(conn); if (ret < 0) { goto end_unlock; } else if (ret == 1) { - reply.status = htobe32(VIEWER_GET_PACKET_ERR); + reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR); reply.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM; goto send_reply; } @@ -1323,7 +1536,7 @@ int viewer_get_packet(struct relay_connection *conn) PERROR("lseek"); goto error; } - reply.status = htobe32(VIEWER_GET_PACKET_EOF); + reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_EOF); goto send_reply; } read_len = lttng_read(stream->read_fd, data, len); @@ -1338,17 +1551,17 @@ int viewer_get_packet(struct relay_connection *conn) be64toh(get_packet_info.offset)); goto error; } else { - reply.status = htobe32(VIEWER_GET_PACKET_EOF); + reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_EOF); goto send_reply; } } - reply.status = htobe32(VIEWER_GET_PACKET_OK); + reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_OK); reply.len = htobe32(len); send_data = 1; goto send_reply; error: - reply.status = htobe32(VIEWER_GET_PACKET_ERR); + reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR); send_reply: reply.flags = htobe32(reply.flags); @@ -1397,6 +1610,7 @@ int viewer_get_metadata(struct relay_connection *conn) struct lttng_viewer_metadata_packet reply; struct relay_viewer_stream *stream; struct ctf_trace *ctf_trace; + struct relay_session *session; assert(conn); @@ -1410,6 +1624,8 @@ int viewer_get_metadata(struct relay_connection *conn) } health_code_update(); + memset(&reply, 0, sizeof(reply)); + rcu_read_lock(); stream = viewer_stream_find_by_id(be64toh(request.stream_id)); if (!stream || !stream->metadata_flag) { @@ -1417,14 +1633,20 @@ int viewer_get_metadata(struct relay_connection *conn) goto error; } - ctf_trace = ctf_trace_find_by_path(conn->session->ctf_traces_ht, + session = session_find_by_id(conn->sessions_ht, stream->session_id); + if (!session) { + ret = -1; + goto error; + } + + ctf_trace = ctf_trace_find_by_path(session->ctf_traces_ht, stream->path_name); assert(ctf_trace); assert(ctf_trace->metadata_sent <= ctf_trace->metadata_received); len = ctf_trace->metadata_received - ctf_trace->metadata_sent; if (len == 0) { - reply.status = htobe32(VIEWER_NO_NEW_METADATA); + reply.status = htobe32(LTTNG_VIEWER_NO_NEW_METADATA); goto send_reply; } @@ -1458,11 +1680,11 @@ int viewer_get_metadata(struct relay_connection *conn) goto error; } ctf_trace->metadata_sent += read_len; - reply.status = htobe32(VIEWER_METADATA_OK); + reply.status = htobe32(LTTNG_VIEWER_METADATA_OK); goto send_reply; error: - reply.status = htobe32(VIEWER_METADATA_ERR); + reply.status = htobe32(LTTNG_VIEWER_METADATA_ERR); send_reply: health_code_update(); @@ -1491,6 +1713,43 @@ 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"); + + memset(&resp, 0, sizeof(resp)); + 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 */ @@ -1499,6 +1758,7 @@ void live_relay_unknown_command(struct relay_connection *conn) { struct lttcomm_relayd_generic_reply reply; + memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(LTTNG_ERR_UNK); (void) send_response(conn->sock, &reply, sizeof(reply)); } @@ -1522,34 +1782,37 @@ int process_control(struct lttng_viewer_cmd *recv_hdr, * Make sure we've done the version check before any command other then a * new client connection. */ - if (msg_value != VIEWER_CONNECT && !conn->version_check_done) { + if (msg_value != LTTNG_VIEWER_CONNECT && !conn->version_check_done) { ERR("Viewer conn value %" PRIu32 " before version check", msg_value); ret = -1; goto end; } switch (msg_value) { - case VIEWER_CONNECT: + case LTTNG_VIEWER_CONNECT: ret = viewer_connect(conn); break; - case VIEWER_LIST_SESSIONS: + case LTTNG_VIEWER_LIST_SESSIONS: ret = viewer_list_sessions(conn); break; - case VIEWER_ATTACH_SESSION: + case LTTNG_VIEWER_ATTACH_SESSION: ret = viewer_attach_session(conn); break; - case VIEWER_GET_NEXT_INDEX: + case LTTNG_VIEWER_GET_NEXT_INDEX: ret = viewer_get_next_index(conn); break; - case VIEWER_GET_PACKET: + case LTTNG_VIEWER_GET_PACKET: ret = viewer_get_packet(conn); break; - case VIEWER_GET_METADATA: + case LTTNG_VIEWER_GET_METADATA: ret = viewer_get_metadata(conn); break; - case VIEWER_GET_NEW_STREAMS: + 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); @@ -1576,56 +1839,6 @@ void cleanup_connection_pollfd(struct lttng_poll_event *events, int pollfd) } } -/* - * Delete all streams for a specific session ID. - */ -static void destroy_viewer_streams_by_session(struct relay_session *session) -{ - struct relay_viewer_stream *stream; - struct lttng_ht_iter iter; - - assert(session); - - rcu_read_lock(); - cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter, stream, - stream_n.node) { - struct ctf_trace *ctf_trace; - - health_code_update(); - if (stream->session_id != session->id) { - continue; - } - - ctf_trace = ctf_trace_find_by_path(session->ctf_traces_ht, - stream->path_name); - assert(ctf_trace); - - viewer_stream_delete(stream); - - if (stream->metadata_flag) { - ctf_trace->metadata_sent = 0; - ctf_trace->viewer_metadata_stream = NULL; - } - - viewer_stream_destroy(ctf_trace, stream); - } - rcu_read_unlock(); -} - -static void try_destroy_streams(struct relay_session *session) -{ - struct ctf_trace *ctf_trace; - struct lttng_ht_iter iter; - - assert(session); - - cds_lfht_for_each_entry(session->ctf_traces_ht->ht, &iter.iter, ctf_trace, - node.node) { - /* Attempt to destroy the ctf trace of that session. */ - ctf_trace_try_destroy(session, ctf_trace); - } -} - /* * Delete and destroy a connection. * @@ -1634,28 +1847,27 @@ static void try_destroy_streams(struct relay_session *session) static void destroy_connection(struct lttng_ht *relay_connections_ht, struct relay_connection *conn) { - struct relay_session *session; + struct relay_session *session, *tmp_session; assert(relay_connections_ht); assert(conn); - DBG("Cleaning connection of session ID %" PRIu64, conn->session_id); - connection_delete(relay_connections_ht, conn); + if (!conn->viewer_session) { + goto end; + } + rcu_read_lock(); - session = session_find_by_id(conn->sessions_ht, conn->session_id); - if (session) { - /* - * Very important that this is done before destroying the session so we - * can put back every viewer stream reference from the ctf_trace. - */ - destroy_viewer_streams_by_session(session); - try_destroy_streams(session); - session_viewer_try_destroy(conn->sessions_ht, session); + cds_list_for_each_entry_safe(session, tmp_session, + &conn->viewer_session->sessions_head, + viewer_session_list) { + DBG("Cleaning connection of session ID %" PRIu64, session->id); + cleanup_session(conn, session); } rcu_read_unlock(); +end: connection_destroy(conn); } @@ -1737,7 +1949,7 @@ restart: health_code_update(); /* Thread quit pipe has been closed. Killing thread. */ - ret = check_live_conn_pipe(pollfd, revents); + ret = check_thread_quit_pipe(pollfd, revents); if (ret) { err = 0; goto exit;