lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
lum->attr.subbuf_size = default_get_metadata_subbuf_size();
lum->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
- lum->attr.switch_timer_interval = DEFAULT_UST_CHANNEL_SWITCH_TIMER;
- lum->attr.read_timer_interval = DEFAULT_UST_CHANNEL_READ_TIMER;
+ lum->attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER;
+ lum->attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;
lum->attr.output = LTTNG_UST_MMAP;
lum->handle = -1;
assert(ht);
+ rcu_read_lock();
cds_lfht_for_each_entry(ht->ht, &iter.iter, node, node) {
ret = lttng_ht_del(ht, &iter);
if (!ret) {
call_rcu(&node->head, destroy_context_rcu);
}
}
+ rcu_read_unlock();
lttng_ht_destroy(ht);
}
assert(events);
+ rcu_read_lock();
cds_lfht_for_each_entry(events->ht, &iter.iter, node, node) {
ret = lttng_ht_del(events, &iter);
assert(!ret);
call_rcu(&node->head, destroy_event_rcu);
}
+ rcu_read_unlock();
lttng_ht_destroy(events);
}
/*
* Cleanup ust channel structure.
+ *
+ * Should _NOT_ be called with RCU read lock held.
*/
-void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
+static void _trace_ust_destroy_channel(struct ltt_ust_channel *channel)
{
assert(channel);
DBG2("Trace destroy UST channel %s", channel->name);
- rcu_read_lock();
-
/* Destroying all events of the channel */
destroy_events(channel->events);
/* Destroying all context of the channel */
destroy_contexts(channel->ctx);
free(channel);
-
- rcu_read_unlock();
}
/*
struct ltt_ust_channel *channel =
caa_container_of(node, struct ltt_ust_channel, node);
- trace_ust_destroy_channel(channel);
+ _trace_ust_destroy_channel(channel);
+}
+
+void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
+{
+ call_rcu(&channel->node.head, destroy_channel_rcu);
}
/*
assert(!ret);
call_rcu(&node->head, destroy_channel_rcu);
}
+ rcu_read_unlock();
lttng_ht_destroy(channels);
-
- rcu_read_unlock();
}
/*
/*
* Cleanup ust session structure
+ *
+ * Should *NOT* be called with RCU read-side lock held.
*/
void trace_ust_destroy_session(struct ltt_ust_session *session)
{
assert(session);
- rcu_read_lock();
-
DBG2("Trace UST destroy session %u", session->id);
/* Cleaning up UST domain */
consumer_destroy_output(session->tmp_consumer);
free(session);
-
- rcu_read_unlock();
}