projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into compat-freebsd
[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 63381cea4df702a4bf998702fdbead9429fd8275..d758c8821cdb295ac4fa31cebad3aef13993ac3a 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-22,11
+22,10
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include <common/lttngerr.h>
#include <common/common.h>
#include <common/common.h>
+#include <common/consumer.h>
#include <common/defaults.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/defaults.h>
#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/consumer.h>
#include "ust-consumer.h"
#include "ust-consumer.h"
@@
-183,6
+182,14
@@
int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
rcu_read_lock();
cds_lfht_for_each_entry(usess->channels->ht, &iter.iter, ua_chan,
node.node) {
rcu_read_lock();
cds_lfht_for_each_entry(usess->channels->ht, &iter.iter, ua_chan,
node.node) {
+ /*
+ * Indicate that the channel was not created on the tracer side so skip
+ * sending unexisting streams.
+ */
+ if (ua_chan->obj == NULL) {
+ continue;
+ }
+
ret = send_channel_streams(sock, ua_chan, usess->uid, usess->gid);
if (ret < 0) {
rcu_read_unlock();
ret = send_channel_streams(sock, ua_chan, usess->uid, usess->gid);
if (ret < 0) {
rcu_read_unlock();
This page took
0.025288 seconds
and
4
git commands to generate.