projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd vs consumerd compatibility
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
index.c
diff --git
a/src/bin/lttng-relayd/index.c
b/src/bin/lttng-relayd/index.c
index 5b5c711cb9c718170adf78b1a0cd721945a2ab21..b15bbcd7702954e675a98c06e02ab31058ff7499 100644
(file)
--- a/
src/bin/lttng-relayd/index.c
+++ b/
src/bin/lttng-relayd/index.c
@@
-17,7
+17,6
@@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
#define _LGPL_SOURCE
#include <assert.h>
@@
-163,22
+162,23
@@
struct relay_index *relay_index_get_by_id_or_create(struct relay_stream *stream,
end:
rcu_read_unlock();
DBG2("Index %sfound or created in HT for stream ID %" PRIu64 " and seqnum %" PRIu64,
end:
rcu_read_unlock();
DBG2("Index %sfound or created in HT for stream ID %" PRIu64 " and seqnum %" PRIu64,
- (index == NULL) ? "NOT " : "",
index->
stream->stream_handle, net_seq_num);
+ (index == NULL) ? "NOT " : "", stream->stream_handle, net_seq_num);
return index;
}
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 lttng_index_file *index_file,
uint64_t data_offset)
{
int ret = 0;
pthread_mutex_lock(&index->lock);
uint64_t data_offset)
{
int ret = 0;
pthread_mutex_lock(&index->lock);
- if (index->index_f
d
) {
+ if (index->index_f
ile
) {
ret = -1;
goto end;
}
ret = -1;
goto end;
}
-
stream_fd_get(index_fd
);
- index->index_f
d = index_fd
;
+
lttng_index_file_get(index_file
);
+ index->index_f
ile = index_file
;
index->index_data.offset = data_offset;
end:
pthread_mutex_unlock(&index->lock);
index->index_data.offset = data_offset;
end:
pthread_mutex_unlock(&index->lock);
@@
-229,9
+229,9
@@
static void index_release(struct urcu_ref *ref)
int ret;
struct lttng_ht_iter iter;
int ret;
struct lttng_ht_iter iter;
- if (index->index_f
d
) {
-
stream_fd_put(index->index_fd
);
- index->index_f
d
= NULL;
+ if (index->index_f
ile
) {
+
lttng_index_file_put(index->index_file
);
+ index->index_f
ile
= NULL;
}
if (index->in_hash_table) {
/* Delete index from hash table. */
}
if (index->in_hash_table) {
/* Delete index from hash table. */
@@
-291,21
+291,16
@@
int relay_index_try_flush(struct relay_index *index)
goto skip;
}
/* Check if we are ready to flush. */
goto skip;
}
/* Check if we are ready to flush. */
- if (!index->has_index_data || !index->index_f
d
) {
+ if (!index->has_index_data || !index->index_f
ile
) {
goto skip;
}
goto skip;
}
- fd = index->index_f
d
->fd;
+ fd = index->index_f
ile
->fd;
DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64
" on fd %d", index->stream->stream_handle,
index->index_n.key, fd);
flushed = true;
index->flushed = true;
DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64
" on fd %d", index->stream->stream_handle,
index->index_n.key, fd);
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 = lttng_index_file_write(index->index_file, &index->index_data);
skip:
pthread_mutex_unlock(&index->lock);
skip:
pthread_mutex_unlock(&index->lock);
@@
-342,11
+337,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) {
rcu_read_lock();
cds_lfht_for_each_entry(stream->indexes_ht->ht, &iter.iter,
index, index_n.node) {
- if (!index->index_f
d
) {
+ if (!index->index_f
ile
) {
continue;
}
/*
continue;
}
/*
- * Partial index has its index_f
d
: we have only
+ * Partial index has its index_f
ile
: we have only
* received its info from the data socket.
* Put self-ref from index.
*/
* received its info from the data socket.
* Put self-ref from index.
*/
This page took
0.025502 seconds
and
4
git commands to generate.