#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(char *path,
- unsigned int session_id)
+struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
{
+ int ret;
struct ltt_ust_session *lus;
/* Allocate a new ltt ust session */
lus->id = session_id;
lus->start_trace = 0;
- /* Alloc UST domain hash tables */
- lus->domain_pid = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
- lus->domain_exec = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+ /*
+ * Default buffer type. This can be changed through an enable channel
+ * requesting a different type. Note that this can only be changed once
+ * 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_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. */
+ CDS_INIT_LIST_HEAD(&lus->buffer_reg_uid_list);
/* Alloc UST global domain channels' HT */
lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
+ ret = jul_init_domain(&lus->domain_jul);
+ if (ret < 0) {
+ goto error_consumer;
+ }
lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
if (lus->consumer == NULL) {
*/
lus->tmp_consumer = NULL;
- /* Use the default consumer output which is the tracing session path. */
- if (*path != '\0') {
- int ret;
-
- ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX,
- "%s" DEFAULT_UST_TRACE_DIR, path);
- if (ret < 0) {
- PERROR("snprintf UST consumer trace path");
- goto error_path;
- }
-
- /* Set session path */
- ret = snprintf(lus->pathname, PATH_MAX, "%s" DEFAULT_UST_TRACE_DIR,
- path);
- if (ret < 0) {
- PERROR("snprintf kernel traces path");
- goto error_path;
- }
- }
-
DBG2("UST trace session create successful");
return lus;
-error_path:
- consumer_destroy_output(lus->consumer);
error_consumer:
- lttng_ht_destroy(lus->domain_global.channels);
- lttng_ht_destroy(lus->domain_exec);
- lttng_ht_destroy(lus->domain_pid);
+ ht_cleanup_push(lus->domain_global.channels);
+ jul_destroy_domain(&lus->domain_jul);
free(lus);
error:
return NULL;
*
* Return pointer to structure or NULL.
*/
-struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
- char *path)
+struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan)
{
- int ret;
struct ltt_ust_channel *luc;
assert(chan);
- assert(path);
luc = zmalloc(sizeof(struct ltt_ust_channel));
if (luc == 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);
- /* Set trace output path */
- ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
- if (ret < 0) {
- PERROR("asprintf ust create channel");
- goto error_free_channel;
- }
+ /* On-disk circular buffer parameters */
+ luc->tracefile_size = chan->attr.tracefile_size;
+ luc->tracefile_count = chan->attr.tracefile_count;
DBG2("Trace UST channel %s created", luc->name);
- return luc;
-
-error_free_channel:
- lttng_ht_destroy(luc->ctx);
- lttng_ht_destroy(luc->events);
- free(luc);
error:
- return NULL;
+ return luc;
}
/*
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_CHANNEL_SWITCH_TIMER;
- lum->attr.read_timer_interval = DEFAULT_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();
-}
-/*
- * Cleanup UST pid domain.
- */
-static void destroy_domain_pid(struct lttng_ht *ht)
-{
- int ret;
- struct lttng_ht_iter iter;
- struct ltt_ust_domain_pid *dpid;
-
- assert(ht);
-
- cds_lfht_for_each_entry(ht->ht, &iter.iter, dpid, node.node) {
- ret = lttng_ht_del(ht , &iter);
- assert(!ret);
- destroy_channels(dpid->channels);
- }
-
- lttng_ht_destroy(ht);
-}
-
-/*
- * Cleanup UST exec name domain.
- */
-static void destroy_domain_exec(struct lttng_ht *ht)
-{
- int ret;
- struct lttng_ht_iter iter;
- struct ltt_ust_domain_exec *dexec;
-
- assert(ht);
-
- cds_lfht_for_each_entry(ht->ht, &iter.iter, dexec, node.node) {
- ret = lttng_ht_del(ht , &iter);
- assert(!ret);
- destroy_channels(dexec->channels);
- }
-
- lttng_ht_destroy(ht);
+ 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);
+ struct buffer_reg_uid *reg, *sreg;
- rcu_read_lock();
+ assert(session);
- 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);
- destroy_domain_pid(session->domain_pid);
- destroy_domain_exec(session->domain_exec);
+ jul_destroy_domain(&session->domain_jul);
+
+ /* Cleanup UID buffer registry object(s). */
+ cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,
+ lnode) {
+ cds_list_del(®->lnode);
+ buffer_reg_uid_remove(reg);
+ buffer_reg_uid_destroy(reg, session->consumer);
+ }
consumer_destroy_output(session->consumer);
consumer_destroy_output(session->tmp_consumer);
free(session);
-
- rcu_read_unlock();
}
projects / lttng-tools.git / blobdiff