projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: consumer_add_metadata_stream always returns 0
[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 2c30bed29c1492bb005dcc759ec91ce02acd88d7..02d042733e40687a35743cfeca0d0517ddb7f87b 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-187,14
+187,6
@@
int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
DBG("Kernel consumer snapshot stream %s/%s (%" PRIu64 ")",
path, stream->name, stream->key);
}
DBG("Kernel consumer snapshot stream %s/%s (%" PRIu64 ")",
path, stream->name, stream->key);
}
- if (relayd_id != -1ULL) {
- ret = consumer_send_relayd_streams_sent(relayd_id);
- if (ret < 0) {
- ERR("sending streams sent to relayd");
- goto end_unlock;
- }
- channel->streams_sent_to_relayd = true;
- }
ret = kernctl_buffer_flush_empty(stream->wait_fd);
if (ret < 0) {
ret = kernctl_buffer_flush_empty(stream->wait_fd);
if (ret < 0) {
@@
-465,10
+457,10
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
case LTTNG_CONSUMER_ADD_RELAYD_SOCKET:
{
/* Session daemon status message are handled in the following call. */
case LTTNG_CONSUMER_ADD_RELAYD_SOCKET:
{
/* Session daemon status message are handled in the following call. */
-
ret =
consumer_add_relayd_socket(msg.u.relayd_sock.net_index,
+ consumer_add_relayd_socket(msg.u.relayd_sock.net_index,
msg.u.relayd_sock.type, ctx, sock, consumer_sockpoll,
&msg.u.relayd_sock.sock, msg.u.relayd_sock.session_id,
msg.u.relayd_sock.type, ctx, sock, consumer_sockpoll,
&msg.u.relayd_sock.sock, msg.u.relayd_sock.session_id,
-
msg.u.relayd_sock.relayd_session_id);
+ msg.u.relayd_sock.relayd_session_id);
goto end_nosignal;
}
case LTTNG_CONSUMER_ADD_CHANNEL:
goto end_nosignal;
}
case LTTNG_CONSUMER_ADD_CHANNEL:
@@
-748,26
+740,14
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
/* Get the right pipe where the stream will be sent. */
if (new_stream->metadata_flag) {
/* Get the right pipe where the stream will be sent. */
if (new_stream->metadata_flag) {
- ret = consumer_add_metadata_stream(new_stream);
- if (ret) {
- ERR("Consumer add metadata stream %" PRIu64 " failed. Continuing",
- new_stream->key);
- consumer_stream_free(new_stream);
- goto end_nosignal;
- }
+ consumer_add_metadata_stream(new_stream);
stream_pipe = ctx->consumer_metadata_pipe;
} else {
stream_pipe = ctx->consumer_metadata_pipe;
} else {
- ret = consumer_add_data_stream(new_stream);
- if (ret) {
- ERR("Consumer add stream %" PRIu64 " failed. Continuing",
- new_stream->key);
- consumer_stream_free(new_stream);
- goto end_nosignal;
- }
+ consumer_add_data_stream(new_stream);
stream_pipe = ctx->consumer_data_pipe;
}
stream_pipe = ctx->consumer_data_pipe;
}
- /* Vi
t
ible to other threads */
+ /* Vi
s
ible to other threads */
new_stream->globally_visible = 1;
health_code_update();
new_stream->globally_visible = 1;
health_code_update();
@@
-983,7
+963,8
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
}
case LTTNG_CONSUMER_DISCARDED_EVENTS:
{
}
case LTTNG_CONSUMER_DISCARDED_EVENTS:
{
- uint64_t ret;
+ ssize_t ret;
+ uint64_t count;
struct lttng_consumer_channel *channel;
uint64_t id = msg.u.discarded_events.session_id;
uint64_t key = msg.u.discarded_events.channel_key;
struct lttng_consumer_channel *channel;
uint64_t id = msg.u.discarded_events.session_id;
uint64_t key = msg.u.discarded_events.channel_key;
@@
-995,15
+976,15
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
if (!channel) {
ERR("Kernel consumer discarded events channel %"
PRIu64 " not found", key);
if (!channel) {
ERR("Kernel consumer discarded events channel %"
PRIu64 " not found", key);
-
re
t = 0;
+
coun
t = 0;
} else {
} else {
-
re
t = channel->discarded_events;
+
coun
t = channel->discarded_events;
}
health_code_update();
/* Send back returned value to session daemon */
}
health_code_update();
/* Send back returned value to session daemon */
- ret = lttcomm_send_unix_sock(sock, &
ret, sizeof(re
t));
+ ret = lttcomm_send_unix_sock(sock, &
count, sizeof(coun
t));
if (ret < 0) {
PERROR("send discarded events");
goto error_fatal;
if (ret < 0) {
PERROR("send discarded events");
goto error_fatal;
@@
-1013,7
+994,8
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
}
case LTTNG_CONSUMER_LOST_PACKETS:
{
}
case LTTNG_CONSUMER_LOST_PACKETS:
{
- uint64_t ret;
+ ssize_t ret;
+ uint64_t count;
struct lttng_consumer_channel *channel;
uint64_t id = msg.u.lost_packets.session_id;
uint64_t key = msg.u.lost_packets.channel_key;
struct lttng_consumer_channel *channel;
uint64_t id = msg.u.lost_packets.session_id;
uint64_t key = msg.u.lost_packets.channel_key;
@@
-1025,15
+1007,15
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
if (!channel) {
ERR("Kernel consumer lost packets channel %"
PRIu64 " not found", key);
if (!channel) {
ERR("Kernel consumer lost packets channel %"
PRIu64 " not found", key);
-
re
t = 0;
+
coun
t = 0;
} else {
} else {
-
re
t = channel->lost_packets;
+
coun
t = channel->lost_packets;
}
health_code_update();
/* Send back returned value to session daemon */
}
health_code_update();
/* Send back returned value to session daemon */
- ret = lttcomm_send_unix_sock(sock, &
ret, sizeof(re
t));
+ ret = lttcomm_send_unix_sock(sock, &
count, sizeof(coun
t));
if (ret < 0) {
PERROR("send lost packets");
goto error_fatal;
if (ret < 0) {
PERROR("send lost packets");
goto error_fatal;
This page took
0.025056 seconds
and
4
git commands to generate.