X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Ftrace-ust.c;h=c85e79ce14fba897c280d1efaefa3d3602664cc0;hp=1a1304ac1db9a16d0f3cfd5ca05ddbd9fd3cdc37;hb=7bd3904781fa78155c13952f5d5cb9ab42f44a08;hpb=9fdb49d8eac3ff67f553743fb8ce0edee14c3ab6 diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c index 1a1304ac1..c85e79ce1 100644 --- a/lttng-sessiond/trace-ust.c +++ b/lttng-sessiond/trace-ust.c @@ -22,22 +22,23 @@ #include #include +#include #include -#include "hashtable.h" #include "trace-ust.h" /* * Find the channel in the hashtable. */ -struct ltt_ust_channel *trace_ust_find_channel_by_name(struct cds_lfht *ht, +struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht, char *name) { - struct cds_lfht_node *node; - struct cds_lfht_iter iter; + struct lttng_ht_node_str *node; + struct lttng_ht_iter iter; rcu_read_lock(); - node = hashtable_lookup(ht, (void *) name, strlen(name), &iter); + lttng_ht_lookup(ht, (void *)name, &iter); + node = lttng_ht_iter_get_node_str(&iter); if (node == NULL) { rcu_read_unlock(); goto error; @@ -56,14 +57,15 @@ error: /* * Find the event in the hashtable. */ -struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht, +struct ltt_ust_event *trace_ust_find_event_by_name(struct lttng_ht *ht, char *name) { - struct cds_lfht_node *node; - struct cds_lfht_iter iter; + struct lttng_ht_node_str *node; + struct lttng_ht_iter iter; rcu_read_lock(); - node = hashtable_lookup(ht, (void *) name, strlen(name), &iter); + lttng_ht_lookup(ht, (void *) name, &iter); + node = lttng_ht_iter_get_node_str(&iter); if (node == NULL) { rcu_read_unlock(); goto error; @@ -84,7 +86,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid, +struct ltt_ust_session *trace_ust_create_session(char *path, int session_id, struct lttng_domain *domain) { int ret; @@ -98,15 +100,15 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid, } /* Init data structure */ - lus->uid = uid; + lus->id = session_id; lus->start_trace = 0; /* Alloc UST domain hash tables */ - lus->domain_pid = hashtable_new(0); - lus->domain_exec = hashtable_new_str(0); + lus->domain_pid = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + lus->domain_exec = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); /* Alloc UST global domain channels' HT */ - lus->domain_global.channels = hashtable_new_str(0); + lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING); /* Set session path */ ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path); @@ -158,14 +160,14 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan, } /* Copy channel name */ - strncpy(luc->name, chan->name, sizeof(&luc->name)); + strncpy(luc->name, chan->name, sizeof(luc->name)); luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; /* Init node */ - hashtable_node_init(&luc->node, (void *) luc->name, strlen(luc->name)); + lttng_ht_node_init_str(&luc->node, luc->name); /* Alloc hash tables */ - luc->events = hashtable_new_str(0); - luc->ctx = hashtable_new(0); + 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); @@ -212,6 +214,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev) case LTTNG_EVENT_TRACEPOINT: lue->attr.instrumentation = LTTNG_UST_TRACEPOINT; break; + case LTTNG_EVENT_TRACEPOINT_LOGLEVEL: + lue->attr.instrumentation = LTTNG_UST_TRACEPOINT_LOGLEVEL; + break; default: ERR("Unknown ust instrumentation type (%d)", ev->type); goto error_free_event; @@ -222,10 +227,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev) lue->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; /* Init node */ - hashtable_node_init(&lue->node, (void *) lue->attr.name, - strlen(lue->attr.name)); + lttng_ht_node_init_str(&lue->node, lue->attr.name); /* Alloc context hash tables */ - lue->ctx = hashtable_new(0); + lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); DBG2("Trace UST event %s created", lue->attr.name); @@ -294,8 +298,7 @@ struct ltt_ust_context *trace_ust_create_context( } uctx->ctx.ctx = ctx->ctx; - hashtable_node_init(&uctx->node, (void *)((unsigned long) uctx->ctx.ctx), - sizeof(void *)); + lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx); return uctx; @@ -308,8 +311,8 @@ error: */ static void destroy_context_rcu(struct rcu_head *head) { - struct cds_lfht_node *node = - caa_container_of(head, struct cds_lfht_node, head); + struct lttng_ht_node_ulong *node = + caa_container_of(head, struct lttng_ht_node_ulong, head); struct ltt_ust_context *ctx = caa_container_of(node, struct ltt_ust_context, node); @@ -319,20 +322,20 @@ static void destroy_context_rcu(struct rcu_head *head) /* * Cleanup UST context hash table. */ -static void destroy_context(struct cds_lfht *ht) +static void destroy_contexts(struct lttng_ht *ht) { int ret; - struct cds_lfht_node *node; - struct cds_lfht_iter iter; + struct lttng_ht_node_ulong *node; + struct lttng_ht_iter iter; - cds_lfht_for_each(ht, &iter, node) { - ret = hashtable_del(ht, &iter); + 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); } } - hashtable_destroy(ht); + lttng_ht_destroy(ht); } /* @@ -341,7 +344,7 @@ static void destroy_context(struct cds_lfht *ht) void trace_ust_destroy_event(struct ltt_ust_event *event) { DBG2("Trace destroy UST event %s", event->attr.name); - destroy_context(event->ctx); + destroy_contexts(event->ctx); free(event); } @@ -351,8 +354,8 @@ void trace_ust_destroy_event(struct ltt_ust_event *event) */ static void destroy_event_rcu(struct rcu_head *head) { - struct cds_lfht_node *node = - caa_container_of(head, struct cds_lfht_node, head); + struct lttng_ht_node_str *node = + caa_container_of(head, struct lttng_ht_node_str, head); struct ltt_ust_event *event = caa_container_of(node, struct ltt_ust_event, node); @@ -362,20 +365,19 @@ static void destroy_event_rcu(struct rcu_head *head) /* * Cleanup UST events hashtable. */ -static void destroy_event(struct cds_lfht *events) +static void destroy_events(struct lttng_ht *events) { int ret; - struct cds_lfht_node *node; - struct cds_lfht_iter iter; + struct lttng_ht_node_str *node; + struct lttng_ht_iter iter; - cds_lfht_for_each(events, &iter, node) { - ret = hashtable_del(events, &iter); - if (!ret) { - call_rcu(&node->head, destroy_event_rcu); - } + 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); } - hashtable_destroy(events); + lttng_ht_destroy(events); } /* @@ -383,22 +385,15 @@ static void destroy_event(struct cds_lfht *events) */ void trace_ust_destroy_channel(struct ltt_ust_channel *channel) { - int ret; - struct cds_lfht_node *node; - struct cds_lfht_iter iter; - DBG2("Trace destroy UST channel %s", channel->name); rcu_read_lock(); - cds_lfht_for_each(channel->events, &iter, node) { - ret = hashtable_del(channel->events, &iter); - if (!ret) { - destroy_event(channel->events); - } - } + /* Destroying all events of the channel */ + destroy_events(channel->events); + /* Destroying all context of the channel */ + destroy_contexts(channel->ctx); - destroy_context(channel->ctx); free(channel); rcu_read_unlock(); @@ -409,8 +404,8 @@ void trace_ust_destroy_channel(struct ltt_ust_channel *channel) */ static void destroy_channel_rcu(struct rcu_head *head) { - struct cds_lfht_node *node = - caa_container_of(head, struct cds_lfht_node, head); + struct lttng_ht_node_str *node = + caa_container_of(head, struct lttng_ht_node_str, head); struct ltt_ust_channel *channel = caa_container_of(node, struct ltt_ust_channel, node); @@ -430,58 +425,59 @@ void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata) /* * Iterate over a hash table containing channels and cleanup safely. */ -static void destroy_channels(struct cds_lfht *channels) +static void destroy_channels(struct lttng_ht *channels) { int ret; - struct cds_lfht_node *node; - struct cds_lfht_iter iter; + struct lttng_ht_node_str *node; + struct lttng_ht_iter iter; - cds_lfht_for_each(channels, &iter, node) { - ret = hashtable_del(channels, &iter); - if (!ret) { - call_rcu(&node->head, destroy_channel_rcu); - } + rcu_read_lock(); + + cds_lfht_for_each_entry(channels->ht, &iter.iter, node, node) { + ret = lttng_ht_del(channels, &iter); + assert(!ret); + call_rcu(&node->head, destroy_channel_rcu); } - hashtable_destroy(channels); + lttng_ht_destroy(channels); + + rcu_read_unlock(); } /* * Cleanup UST pid domain. */ -static void destroy_domain_pid(struct cds_lfht *ht) +static void destroy_domain_pid(struct lttng_ht *ht) { int ret; - struct cds_lfht_iter iter; + struct lttng_ht_iter iter; struct ltt_ust_domain_pid *dpid; - cds_lfht_for_each_entry(ht, &iter, dpid, node) { - ret = hashtable_del(ht , &iter); - if (!ret) { - destroy_channels(dpid->channels); - } + cds_lfht_for_each_entry(ht->ht, &iter.iter, dpid, node.node) { + ret = lttng_ht_del(ht , &iter); + assert(!ret); + destroy_channels(dpid->channels); } - hashtable_destroy(ht); + lttng_ht_destroy(ht); } /* * Cleanup UST exec name domain. */ -static void destroy_domain_exec(struct cds_lfht *ht) +static void destroy_domain_exec(struct lttng_ht *ht) { int ret; - struct cds_lfht_iter iter; + struct lttng_ht_iter iter; struct ltt_ust_domain_exec *dexec; - cds_lfht_for_each_entry(ht, &iter, dexec, node) { - ret = hashtable_del(ht , &iter); - if (!ret) { - destroy_channels(dexec->channels); - } + cds_lfht_for_each_entry(ht->ht, &iter.iter, dexec, node.node) { + ret = lttng_ht_del(ht , &iter); + assert(!ret); + destroy_channels(dexec->channels); } - hashtable_destroy(ht); + lttng_ht_destroy(ht); } /* @@ -504,7 +500,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session) rcu_read_lock(); - DBG2("Trace UST destroy session %d", session->uid); + DBG2("Trace UST destroy session %d", session->id); /* Cleaning up UST domain */ destroy_domain_global(&session->domain_global);