Remove duplicate provider name checks

[lttng-ust.git] / liblttng-ust / lttng-events.c

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 64f70f92bd9701ff15936d9fb6ec84176d389187..f4a7cccda1db82df02f5e7ae432caf0053a1bb7d 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -21,6 +21,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <urcu/list.h>
 #include <urcu/hlist.h>
@@ -32,6 +33,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <time.h>
+#include <stdbool.h>
 #include <lttng/ust-endian.h>
 #include "clock.h"
 
@@ -54,6 +56,7 @@
 #include "lttng-ust-uuid.h"
 
 #include "tracepoint-internal.h"
+#include "string-utils.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
@@ -534,7 +537,6 @@ int lttng_event_create(const struct lttng_event_desc *desc,
        struct lttng_event *event;
        struct lttng_session *session = chan->session;
        struct cds_hlist_head *head;
-       struct cds_hlist_node *node;
        int ret = 0;
        size_t name_len = strlen(event_name);
        uint32_t hash;
@@ -543,15 +545,6 @@ int lttng_event_create(const struct lttng_event_desc *desc,
 
        hash = jhash(event_name, name_len, 0);
        head = &chan->session->events_ht.table[hash & (LTTNG_UST_EVENT_HT_SIZE - 1)];
-       cds_hlist_for_each_entry(event, node, head, hlist) {
-               assert(event->desc);
-               if (!strncmp(event->desc->name, desc->name,
-                                       LTTNG_UST_SYM_NAME_LEN - 1)
-                               && chan == event->chan) {
-                       ret = -EEXIST;
-                       goto exist;
-               }
-       }
 
        notify_socket = lttng_get_notify_socket(session->owner);
        if (notify_socket < 0) {
@@ -620,21 +613,19 @@ sessiond_register_error:
 cache_error:
 create_enum_error:
 socket_error:
-exist:
        return ret;
 }
 
 static
-int lttng_desc_match_wildcard_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc,
                struct lttng_enabler *enabler)
 {
        int loglevel = 0;
        unsigned int has_loglevel = 0;
 
-       assert(enabler->type == LTTNG_ENABLER_WILDCARD);
-       /* Compare excluding final '*' */
-       if (strncmp(desc->name, enabler->event_param.name,
-                       strlen(enabler->event_param.name) - 1))
+       assert(enabler->type == LTTNG_ENABLER_STAR_GLOB);
+       if (!strutils_star_glob_match(enabler->event_param.name, SIZE_MAX,
+                       desc->name, SIZE_MAX))
                return 0;
        if (desc->loglevel) {
                loglevel = *(*desc->loglevel);
@@ -674,34 +665,35 @@ static
 int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
                struct lttng_enabler *enabler)
 {
-       struct lttng_ust_excluder_node *excluder;
-
-       /* If event matches with an excluder, return 'does not match' */
-       cds_list_for_each_entry(excluder, &enabler->excluder_head, node) {
-               int count;
-
-               for (count = 0; count < excluder->excluder.count; count++) {
-                       int found, len;
-                       char *excluder_name;
-
-                       excluder_name = (char *) (excluder->excluder.names)
-                                       + count * LTTNG_UST_SYM_NAME_LEN;
-                       len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
-                       if (len > 0 && excluder_name[len - 1] == '*') {
-                               found = !strncmp(desc->name, excluder_name,
-                                               len - 1);
-                       } else {
-                               found = !strncmp(desc->name, excluder_name,
-                                               LTTNG_UST_SYM_NAME_LEN - 1);
-                       }
-                       if (found) {
-                               return 0;
+       switch (enabler->type) {
+       case LTTNG_ENABLER_STAR_GLOB:
+       {
+               struct lttng_ust_excluder_node *excluder;
+
+               if (!lttng_desc_match_star_glob_enabler(desc, enabler)) {
+                       return 0;
+               }
+
+               /*
+                * If the matching event matches with an excluder,
+                * return 'does not match'
+                */
+               cds_list_for_each_entry(excluder, &enabler->excluder_head, node) {
+                       int count;
+
+                       for (count = 0; count < excluder->excluder.count; count++) {
+                               int len;
+                               char *excluder_name;
+
+                               excluder_name = (char *) (excluder->excluder.names)
+                                               + count * LTTNG_UST_SYM_NAME_LEN;
+                               len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
+                               if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX))
+                                       return 0;
                        }
                }
+               return 1;
        }
-       switch (enabler->type) {
-       case LTTNG_ENABLER_WILDCARD:
-               return lttng_desc_match_wildcard_enabler(desc, enabler);
        case LTTNG_ENABLER_EVENT:
                return lttng_desc_match_event_enabler(desc, enabler);
        default: