X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-stream.c;h=05499215a8049e5e98e239b7e8f50d030230328e;hb=65e663fa0c098f8f8ddd0f0f3d91dbd25d1daa4d;hp=5c19fb9747e4e124e393e872b15d042810a7aff5;hpb=b0d240a2e2204087ff1634f0bd265660c0582f33;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 5c19fb974..05499215a 100644
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -1,20 +1,10 @@
 /*
- * 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
@@ -158,8 +148,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 	 * 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;
 
@@ -171,26 +161,20 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 			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;
 		}
@@ -241,9 +225,9 @@ static void viewer_stream_release(struct urcu_ref *ref)
 
 	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);
@@ -304,9 +288,9 @@ void viewer_stream_close_files(struct relay_viewer_stream *vstream)
 		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;
 	}
 }