X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=f4a7cccda1db82df02f5e7ae432caf0053a1bb7d;hb=0fdd0b8989a06910521827f82058f7100d9b6b8e;hp=fa54a025a967226b5527384c9217849e97ea1c83;hpb=196ec2df2bce805b8c26582f10f2964a8d1da443;p=lttng-ust.git diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c index fa54a025..f4a7cccd 100644 --- a/liblttng-ust/lttng-events.c +++ b/liblttng-ust/lttng-events.c @@ -537,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; @@ -546,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) { @@ -623,7 +613,6 @@ sessiond_register_error: cache_error: create_enum_error: socket_error: -exist: return ret; } @@ -635,8 +624,8 @@ int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc, unsigned int has_loglevel = 0; assert(enabler->type == LTTNG_ENABLER_STAR_GLOB); - if (!strutils_star_glob_match(enabler->event_param.name, -1ULL, - desc->name, -1ULL)) + if (!strutils_star_glob_match(enabler->event_param.name, SIZE_MAX, + desc->name, SIZE_MAX)) return 0; if (desc->loglevel) { loglevel = *(*desc->loglevel); @@ -699,7 +688,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc, 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, -1ULL)) + if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX)) return 0; } }