projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng-enable-channel(1): move --output description to maintain A-Z ordering
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trace-kernel.c
diff --git
a/src/bin/lttng-sessiond/trace-kernel.c
b/src/bin/lttng-sessiond/trace-kernel.c
index 876fda5bbb7fd9ed8d25c0cafdd3c348ec466e7c..083add3f30f907eee80dc259b0e961f028e50ab3 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-kernel.c
+++ b/
src/bin/lttng-sessiond/trace-kernel.c
@@
-181,7
+181,7
@@
struct ltt_kernel_channel *trace_kernel_create_channel(
struct lttng_channel *chan)
{
struct ltt_kernel_channel *lkc;
struct lttng_channel *chan)
{
struct ltt_kernel_channel *lkc;
- struct lttng_channel_extended *extended;
+ struct lttng_channel_extended *extended
= NULL
;
assert(chan);
assert(chan);
@@
-221,6
+221,7
@@
struct ltt_kernel_channel *trace_kernel_create_channel(
lkc->stream_count = 0;
lkc->event_count = 0;
lkc->enabled = 1;
lkc->stream_count = 0;
lkc->event_count = 0;
lkc->enabled = 1;
+ lkc->published_to_notification_thread = false;
/* Init linked list */
CDS_INIT_LIST_HEAD(&lkc->events_list.head);
CDS_INIT_LIST_HEAD(&lkc->stream_list.head);
/* Init linked list */
CDS_INIT_LIST_HEAD(&lkc->events_list.head);
CDS_INIT_LIST_HEAD(&lkc->stream_list.head);
@@
-522,7
+523,8
@@
void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
/* Remove from channel list */
cds_list_del(&channel->list);
/* Remove from channel list */
cds_list_del(&channel->list);
- if (notification_thread_handle) {
+ if (notification_thread_handle
+ && channel->published_to_notification_thread) {
status = notification_thread_command_remove_channel(
notification_thread_handle,
channel->fd, LTTNG_DOMAIN_KERNEL);
status = notification_thread_command_remove_channel(
notification_thread_handle,
channel->fd, LTTNG_DOMAIN_KERNEL);
This page took
0.026867 seconds
and
5
git commands to generate.