#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <inttypes.h>
#include <common/common.h>
#include <common/defaults.h>
#include "buffer-registry.h"
#include "trace-ust.h"
+#include "utils.h"
/*
* Match function for the events hash table lookup.
struct lttng_ht_node_str *node;
struct lttng_ht_iter iter;
+ /*
+ * If we receive an empty string for channel name, it means the
+ * default channel name is requested.
+ */
+ if (name[0] == '\0')
+ name = DEFAULT_CHANNEL_NAME;
+
lttng_ht_lookup(ht, (void *)name, &iter);
node = lttng_ht_iter_get_node_str(&iter);
if (node == NULL) {
*
* Return pointer to structure or NULL.
*/
-struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
+struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
{
struct ltt_ust_session *lus;
* during the session lifetime which is at the first enable channel and
* only before start. The flag buffer_type_changed indicates the status.
*/
- lus->buffer_type = LTTNG_BUFFER_PER_PID;
+ lus->buffer_type = LTTNG_BUFFER_PER_UID;
/* Once set to 1, the buffer_type is immutable for the session. */
lus->buffer_type_changed = 0;
/* Init it in case it get used after allocation. */
return lus;
error_consumer:
- lttng_ht_destroy(lus->domain_global.channels);
+ ht_cleanup_push(lus->domain_global.channels);
free(lus);
error:
return NULL;
break;
}
- /* Copy channel name */
- strncpy(luc->name, chan->name, sizeof(luc->name));
+ /*
+ * If we receive an empty string for channel name, it means the
+ * default channel name is requested.
+ */
+ if (chan->name[0] == '\0') {
+ strncpy(luc->name, DEFAULT_CHANNEL_NAME, sizeof(luc->name));
+ } else {
+ /* Copy channel name */
+ strncpy(luc->name, chan->name, sizeof(luc->name));
+ }
luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
/* Init node */
lttng_ht_node_init_str(&luc->node, luc->name);
+ CDS_INIT_LIST_HEAD(&luc->ctx_list);
+
/* Alloc hash tables */
luc->events = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
luc->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
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;
case LTTNG_EVENT_CONTEXT_PROCNAME:
utype = LTTNG_UST_CONTEXT_PROCNAME;
break;
+ case LTTNG_EVENT_CONTEXT_IP:
+ utype = LTTNG_UST_CONTEXT_IP;
+ break;
default:
ERR("Invalid UST context");
return NULL;
uctx->ctx.ctx = utype;
lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx);
+ CDS_INIT_LIST_HEAD(&uctx->list);
return uctx;
int ret;
struct lttng_ht_node_ulong *node;
struct lttng_ht_iter iter;
+ struct ltt_ust_context *ctx;
assert(ht);
+ rcu_read_lock();
cds_lfht_for_each_entry(ht->ht, &iter.iter, node, node) {
+ /* Remove from ordered list. */
+ ctx = caa_container_of(node, struct ltt_ust_context, node);
+ cds_list_del(&ctx->list);
+ /* Remove from channel's hash table. */
ret = lttng_ht_del(ht, &iter);
if (!ret) {
call_rcu(&node->head, destroy_context_rcu);
}
}
+ rcu_read_unlock();
- lttng_ht_destroy(ht);
+ ht_cleanup_push(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);
+ ht_cleanup_push(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);
+}
+
+/*
+ * Remove an UST channel from a channel HT.
+ */
+void trace_ust_delete_channel(struct lttng_ht *ht,
+ struct ltt_ust_channel *channel)
+{
+ int ret;
+ struct lttng_ht_iter iter;
+
+ assert(ht);
+ assert(channel);
+
+ iter.iter.node = &channel->node.node;
+ ret = lttng_ht_del(ht, &iter);
+ assert(!ret);
}
/*
assert(!ret);
call_rcu(&node->head, destroy_channel_rcu);
}
-
- lttng_ht_destroy(channels);
-
rcu_read_unlock();
+
+ ht_cleanup_push(channels);
}
/*
/*
* 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);
+ DBG2("Trace UST destroy session %" PRIu64, session->id);
/* Cleaning up UST domain */
destroy_domain_global(&session->domain_global);
consumer_destroy_output(session->tmp_consumer);
free(session);
-
- rcu_read_unlock();
}
projects / lttng-tools.git / blobdiff