X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=b64597599caaaa9e127306f0c1b0bee806c508f0;hp=7592d774177a43abb8782424084c711e371bcc5c;hb=0475c50c4d3d2cea973fe4d1f17875d231dea96c;hpb=36b588eddce05ef840bd247f6a58316925b9a0a2 diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c index 7592d7741..b64597599 100644 --- a/src/bin/lttng-sessiond/trace-ust.c +++ b/src/bin/lttng-sessiond/trace-ust.c @@ -20,12 +20,14 @@ #include #include #include +#include #include #include #include "buffer-registry.h" #include "trace-ust.h" +#include "utils.h" /* * Match function for the events hash table lookup. @@ -126,6 +128,13 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht, 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) { @@ -180,8 +189,9 @@ error: * * 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) { + int ret; struct ltt_ust_session *lus; /* Allocate a new ltt ust session */ @@ -201,7 +211,7 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id) * 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. */ @@ -209,6 +219,10 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id) /* 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) { @@ -228,7 +242,8 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id) return lus; error_consumer: - lttng_ht_destroy(lus->domain_global.channels); + ht_cleanup_push(lus->domain_global.channels); + jul_destroy_domain(&lus->domain_jul); free(lus); error: return NULL; @@ -266,12 +281,22 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan) 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); @@ -384,8 +409,8 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path) 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; @@ -430,6 +455,9 @@ struct ltt_ust_context *trace_ust_create_context( 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; @@ -443,6 +471,7 @@ struct ltt_ust_context *trace_ust_create_context( uctx->ctx.ctx = utype; lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx); + CDS_INIT_LIST_HEAD(&uctx->list); return uctx; @@ -471,11 +500,16 @@ static void destroy_contexts(struct lttng_ht *ht) 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); @@ -483,7 +517,7 @@ static void destroy_contexts(struct lttng_ht *ht) } rcu_read_unlock(); - lttng_ht_destroy(ht); + ht_cleanup_push(ht); } /* @@ -530,7 +564,7 @@ static void destroy_events(struct lttng_ht *events) } rcu_read_unlock(); - lttng_ht_destroy(events); + ht_cleanup_push(events); } /* @@ -570,6 +604,23 @@ 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); +} + /* * Cleanup ust metadata structure. */ @@ -604,7 +655,7 @@ static void destroy_channels(struct lttng_ht *channels) } rcu_read_unlock(); - lttng_ht_destroy(channels); + ht_cleanup_push(channels); } /* @@ -628,10 +679,11 @@ void trace_ust_destroy_session(struct ltt_ust_session *session) 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); + 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,