* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <common/common.h>
#include <common/index/index.h>
+#include <common/compat/string.h>
#include "lttng-relayd.h"
#include "viewer-stream.h"
goto error;
}
- vstream->path_name = strndup(stream->path_name, LTTNG_VIEWER_PATH_MAX);
+ vstream->path_name = lttng_strndup(stream->path_name, LTTNG_VIEWER_PATH_MAX);
if (vstream->path_name == NULL) {
PERROR("relay viewer path_name alloc");
goto error;
}
- vstream->channel_name = strndup(stream->channel_name,
+ vstream->channel_name = lttng_strndup(stream->channel_name,
LTTNG_VIEWER_NAME_MAX);
if (vstream->channel_name == NULL) {
PERROR("relay viewer channel_name alloc");
goto error;
}
+ if (!stream_get(stream)) {
+ ERR("Cannot get stream");
+ goto error;
+ }
+ vstream->stream = stream;
+
+ pthread_mutex_lock(&stream->lock);
+
+ if (stream->is_metadata && stream->trace->viewer_metadata_stream) {
+ ERR("Cannot attach viewer metadata stream to trace (busy).");
+ goto error_unlock;
+ }
+
switch (seek_t) {
case LTTNG_VIEWER_SEEK_BEGINNING:
- vstream->current_tracefile_id = stream->oldest_tracefile_id;
+ {
+ uint64_t seq_tail = tracefile_array_get_seq_tail(stream->tfa);
+
+ if (seq_tail == -1ULL) {
+ /*
+ * Tail may not be initialized yet. Nonetheless, we know
+ * we want to send the first index once it becomes
+ * available.
+ */
+ seq_tail = 0;
+ }
+ vstream->current_tracefile_id =
+ tracefile_array_get_file_index_tail(stream->tfa);
+ vstream->index_sent_seqcount = seq_tail;
break;
+ }
case LTTNG_VIEWER_SEEK_LAST:
- vstream->current_tracefile_id = stream->current_tracefile_id;
+ vstream->current_tracefile_id =
+ tracefile_array_get_file_index_head(stream->tfa);
+ /*
+ * We seek at the very end of each stream, awaiting for
+ * a future packet to eventually come in.
+ *
+ * We don't need to check the head position for -1ULL since the
+ * increment will set it to 0.
+ */
+ vstream->index_sent_seqcount =
+ tracefile_array_get_seq_head(stream->tfa) + 1;
break;
default:
- goto error;
- }
- if (!stream_get(stream)) {
- ERR("Cannot get stream");
- goto error;
+ goto error_unlock;
}
- vstream->stream = stream;
- pthread_mutex_lock(&stream->lock);
/*
- * If we never received an index for the current stream, delay the opening
- * of the index, otherwise open it right now.
+ * If we never received an index for the current stream, delay
+ * the opening of the index, otherwise open it right now.
*/
- if (vstream->current_tracefile_id == stream->current_tracefile_id
- && stream->total_index_received == 0) {
+ if (stream->index_received_seqcount == 0) {
vstream->index_fd = NULL;
} else {
int read_fd;
if (lseek_ret < 0) {
goto error_unlock;
}
- vstream->last_sent_index = stream->total_index_received;
}
- pthread_mutex_unlock(&stream->lock);
-
if (stream->is_metadata) {
rcu_assign_pointer(stream->trace->viewer_metadata_stream,
vstream);
}
+ pthread_mutex_unlock(&stream->lock);
/* Globally visible after the add unique. */
lttng_ht_node_init_u64(&vstream->stream_n, stream->stream_handle);
rcu_read_unlock();
}
-/*
- * Returns whether the current tracefile is readable. If not, it has
- * been overwritten.
- * Must be called with rstream lock held.
- */
-bool viewer_stream_is_tracefile_seq_readable(struct relay_viewer_stream *vstream,
- uint64_t seq)
-{
- struct relay_stream *stream = vstream->stream;
-
- if (seq >= stream->oldest_tracefile_seq
- && seq <= stream->current_tracefile_seq) {
- /* seq is a readable file. */
- return true;
- } else {
- /* seq is not readable. */
- return false;
- }
-}
-
/*
* Rotate a stream to the next tracefile.
*
{
int ret;
struct relay_stream *stream = vstream->stream;
+ uint64_t new_id;
/* Detect the last tracefile to open. */
- if (stream->total_index_received == vstream->last_sent_index
+ if (stream->index_received_seqcount
+ == vstream->index_sent_seqcount
&& stream->trace->session->connection_closed) {
ret = 1;
goto end;
goto end;
}
- if (!viewer_stream_is_tracefile_seq_readable(vstream,
- vstream->current_tracefile_seq + 1)) {
- vstream->current_tracefile_id =
- stream->oldest_tracefile_id;
- vstream->current_tracefile_seq =
- stream->oldest_tracefile_seq;
+ /*
+ * Try to move to the next file.
+ */
+ new_id = (vstream->current_tracefile_id + 1)
+ % stream->tracefile_count;
+ if (tracefile_array_seq_in_file(stream->tfa, new_id,
+ vstream->index_sent_seqcount)) {
+ vstream->current_tracefile_id = new_id;
} else {
+ uint64_t seq_tail = tracefile_array_get_seq_tail(stream->tfa);
+
+ /*
+ * This can only be reached on overwrite, which implies there
+ * has been data written at some point, which will have set the
+ * tail.
+ */
+ assert(seq_tail != -1ULL);
+ /*
+ * We need to resync because we lag behind tail.
+ */
vstream->current_tracefile_id =
- (vstream->current_tracefile_id + 1)
- % stream->tracefile_count;
- vstream->current_tracefile_seq++;
+ tracefile_array_get_file_index_tail(stream->tfa);
+ vstream->index_sent_seqcount = seq_tail;
}
if (vstream->index_fd) {
struct lttng_ht_iter iter;
struct relay_viewer_stream *vstream;
+ if (!viewer_streams_ht) {
+ return;
+ }
+
rcu_read_lock();
cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter, vstream,
stream_n.node) {
projects / lttng-tools.git / blobdiff