projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the sessiond "ready" counter mechanism
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel-consumer.c
diff --git
a/src/bin/lttng-sessiond/kernel-consumer.c
b/src/bin/lttng-sessiond/kernel-consumer.c
index 05e447754bb2156a77b6ce3d8dc1555f84973864..9ccad8be4e87dd19cd4e0212acbbd64c4330a4af 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-117,7
+117,7
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
enum lttng_error_code status;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
enum lttng_error_code status;
- struct ltt_session *session;
+ struct ltt_session *session
= NULL
;
struct lttng_channel_extended *channel_attr_extended;
/* Safety net */
struct lttng_channel_extended *channel_attr_extended;
/* Safety net */
@@
-191,6
+191,9
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
channel->published_to_notification_thread = true;
error:
channel->published_to_notification_thread = true;
error:
+ if (session) {
+ session_put(session);
+ }
free(pathname);
return ret;
}
free(pathname);
return ret;
}
@@
-207,7
+210,7
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
char *pathname;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
char *pathname;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
- struct ltt_session *session;
+ struct ltt_session *session
= NULL
;
rcu_read_lock();
rcu_read_lock();
@@
-284,6
+287,9
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
error:
rcu_read_unlock();
free(pathname);
error:
rcu_read_unlock();
free(pathname);
+ if (session) {
+ session_put(session);
+ }
return ret;
}
return ret;
}
@@
-379,7
+385,7
@@
int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
{
int ret = LTTNG_OK;
struct ltt_kernel_stream *stream;
{
int ret = LTTNG_OK;
struct ltt_kernel_stream *stream;
- struct ltt_session *session;
+ struct ltt_session *session
= NULL
;
/* Safety net */
assert(channel);
/* Safety net */
assert(channel);
@@
-428,6
+434,9
@@
int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
error:
rcu_read_unlock();
error:
rcu_read_unlock();
+ if (session) {
+ session_put(session);
+ }
return ret;
}
return ret;
}
This page took
0.030681 seconds
and
4
git commands to generate.