projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Missing rcu_read_lock in ust_app_get_nb_stream()
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index b0a52b33ad49ca196d62326330e70750b7028190..f120144aaaa994383fd96eea1af4d671cb78c960 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-16,6
+16,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@@
-250,6
+251,7
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
assert(ua_chan);
assert(socket);
assert(ua_chan);
assert(socket);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
msg.u.get_channel.key = ua_chan->key;
msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
msg.u.get_channel.key = ua_chan->key;
@@
-307,7
+309,7
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
cds_list_add_tail(&stream->list, &ua_chan->streams.head);
ua_chan->streams.count++;
cds_list_add_tail(&stream->list, &ua_chan->streams.head);
ua_chan->streams.count++;
- DBG2("UST app stream %d received succesfully", ua_chan->streams.count);
+ DBG2("UST app stream %d received succes
s
fully", ua_chan->streams.count);
}
/* This MUST match or else we have a synchronization problem. */
}
/* This MUST match or else we have a synchronization problem. */
@@
-344,6
+346,7
@@
int ust_consumer_destroy_channel(struct consumer_socket *socket,
assert(ua_chan);
assert(socket);
assert(ua_chan);
assert(socket);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = ua_chan->key;
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = ua_chan->key;
@@
-381,8
+384,8
@@
int ust_consumer_send_stream_to_ust(struct ust_app *app,
ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
- ERR("
Error ustctl send stream %s
to app pid: %d with ret %d",
- stream->
nam
e, app->pid, ret);
+ ERR("
ustctl send stream handle %d
to app pid: %d with ret %d",
+ stream->
obj->handl
e, app->pid, ret);
} else {
DBG3("UST app send stream to ust failed. Application is dead.");
}
} else {
DBG3("UST app send stream to ust failed. Application is dead.");
}
@@
-469,6
+472,7
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
DBG("PID registry not found for session id %" PRIu64,
request.session_id_per_pid);
DBG("PID registry not found for session id %" PRIu64,
request.session_id_per_pid);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_ERR_UND;
(void) consumer_send_msg(socket, &msg);
/*
msg.cmd_type = LTTNG_ERR_UND;
(void) consumer_send_msg(socket, &msg);
/*
This page took
0.024787 seconds
and
4
git commands to generate.