#include "trace-ust.h"
+/*
+ * Match function for the events hash table lookup.
+ *
+ * Matches by name only. Used by the disable command.
+ */
int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
const void *_key)
{
goto no_match;
}
- /* Match. */
+ /* Match */
return 1;
no_match:
return 0;
}
+/*
+ * Match function for the hash table lookup.
+ *
+ * It matches an ust event based on three attributes which are the event name,
+ * the filter bytecode and the loglevel.
+ */
int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
{
struct ltt_ust_event *event;
/* 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) {
+ if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL
+ && 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.
+ * Match is accepted. 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 since 0 is the one set by
+ * the API when receiving an enable event.
*/
} 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;
+ if (key->filter && event->filter) {
+ /* 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 no_match;
+ }
}
- DBG3("[Match] filters failed: k:%p and e:%p",
- key->filter, event->filter);
+ /* Match. */
+ return 1;
no_match:
return 0;
-
-match:
- DBG3("[MATCH] %s", key->name);
- return 1;
}
/*
struct lttng_ht_node_str *node;
struct lttng_ht_iter iter;
struct ltt_ust_ht_key key;
- void *orig_match_fct;
assert(name);
assert(ht);
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);
error:
DBG2("Trace UST event %s NOT found", key.name);
- /* Put back original match function. */
- ht->match_fct = orig_match_fct;
return NULL;
}
struct ltt_ust_session *trace_ust_create_session(char *path,
unsigned int session_id, struct lttng_domain *domain)
{
- int ret;
struct ltt_ust_session *lus;
/* Allocate a new ltt ust session */
/* Use the default consumer output which is the tracing session path. */
if (path && strlen(path) > 0) {
+ int ret;
+
ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX,
"%s" DEFAULT_UST_TRACE_DIR, path);
if (ret < 0) {
*
* Return pointer to structure or NULL.
*/
-struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
+struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+ struct lttng_filter_bytecode *filter)
{
struct ltt_ust_event *lue;
goto error_free_event;
}
+ /* Same layout. */
+ lue->filter = (struct lttng_ust_filter_bytecode *) filter;
/* Init node */
lttng_ht_node_init_str(&lue->node, lue->attr.name);