/*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- * David Goulet <dgoulet@efficios.com>
- * 2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _LGPL_SOURCE
viewer_stream_destroy(vstream);
}
+/* Relay stream's lock must be held by the caller. */
struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
- struct lttng_trace_chunk *viewer_trace_chunk,
+ struct lttng_trace_chunk *trace_chunk,
enum lttng_viewer_seek seek_t)
{
struct relay_viewer_stream *vstream = NULL;
- const bool acquired_reference = lttng_trace_chunk_get(
- viewer_trace_chunk);
+ const bool acquired_reference = lttng_trace_chunk_get(trace_chunk);
+ ASSERT_LOCKED(stream->lock);
if (!acquired_reference) {
goto error;
}
goto error;
}
- vstream->stream_file.trace_chunk = viewer_trace_chunk;
- viewer_trace_chunk = NULL;
+ vstream->stream_file.trace_chunk = trace_chunk;
+ 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");
}
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;
* 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;
+ if (stream->file) {
+ int ret;
char file_path[LTTNG_PATH_MAX];
enum lttng_trace_chunk_status status;
goto error_unlock;
}
- status = lttng_trace_chunk_open_file(
- vstream->stream_file.trace_chunk,
- file_path, O_RDONLY, 0, &fd, true);
+ status = lttng_trace_chunk_open_fs_handle(
+ vstream->stream_file.trace_chunk, file_path,
+ O_RDONLY, 0, &vstream->stream_file.handle,
+ 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_file) {
off_t lseek_ret;
- lseek_ret = lseek(vstream->index_file->fd, 0, SEEK_END);
+ lseek_ret = fs_handle_seek(
+ vstream->index_file->file, 0, SEEK_END);
if (lseek_ret < 0) {
goto error_unlock;
}
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);
if (vstream) {
viewer_stream_destroy(vstream);
}
- if (viewer_trace_chunk && acquired_reference) {
- lttng_trace_chunk_put(viewer_trace_chunk);
+ if (trace_chunk && acquired_reference) {
+ lttng_trace_chunk_put(trace_chunk);
}
return NULL;
}
viewer_stream_unpublish(vstream);
- if (vstream->stream_file.fd) {
- stream_fd_put(vstream->stream_file.fd);
- vstream->stream_file.fd = NULL;
+ if (vstream->stream_file.handle) {
+ fs_handle_close(vstream->stream_file.handle);
+ vstream->stream_file.handle = NULL;
}
if (vstream->index_file) {
lttng_index_file_put(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;
+ if (vstream->stream_file.handle) {
+ fs_handle_close(vstream->stream_file.handle);
+ vstream->stream_file.handle = NULL;
}
}