* 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 <common/utils.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include "lttng-relayd.h"
#include "viewer-stream.h"
}
struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
+ struct lttng_trace_chunk *viewer_trace_chunk,
enum lttng_viewer_seek seek_t)
{
- struct relay_viewer_stream *vstream;
+ struct relay_viewer_stream *vstream = NULL;
+ const bool acquired_reference = lttng_trace_chunk_get(
+ viewer_trace_chunk);
+
+ if (!acquired_reference) {
+ goto error;
+ }
vstream = zmalloc(sizeof(*vstream));
if (!vstream) {
goto error;
}
+ vstream->stream_file.trace_chunk = viewer_trace_chunk;
+ viewer_trace_chunk = NULL;
vstream->path_name = lttng_strndup(stream->path_name, LTTNG_VIEWER_PATH_MAX);
if (vstream->path_name == NULL) {
PERROR("relay viewer path_name alloc");
}
case LTTNG_VIEWER_SEEK_LAST:
vstream->current_tracefile_id =
- tracefile_array_get_file_index_head(stream->tfa);
+ tracefile_array_get_read_file_index_head(stream->tfa);
/*
* We seek at the very end of each stream, awaiting for
* a future packet to eventually come in.
* If we never received an index for the current stream, delay
* the opening of the index, otherwise open it right now.
*/
- if (stream->index_received_seqcount == 0) {
- vstream->index_fd = NULL;
+ if (stream->index_file == NULL) {
+ vstream->index_file = NULL;
} else {
- int read_fd;
+ const uint32_t connection_major = stream->trace->session->major;
+ const uint32_t connection_minor = stream->trace->session->minor;
+ enum lttng_trace_chunk_status chunk_status;
+
+ chunk_status = lttng_index_file_create_from_trace_chunk_read_only(
+ vstream->stream_file.trace_chunk,
+ stream->path_name,
+ stream->channel_name, stream->tracefile_size,
+ vstream->current_tracefile_id,
+ lttng_to_index_major(connection_major,
+ connection_minor),
+ lttng_to_index_minor(connection_major,
+ connection_minor),
+ true, &vstream->index_file);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ if (chunk_status == LTTNG_TRACE_CHUNK_STATUS_NO_FILE) {
+ vstream->index_file = NULL;
+ } else {
+ goto error_unlock;
+ }
+ }
+ }
- read_fd = index_open(vstream->path_name, vstream->channel_name,
- stream->tracefile_count,
- vstream->current_tracefile_id);
- if (read_fd < 0) {
+ /*
+ * If we never received a data file for the current stream, delay the
+ * opening, otherwise open it right now.
+ */
+ if (stream->stream_fd) {
+ int fd, ret;
+ char file_path[LTTNG_PATH_MAX];
+ enum lttng_trace_chunk_status status;
+
+ ret = utils_stream_file_path(stream->path_name,
+ stream->channel_name, stream->tracefile_size,
+ vstream->current_tracefile_id, NULL, file_path,
+ sizeof(file_path));
+ if (ret < 0) {
goto error_unlock;
}
- vstream->index_fd = stream_fd_create(read_fd);
- if (!vstream->index_fd) {
- if (close(read_fd)) {
- PERROR("close");
+
+ status = lttng_trace_chunk_open_file(
+ vstream->stream_file.trace_chunk,
+ file_path, O_RDONLY, 0, &fd, true);
+ if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ goto error_unlock;
+ }
+ vstream->stream_file.fd = stream_fd_create(fd);
+ if (!vstream->stream_file.fd) {
+ if (close(fd)) {
+ PERROR("Failed to close viewer %sfile",
+ stream->is_metadata ? "metadata " : "");
}
goto error_unlock;
}
}
- if (seek_t == LTTNG_VIEWER_SEEK_LAST && vstream->index_fd) {
+ if (seek_t == LTTNG_VIEWER_SEEK_LAST && vstream->index_file) {
off_t lseek_ret;
- lseek_ret = lseek(vstream->index_fd->fd, 0, SEEK_END);
+ lseek_ret = lseek(vstream->index_file->fd, 0, SEEK_END);
if (lseek_ret < 0) {
goto error_unlock;
}
/* Globally visible after the add unique. */
lttng_ht_node_init_u64(&vstream->stream_n, stream->stream_handle);
- lttng_ht_add_unique_u64(viewer_streams_ht, &vstream->stream_n);
-
- pthread_mutex_init(&vstream->reflock, NULL);
urcu_ref_init(&vstream->ref);
+ lttng_ht_add_unique_u64(viewer_streams_ht, &vstream->stream_n);
return vstream;
if (vstream) {
viewer_stream_destroy(vstream);
}
+ if (viewer_trace_chunk && acquired_reference) {
+ lttng_trace_chunk_put(viewer_trace_chunk);
+ }
return NULL;
}
viewer_stream_unpublish(vstream);
- if (vstream->stream_fd) {
- stream_fd_put(vstream->stream_fd);
- vstream->stream_fd = NULL;
+ if (vstream->stream_file.fd) {
+ stream_fd_put(vstream->stream_file.fd);
+ vstream->stream_file.fd = NULL;
}
- if (vstream->index_fd) {
- stream_fd_put(vstream->index_fd);
- vstream->index_fd = NULL;
+ if (vstream->index_file) {
+ lttng_index_file_put(vstream->index_file);
+ vstream->index_file = NULL;
}
if (vstream->stream) {
stream_put(vstream->stream);
vstream->stream = NULL;
}
+ lttng_trace_chunk_put(vstream->stream_file.trace_chunk);
+ vstream->stream_file.trace_chunk = NULL;
call_rcu(&vstream->rcu_node, viewer_stream_destroy_rcu);
}
/* Must be called with RCU read-side lock held. */
bool viewer_stream_get(struct relay_viewer_stream *vstream)
{
- bool has_ref = false;
-
- pthread_mutex_lock(&vstream->reflock);
- if (vstream->ref.refcount != 0) {
- has_ref = true;
- urcu_ref_get(&vstream->ref);
- }
- pthread_mutex_unlock(&vstream->reflock);
-
- return has_ref;
+ return urcu_ref_get_unless_zero(&vstream->ref);
}
/*
void viewer_stream_put(struct relay_viewer_stream *vstream)
{
rcu_read_lock();
- pthread_mutex_lock(&vstream->reflock);
urcu_ref_put(&vstream->ref, viewer_stream_release);
- pthread_mutex_unlock(&vstream->reflock);
rcu_read_unlock();
}
+void viewer_stream_close_files(struct relay_viewer_stream *vstream)
+{
+ if (vstream->index_file) {
+ lttng_index_file_put(vstream->index_file);
+ vstream->index_file = NULL;
+ }
+ if (vstream->stream_file.fd) {
+ stream_fd_put(vstream->stream_file.fd);
+ vstream->stream_file.fd = NULL;
+ }
+}
+
+void viewer_stream_sync_tracefile_array_tail(struct relay_viewer_stream *vstream)
+{
+ const struct relay_stream *stream = vstream->stream;
+ uint64_t seq_tail;
+
+ vstream->current_tracefile_id = tracefile_array_get_file_index_tail(stream->tfa);
+ seq_tail = tracefile_array_get_seq_tail(stream->tfa);
+ if (seq_tail == -1ULL) {
+ seq_tail = 0;
+ }
+ vstream->index_sent_seqcount = seq_tail;
+}
+
/*
* Rotate a stream to the next tracefile.
*
* Must be called with the rstream lock held.
- * Returns 0 on success, 1 on EOF, a negative value on error.
+ * Returns 0 on success, 1 on EOF.
*/
int viewer_stream_rotate(struct relay_viewer_stream *vstream)
{
int ret;
- struct relay_stream *stream = vstream->stream;
uint64_t new_id;
+ const struct relay_stream *stream = vstream->stream;
/* Detect the last tracefile to open. */
if (stream->index_received_seqcount
tracefile_array_get_file_index_tail(stream->tfa);
vstream->index_sent_seqcount = seq_tail;
}
-
- if (vstream->index_fd) {
- stream_fd_put(vstream->index_fd);
- vstream->index_fd = NULL;
- }
- if (vstream->stream_fd) {
- stream_fd_put(vstream->stream_fd);
- vstream->stream_fd = NULL;
- }
-
- ret = index_open(vstream->path_name, vstream->channel_name,
- stream->tracefile_count,
- vstream->current_tracefile_id);
- if (ret < 0) {
- goto end;
- }
- vstream->index_fd = stream_fd_create(ret);
- if (vstream->index_fd) {
- ret = 0;
- } else {
- if (close(ret)) {
- PERROR("close");
- }
- ret = -1;
- }
+ viewer_stream_close_files(vstream);
+ ret = 0;
end:
return ret;
}
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