X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Findex.c;h=fa5b373c8b579b2abc915480e4b61b8b106e448c;hb=f465e9787f5b70d4a8f3761c60b8d6e4161e9628;hp=80a4bb94d2a0651dc24100425c52ca4047b06209;hpb=719155c2bed581d85290537fd95bafc787229dbc;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/index.c b/src/bin/lttng-relayd/index.c
index 80a4bb94d..fa5b373c8 100644
--- a/src/bin/lttng-relayd/index.c
+++ b/src/bin/lttng-relayd/index.c
@@ -166,18 +166,19 @@ end:
 	return index;
 }
 
-int relay_index_set_fd(struct relay_index *index, struct stream_fd *index_fd,
+int relay_index_set_file(struct relay_index *index,
+		struct relay_index_file *index_file,
 		uint64_t data_offset)
 {
 	int ret = 0;
 
 	pthread_mutex_lock(&index->lock);
-	if (index->index_fd) {
+	if (index->index_file) {
 		ret = -1;
 		goto end;
 	}
-	stream_fd_get(index_fd);
-	index->index_fd = index_fd;
+	relay_index_file_get(index_file);
+	index->index_file = index_file;
 	index->index_data.offset = data_offset;
 end:
 	pthread_mutex_unlock(&index->lock);
@@ -228,9 +229,9 @@ static void index_release(struct urcu_ref *ref)
 	int ret;
 	struct lttng_ht_iter iter;
 
-	if (index->index_fd) {
-		stream_fd_put(index->index_fd);
-		index->index_fd = NULL;
+	if (index->index_file) {
+		relay_index_file_put(index->index_file);
+		index->index_file = NULL;
 	}
 	if (index->in_hash_table) {
 		/* Delete index from hash table. */
@@ -283,28 +284,21 @@ int relay_index_try_flush(struct relay_index *index)
 {
 	int ret = 1;
 	bool flushed = false;
-	int fd;
 
 	pthread_mutex_lock(&index->lock);
 	if (index->flushed) {
 		goto skip;
 	}
 	/* Check if we are ready to flush. */
-	if (!index->has_index_data || !index->index_fd) {
+	if (!index->has_index_data || !index->index_file) {
 		goto skip;
 	}
-	fd = index->index_fd->fd;
-	DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64
-			" on fd %d", index->stream->stream_handle,
-			index->index_n.key, fd);
+	DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64,
+			index->stream->stream_handle,
+			index->index_n.key);
 	flushed = true;
 	index->flushed = true;
-	ret = index_write(fd, &index->index_data, sizeof(index->index_data));
-	if (ret == sizeof(index->index_data)) {
-		ret = 0;
-	} else {
-		ret = -1;
-	}
+	ret = relay_index_file_write(index->index_file, &index->index_data);
 skip:
 	pthread_mutex_unlock(&index->lock);
 
@@ -341,11 +335,11 @@ void relay_index_close_partial_fd(struct relay_stream *stream)
 	rcu_read_lock();
 	cds_lfht_for_each_entry(stream->indexes_ht->ht, &iter.iter,
 			index, index_n.node) {
-		if (!index->index_fd) {
+		if (!index->index_file) {
 			continue;
 		}
 		/*
-		 * Partial index has its index_fd: we have only
+		 * Partial index has its index_file: we have only
 		 * received its info from the data socket.
 		 * Put self-ref from index.
 		 */