projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumerd: use packet sequence number for rotation position
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index aea1b4831d158da0052d0533d1dc9279096a1eca..2cd9704442fe468829d4d0e79d9e1cba394edddd 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-1185,8
+1185,7
@@
error_rotate_channel:
*msg.u.create_trace_chunk.override_name ?
msg.u.create_trace_chunk.override_name :
NULL;
*msg.u.create_trace_chunk.override_name ?
msg.u.create_trace_chunk.override_name :
NULL;
- LTTNG_OPTIONAL(struct lttng_directory_handle) chunk_directory_handle =
- LTTNG_OPTIONAL_INIT;
+ struct lttng_directory_handle *chunk_directory_handle = NULL;
/*
* The session daemon will only provide a chunk directory file
/*
* The session daemon will only provide a chunk directory file
@@
-1211,17
+1210,15
@@
error_rotate_channel:
DBG("Received trace chunk directory fd (%d)",
chunk_dirfd);
DBG("Received trace chunk directory fd (%d)",
chunk_dirfd);
- ret = lttng_directory_handle_init_from_dirfd(
- &chunk_directory_handle.value,
+ chunk_directory_handle = lttng_directory_handle_create_from_dirfd(
chunk_dirfd);
chunk_dirfd);
- if (
ret
) {
+ if (
!chunk_directory_handle
) {
ERR("Failed to initialize chunk directory handle from directory file descriptor");
if (close(chunk_dirfd)) {
PERROR("Failed to close chunk directory file descriptor");
}
goto error_fatal;
}
ERR("Failed to initialize chunk directory handle from directory file descriptor");
if (close(chunk_dirfd)) {
PERROR("Failed to close chunk directory file descriptor");
}
goto error_fatal;
}
- chunk_directory_handle.is_set = true;
}
ret_code = lttng_consumer_create_trace_chunk(
}
ret_code = lttng_consumer_create_trace_chunk(
@@
-1234,14
+1231,8
@@
error_rotate_channel:
msg.u.create_trace_chunk.credentials.is_set ?
&credentials :
NULL,
msg.u.create_trace_chunk.credentials.is_set ?
&credentials :
NULL,
- chunk_directory_handle.is_set ?
- &chunk_directory_handle.value :
- NULL);
-
- if (chunk_directory_handle.is_set) {
- lttng_directory_handle_fini(
- &chunk_directory_handle.value);
- }
+ chunk_directory_handle);
+ lttng_directory_handle_put(chunk_directory_handle);
goto end_msg_sessiond;
}
case LTTNG_CONSUMER_CLOSE_TRACE_CHUNK:
goto end_msg_sessiond;
}
case LTTNG_CONSUMER_CLOSE_TRACE_CHUNK:
@@
-1454,6
+1445,7
@@
int update_stream_stats(struct lttng_consumer_stream *stream)
if (ret == -ENOTTY) {
/* Command not implemented by lttng-modules. */
seq = -1ULL;
if (ret == -ENOTTY) {
/* Command not implemented by lttng-modules. */
seq = -1ULL;
+ stream->sequence_number_unavailable = true;
} else {
PERROR("kernctl_get_sequence_number");
goto end;
} else {
PERROR("kernctl_get_sequence_number");
goto end;
@@
-1553,7
+1545,7
@@
ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
int err, write_index = 1, rotation_ret;
ssize_t ret = 0;
int infd = stream->wait_fd;
int err, write_index = 1, rotation_ret;
ssize_t ret = 0;
int infd = stream->wait_fd;
- struct ctf_packet_index index;
+ struct ctf_packet_index index
= {}
;
DBG("In read_subbuffer (infd : %d)", infd);
DBG("In read_subbuffer (infd : %d)", infd);
This page took
0.025726 seconds
and
5
git commands to generate.