}
}
+static
+const char *lttng_viewer_next_index_return_code_str(
+ enum lttng_viewer_next_index_return_code code)
+{
+ switch (code) {
+ case LTTNG_VIEWER_INDEX_OK:
+ return "INDEX_OK";
+ case LTTNG_VIEWER_INDEX_RETRY:
+ return "INDEX_RETRY";
+ case LTTNG_VIEWER_INDEX_HUP:
+ return "INDEX_HUP";
+ case LTTNG_VIEWER_INDEX_ERR:
+ return "INDEX_ERR";
+ case LTTNG_VIEWER_INDEX_INACTIVE:
+ return "INDEX_INACTIVE";
+ case LTTNG_VIEWER_INDEX_EOF:
+ return "INDEX_EOF";
+ default:
+ abort();
+ }
+}
+
+static
+const char *lttng_viewer_attach_return_code_str(
+ enum lttng_viewer_attach_return_code code)
+{
+ switch (code) {
+ case LTTNG_VIEWER_ATTACH_OK:
+ return "ATTACH_OK";
+ case LTTNG_VIEWER_ATTACH_ALREADY:
+ return "ATTACH_ALREADY";
+ case LTTNG_VIEWER_ATTACH_UNK:
+ return "ATTACH_UNK";
+ case LTTNG_VIEWER_ATTACH_NOT_LIVE:
+ return "ATTACH_NOT_LIVE";
+ case LTTNG_VIEWER_ATTACH_SEEK_ERR:
+ return "ATTACH_SEEK_ERR";
+ case LTTNG_VIEWER_ATTACH_NO_SESSION:
+ return "ATTACH_NO_SESSION";
+ default:
+ abort();
+ }
+};
+
/*
* Cleanup the daemon
*/
}
session_id = be64toh(request.session_id);
+
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);
+ viewer_attach_status = LTTNG_VIEWER_ATTACH_NO_SESSION;
+ DBG("Client trying to attach before creating a live viewer session, returning status=%s",
+ lttng_viewer_attach_return_code_str(viewer_attach_status));
goto send_reply;
}
session = session_get_by_id(session_id);
if (!session) {
- DBG("Relay session %" PRIu64 " not found", session_id);
- response.status = htobe32(LTTNG_VIEWER_ATTACH_UNK);
+ viewer_attach_status = LTTNG_VIEWER_ATTACH_UNK;
+ DBG("Relay session %" PRIu64 " not found, returning status=%s",
+ session_id,
+ lttng_viewer_attach_return_code_str(viewer_attach_status));
goto send_reply;
}
- DBG("Attach session ID %" PRIu64 " received", session_id);
+ DBG("Attach relay session ID %" PRIu64 " received", session_id);
pthread_mutex_lock(&session->lock);
if (session->live_timer == 0) {
- DBG("Not live session");
- response.status = htobe32(LTTNG_VIEWER_ATTACH_NOT_LIVE);
+ viewer_attach_status = LTTNG_VIEWER_ATTACH_NOT_LIVE;
+ DBG("Relay session ID %" PRIu64 " is not a live session, returning status=%s",
+ session_id,
+ lttng_viewer_attach_return_code_str(viewer_attach_status));
goto send_reply;
}
viewer_attach_status = viewer_session_attach(conn->viewer_session,
session);
if (viewer_attach_status != LTTNG_VIEWER_ATTACH_OK) {
- response.status = htobe32(viewer_attach_status);
+ DBG("Error attaching to relay session %" PRIu64 ", returning status=%s",
+ session_id,
+ lttng_viewer_attach_return_code_str(viewer_attach_status));
goto send_reply;
}
switch (be32toh(request.seek)) {
case LTTNG_VIEWER_SEEK_BEGINNING:
case LTTNG_VIEWER_SEEK_LAST:
- response.status = htobe32(LTTNG_VIEWER_ATTACH_OK);
+ viewer_attach_status = LTTNG_VIEWER_ATTACH_OK;
seek_type = (lttng_viewer_seek) be32toh(request.seek);
break;
default:
- ERR("Wrong seek parameter");
- response.status = htobe32(LTTNG_VIEWER_ATTACH_SEEK_ERR);
+ ERR("Wrong seek parameter for relay session %" PRIu64
+ ", returning status=%s", session_id,
+ lttng_viewer_attach_return_code_str(viewer_attach_status));
+ viewer_attach_status = LTTNG_VIEWER_ATTACH_SEEK_ERR;
send_streams = 0;
goto send_reply;
}
if (closed) {
send_streams = 0;
response.streams_count = 0;
- response.status = htobe32(LTTNG_VIEWER_ATTACH_UNK);
+ viewer_attach_status = LTTNG_VIEWER_ATTACH_UNK;
+ ERR("Session %" PRIu64 " is closed, returning status=%s",
+ session_id,
+ lttng_viewer_attach_return_code_str(viewer_attach_status));
goto send_reply;
}
send_reply:
health_code_update();
+
+ response.status = htobe32((uint32_t) viewer_attach_status);
+
ret = send_response(conn->sock, &response, sizeof(response));
if (ret < 0) {
goto end_put_session;
* Last index sent and session connection or relay
* stream are closed.
*/
- index->status = htobe32(LTTNG_VIEWER_INDEX_HUP);
+ index->status = LTTNG_VIEWER_INDEX_HUP;
+ DBG("Check index status: Connection or stream are closed, stream %" PRIu64
+ ",connection-closed=%d, relay-stream-closed=%d, returning status=%s",
+ vstream->stream->stream_handle,
+ trace->session->connection_closed, rstream->closed,
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) index->status));
goto hup;
} else if (rstream->beacon_ts_end != -1ULL &&
(rstream->index_received_seqcount == 0 ||
* viewer_stream_sync_tracefile_array_tail) and skip over
* packet sequence numbers.
*/
- index->status = htobe32(LTTNG_VIEWER_INDEX_INACTIVE);
+ index->status = LTTNG_VIEWER_INDEX_INACTIVE;
index->timestamp_end = htobe64(rstream->beacon_ts_end);
index->stream_id = htobe64(rstream->ctf_stream_id);
- DBG("Check index status: inactive with beacon, for stream %" PRIu64,
- vstream->stream->stream_handle);
+ DBG("Check index status: inactive with beacon, for stream %" PRIu64
+ ", returning status=%s",
+ vstream->stream->stream_handle,
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) index->status));
goto index_ready;
} else if (rstream->index_received_seqcount == 0 ||
(vstream->index_sent_seqcount != 0 &&
* viewer_stream_sync_tracefile_array_tail) and skip over
* packet sequence numbers.
*/
- index->status = htobe32(LTTNG_VIEWER_INDEX_RETRY);
- DBG("Check index status: retry for stream %" PRIu64,
- vstream->stream->stream_handle);
+ index->status = LTTNG_VIEWER_INDEX_RETRY;
+ DBG("Check index status:"
+ "did not received beacon for stream %" PRIu64
+ ", returning status=%s",
+ vstream->stream->stream_handle,
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) index->status));
goto index_ready;
} else if (!tracefile_array_seq_in_file(rstream->tfa,
vstream->current_tracefile_id,
ret = viewer_stream_rotate(vstream);
if (ret == 1) {
/* EOF across entire stream. */
- index->status = htobe32(LTTNG_VIEWER_INDEX_HUP);
+ index->status = LTTNG_VIEWER_INDEX_HUP;
+ DBG("Check index status:"
+ "reached end of file for stream %" PRIu64
+ ", returning status=%s",
+ vstream->stream->stream_handle,
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) index->status));
goto hup;
}
/*
rstream->tfa,
vstream->current_tracefile_id,
vstream->index_sent_seqcount)) {
- index->status = htobe32(LTTNG_VIEWER_INDEX_RETRY);
- DBG("Check index status: retry: "
+ index->status = LTTNG_VIEWER_INDEX_RETRY;
+ DBG("Check index status:"
"tracefile array sequence number %" PRIu64
- " not in file for stream %" PRIu64,
+ " not in file for stream %" PRIu64
+ ", returning status=%s",
vstream->index_sent_seqcount,
- vstream->stream->stream_handle);
+ vstream->stream->stream_handle,
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) index->status));
goto index_ready;
}
LTTNG_ASSERT(tracefile_array_seq_in_file(rstream->tfa,
vstream = viewer_stream_get_by_id(be64toh(request_index.stream_id));
if (!vstream) {
- DBG("Client requested index of unknown stream id %" PRIu64,
- (uint64_t) be64toh(request_index.stream_id));
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
+ viewer_index.status = LTTNG_VIEWER_INDEX_ERR;
+ DBG("Client requested index of unknown stream id %" PRIu64", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
* The viewer should not ask for index on metadata stream.
*/
if (rstream->is_metadata) {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_HUP);
+ viewer_index.status = LTTNG_VIEWER_INDEX_HUP;
+ DBG("Client requested index of a metadata stream id %" PRIu64", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
if (rstream->ongoing_rotation.is_set) {
/* Rotation is ongoing, try again later. */
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_RETRY);
+ viewer_index.status = LTTNG_VIEWER_INDEX_RETRY;
+ DBG("Client requested index for stream id %" PRIu64" while a stream rotation is ongoing, returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
if (rstream->trace->session->ongoing_rotation) {
/* Rotation is ongoing, try again later. */
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_RETRY);
+ viewer_index.status = LTTNG_VIEWER_INDEX_RETRY;
+ DBG("Client requested index for stream id %" PRIu64" while a session rotation is ongoing, returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
conn->viewer_session,
rstream->trace_chunk);
if (ret) {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
+ viewer_index.status = LTTNG_VIEWER_INDEX_ERR;
+ ERR("Error copying trace chunk for stream id %" PRIu64
+ ", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
}
ret = try_open_index(vstream, rstream);
if (ret == -ENOENT) {
if (rstream->closed) {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_HUP);
+ viewer_index.status = LTTNG_VIEWER_INDEX_HUP;
+ DBG("Cannot open index for stream id %" PRIu64
+ "stream is closed, returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
} else {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_RETRY);
+ viewer_index.status = LTTNG_VIEWER_INDEX_RETRY;
+ DBG("Cannot open index for stream id %" PRIu64
+ ", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
}
if (ret < 0) {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
+ viewer_index.status = LTTNG_VIEWER_INDEX_ERR;
+ ERR("Error opening index for stream id %" PRIu64
+ ", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
if (status == LTTNG_TRACE_CHUNK_STATUS_NO_FILE &&
rstream->closed) {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_HUP);
+ viewer_index.status = LTTNG_VIEWER_INDEX_HUP;
+ DBG("Cannot find trace chunk file and stream is closed for stream id %" PRIu64
+ ", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
}
PERROR("Failed to open trace file for viewer stream");
ret = check_new_streams(conn);
if (ret < 0) {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
+ viewer_index.status = LTTNG_VIEWER_INDEX_ERR;
+ ERR("Error checking for new streams before sending new index to stream id %" PRIu64
+ ", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
} else if (ret == 1) {
viewer_index.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM;
ret = lttng_index_file_read(vstream->index_file, &packet_index);
if (ret) {
- ERR("Relay error reading index file");
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
+ viewer_index.status = LTTNG_VIEWER_INDEX_ERR;
+ ERR("Relay error reading index file for stream id %" PRIu64
+ ", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
goto send_reply;
} else {
- viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_OK);
+ viewer_index.status = LTTNG_VIEWER_INDEX_OK;
+ DBG("Read index file for stream id %" PRIu64
+ ", returning status=%s",
+ (uint64_t) be64toh(request_index.stream_id),
+ lttng_viewer_next_index_return_code_str(
+ (enum lttng_viewer_next_index_return_code) viewer_index.status));
vstream->index_sent_seqcount++;
}
}
viewer_index.flags = htobe32(viewer_index.flags);
+ viewer_index.status = htobe32(viewer_index.status);
health_code_update();
ret = send_response(conn->sock, &viewer_index, sizeof(viewer_index));
*/
if (vstream->metadata_sent > 0) {
if (vstream->stream->closed && vstream->stream->no_new_metadata_notified) {
- /* Release ownership for the viewer metadata stream. */
+ /*
+ * Release ownership for the viewer metadata
+ * stream. Note that this reference is the
+ * viewer's reference. The vstream still exists
+ * until the end of the function as
+ * viewer_stream_get_by_id() took a reference.
+ */
viewer_stream_put(vstream);
}
+
vstream->stream->no_new_metadata_notified = true;
}
goto send_reply;