projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: only create UST metadata on start trace
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
channel.c
diff --git
a/src/bin/lttng-sessiond/channel.c
b/src/bin/lttng-sessiond/channel.c
index 984576edc2e03b68595348f643dfa2e9c19ebdbb..fc343f5910a8babab0737a90955284209438061f 100644
(file)
--- a/
src/bin/lttng-sessiond/channel.c
+++ b/
src/bin/lttng-sessiond/channel.c
@@
-65,6
+65,7
@@
struct lttng_channel *channel_new_default_attr(int dom,
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
+ chan->attr.live_timer_interval = DEFAULT_KERNEL_CHANNEL_LIVE_TIMER;
break;
case LTTNG_DOMAIN_UST:
switch (type) {
break;
case LTTNG_DOMAIN_UST:
switch (type) {
@@
-76,6
+77,8
@@
struct lttng_channel *channel_new_default_attr(int dom,
DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER;
chan->attr.read_timer_interval =
DEFAULT_UST_UID_CHANNEL_READ_TIMER;
DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER;
chan->attr.read_timer_interval =
DEFAULT_UST_UID_CHANNEL_READ_TIMER;
+ chan->attr.live_timer_interval =
+ DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
break;
case LTTNG_BUFFER_PER_PID:
default:
break;
case LTTNG_BUFFER_PER_PID:
default:
@@
-86,6
+89,8
@@
struct lttng_channel *channel_new_default_attr(int dom,
DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER;
chan->attr.read_timer_interval =
DEFAULT_UST_PID_CHANNEL_READ_TIMER;
DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER;
chan->attr.read_timer_interval =
DEFAULT_UST_PID_CHANNEL_READ_TIMER;
+ chan->attr.live_timer_interval =
+ DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
break;
}
break;
break;
}
break;
@@
-361,7
+366,10
@@
int channel_ust_create(struct ltt_ust_session *usess,
/* Adding the channel to the channel hash table. */
rcu_read_lock();
/* Adding the channel to the channel hash table. */
rcu_read_lock();
- lttng_ht_add_unique_str(usess->domain_global.channels, &uchan->node);
+ if (strncmp(uchan->name, DEFAULT_METADATA_NAME,
+ sizeof(uchan->name))) {
+ lttng_ht_add_unique_str(usess->domain_global.channels, &uchan->node);
+ }
rcu_read_unlock();
DBG2("Channel %s created successfully", uchan->name);
rcu_read_unlock();
DBG2("Channel %s created successfully", uchan->name);
This page took
0.023069 seconds
and
4
git commands to generate.