projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: minor errors in lttng.1 man page
[lttng-tools.git]
/
src
/
common
/
consumer.c
diff --git
a/src/common/consumer.c
b/src/common/consumer.c
index 27dfe32b8592487e6c5e881604a650085240f536..59b0a1edeb867188ccafb6253bbb086749eb775f 100644
(file)
--- a/
src/common/consumer.c
+++ b/
src/common/consumer.c
@@
-755,7
+755,7
@@
static int write_relayd_stream_header(struct lttng_consumer_stream *stream,
* this next value, 1 should always be substracted in order to compare
* the last seen sequence number on the relayd side to the last sent.
*/
* this next value, 1 should always be substracted in order to compare
* the last seen sequence number on the relayd side to the last sent.
*/
- data_hdr.net_seq_num = htobe64(stream->next_net_seq_num
++
);
+ data_hdr.net_seq_num = htobe64(stream->next_net_seq_num);
/* Other fields are zeroed previously */
ret = relayd_send_data_hdr(&relayd->data_sock, &data_hdr,
/* Other fields are zeroed previously */
ret = relayd_send_data_hdr(&relayd->data_sock, &data_hdr,
@@
-764,6
+764,8
@@
static int write_relayd_stream_header(struct lttng_consumer_stream *stream,
goto error;
}
goto error;
}
+ ++stream->next_net_seq_num;
+
/* Set to go on data socket */
outfd = relayd->data_sock.fd;
}
/* Set to go on data socket */
outfd = relayd->data_sock.fd;
}
@@
-2155,7
+2157,7
@@
restart:
if (stream == NULL) {
/* Check for deleted streams. */
validate_endpoint_status_metadata_stream(&events);
if (stream == NULL) {
/* Check for deleted streams. */
validate_endpoint_status_metadata_stream(&events);
-
continue
;
+
goto restart
;
}
DBG("Adding metadata stream %d to poll set",
}
DBG("Adding metadata stream %d to poll set",
@@
-2349,7
+2351,7
@@
void *consumer_thread_data_poll(void *data)
* array update over low-priority reads.
*/
if (pollfd[nb_fd].revents & (POLLIN | POLLPRI)) {
* array update over low-priority reads.
*/
if (pollfd[nb_fd].revents & (POLLIN | POLLPRI)) {
- size_t pipe_readlen;
+ s
s
ize_t pipe_readlen;
DBG("consumer_data_pipe wake up");
/* Consume 1 byte of pipe data */
DBG("consumer_data_pipe wake up");
/* Consume 1 byte of pipe data */
This page took
0.025162 seconds
and
4
git commands to generate.