X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=962255b5c930989100600592253e56589b1fe22d;hp=4001ec87bdd8359f6224a1915e84c62f9c22486a;hb=18eace3ba4aeaa6b869c8ad9ec1273381b4cbdee;hpb=53a80697a772bc2e260e3dff006f910be6709f04 diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c index 4001ec87b..962255b5c 100644 --- a/src/bin/lttng-sessiond/trace-ust.c +++ b/src/bin/lttng-sessiond/trace-ust.c @@ -26,6 +26,96 @@ #include "trace-ust.h" +int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node, + const void *_key) +{ + struct ltt_ust_event *event; + const char *name; + + assert(node); + assert(_key); + + event = caa_container_of(node, struct ltt_ust_event, node.node); + name = _key; + + /* Event name */ + if (strncmp(event->attr.name, name, sizeof(event->attr.name)) != 0) { + goto no_match; + } + + /* Match. */ + return 1; + +no_match: + return 0; +} + +int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key) +{ + struct ltt_ust_event *event; + const struct ltt_ust_ht_key *key; + + assert(node); + assert(_key); + + event = caa_container_of(node, struct ltt_ust_event, node.node); + key = _key; + + /* Match the 3 elements of the key: name, filter and loglevel. */ + + /* Event name */ + if (strncmp(event->attr.name, key->name, sizeof(event->attr.name)) != 0) { + DBG3("[Match] name failed: %s and %s", + event->attr.name, key->name); + goto no_match; + } + + /* Event loglevel. */ + if (event->attr.loglevel != key->loglevel) { + if (event->attr.loglevel_type == 0 && key->loglevel == 0 && + event->attr.loglevel == -1) { + /* + * This is because on event creation, the loglevel is set to -1 if + * the event loglevel type is ALL so 0 and -1 are accepted for this + * loglevel type. + */ + } else { + DBG3("[Match] loglevel failed: %d and %d", + event->attr.loglevel, key->loglevel); + goto no_match; + } + } + + /* Only one of the filters is NULL, fail. */ + if ((key->filter && !event->filter) || (!key->filter && event->filter)) { + DBG3("[Match] filters failed: k:%p and e:%p", + key->filter, event->filter); + goto no_match; + } + + /* Both filters are NULL, success. */ + if (!key->filter && !event->filter) { + goto match; + } + + /* Both filters exists, check length followed by the bytecode. */ + if (event->filter->len == key->filter->len && + memcmp(event->filter->data, key->filter->data, + event->filter->len) == 0) { + goto match; + } + + DBG3("[Match] filters failed: k:%p and e:%p", + key->filter, event->filter); + +no_match: + return 0; + +match: + DBG3("[MATCH] %s", key->name); + return 1; +} + /* * Find the channel in the hashtable. */ @@ -56,27 +146,40 @@ error: /* * Find the event in the hashtable. */ -struct ltt_ust_event *trace_ust_find_event_by_name(struct lttng_ht *ht, - char *name) +struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, + char *name, struct lttng_filter_bytecode *filter, int loglevel) { struct lttng_ht_node_str *node; struct lttng_ht_iter iter; + struct ltt_ust_ht_key key; + void *orig_match_fct; - rcu_read_lock(); - lttng_ht_lookup(ht, (void *) name, &iter); + assert(name); + assert(ht); + + key.name = name; + key.filter = filter; + key.loglevel = loglevel; + + /* Save match function so we can use the ust app event match. */ + orig_match_fct = (void *) ht->match_fct; + ht->match_fct = trace_ust_ht_match_event; + + cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed), + trace_ust_ht_match_event, &key, &iter.iter); node = lttng_ht_iter_get_node_str(&iter); if (node == NULL) { - rcu_read_unlock(); goto error; } - rcu_read_unlock(); - DBG2("Trace UST event found by name %s", name); + DBG2("Trace UST event %s found", key.name); return caa_container_of(node, struct ltt_ust_event, node); error: - DBG2("Trace UST event NOT found by name %s", name); + DBG2("Trace UST event %s NOT found", key.name); + /* Put back original match function. */ + ht->match_fct = orig_match_fct; return NULL; } @@ -111,7 +214,7 @@ struct ltt_ust_session *trace_ust_create_session(char *path, lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL); if (lus->consumer == NULL) { - goto error; + goto error_consumer; } /* @@ -123,24 +226,30 @@ struct ltt_ust_session *trace_ust_create_session(char *path, lus->tmp_consumer = NULL; /* Use the default consumer output which is the tracing session path. */ - ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX, "%s/ust", path); - if (ret < 0) { - PERROR("snprintf UST consumer trace path"); - goto error; - } + if (path && strlen(path) > 0) { + 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/ust", path); - if (ret < 0) { - PERROR("snprintf kernel traces path"); - goto error_free_session; + /* 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_free_session: +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); @@ -268,12 +377,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev) /* Init node */ lttng_ht_node_init_str(&lue->node, lue->attr.name); - /* Alloc context hash tables */ - lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); - if (lue->ctx == NULL) { - ERR("Unable to create context hash table for event %s", ev->name); - goto error_free_event; - } DBG2("Trace UST event %s, loglevel (%d,%d) created", lue->attr.name, lue->attr.loglevel_type, @@ -305,7 +408,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path) /* Set default attributes */ lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; - lum->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE; + 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; @@ -409,7 +512,6 @@ static void destroy_contexts(struct lttng_ht *ht) void trace_ust_destroy_event(struct ltt_ust_event *event) { DBG2("Trace destroy UST event %s", event->attr.name); - destroy_contexts(event->ctx); free(event->filter); free(event); } @@ -574,6 +676,9 @@ void trace_ust_destroy_session(struct ltt_ust_session *session) destroy_domain_pid(session->domain_pid); destroy_domain_exec(session->domain_exec); + consumer_destroy_output(session->consumer); + consumer_destroy_output(session->tmp_consumer); + free(session); rcu_read_unlock();