X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=f3ff25642e701a0f83e78bbfd02144c1a118dfdb;hp=5e146931e5e31d848d99232068c9c4c8b59aca5a;hb=9f449915b9d44ce3c9c9255f5d491a62545fee25;hpb=b0880ae543e5a637f05aeda604e958efb523a224

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 5e146931e..f3ff25642 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -35,6 +35,7 @@
 #include <lttng/condition/condition.h>
 #include <lttng/action/action.h>
 #include <lttng/channel-internal.h>
+#include <common/string-utils/string-utils.h>
 
 #include "channel.h"
 #include "consumer.h"
@@ -61,7 +62,6 @@
 static pthread_mutex_t relayd_net_seq_idx_lock = PTHREAD_MUTEX_INITIALIZER;
 static uint64_t relayd_net_seq_idx;
 
-static int validate_event_name(const char *);
 static int validate_ust_event_name(const char *);
 static int cmd_enable_event_internal(struct ltt_session *session,
 		struct lttng_domain *domain,
@@ -245,7 +245,7 @@ end:
  */
 static void list_lttng_channels(enum lttng_domain_type domain,
 		struct ltt_session *session, struct lttng_channel *channels,
-		struct lttcomm_channel_extended *chan_exts)
+		struct lttng_channel_extended *chan_exts)
 {
 	int i = 0, ret;
 	struct ltt_kernel_channel *kchan;
@@ -259,6 +259,10 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			cds_list_for_each_entry(kchan,
 					&session->kernel_session->channel_list.head, list) {
 				uint64_t discarded_events, lost_packets;
+				struct lttng_channel_extended *extended;
+
+				extended = (struct lttng_channel_extended *)
+						kchan->channel->attr.extended.ptr;
 
 				ret = get_kernel_runtime_stats(session, kchan,
 						&discarded_events, &lost_packets);
@@ -271,6 +275,8 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 				chan_exts[i].discarded_events =
 						discarded_events;
 				chan_exts[i].lost_packets = lost_packets;
+				chan_exts[i].monitor_timer_interval =
+						extended->monitor_timer_interval;
 				i++;
 			}
 		}
@@ -323,6 +329,8 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			}
 			chan_exts[i].discarded_events = discarded_events;
 			chan_exts[i].lost_packets = lost_packets;
+			chan_exts[i].monitor_timer_interval =
+					uchan->monitor_timer_interval;
 			i++;
 		}
 		rcu_read_unlock();
@@ -1436,10 +1444,6 @@ int cmd_disable_event(struct ltt_session *session,
 	DBG("Disable event command for event \'%s\'", event->name);
 
 	event_name = event->name;
-	if (validate_event_name(event_name)) {
-		ret = LTTNG_ERR_INVALID_EVENT_NAME;
-		goto error;
-	}
 
 	/* Error out on unhandled search criteria */
 	if (event->loglevel_type || event->loglevel != -1 || event->enabled
@@ -1681,7 +1685,7 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 				free(attr);
 				goto error;
 			}
-			free(attr);
+			channel_attr_destroy(attr);
 			chan_ust_created = 1;
 		}
 
@@ -1731,43 +1735,6 @@ end:
 	return ret;
 }
 
-static int validate_event_name(const char *name)
-{
-	int ret = 0;
-	const char *c = name;
-	const char *event_name_end = c + LTTNG_SYMBOL_NAME_LEN;
-	bool null_terminated = false;
-
-	/*
-	 * Make sure that unescaped wildcards are only used as the last
-	 * character of the event name.
-	 */
-	while (c < event_name_end) {
-		switch (*c) {
-		case '\0':
-		        null_terminated = true;
-			goto end;
-		case '\\':
-			c++;
-			break;
-		case '*':
-			if ((c + 1) < event_name_end && *(c + 1)) {
-				/* Wildcard is not the last character */
-				ret = LTTNG_ERR_INVALID_EVENT_NAME;
-				goto end;
-			}
-		default:
-			break;
-		}
-		c++;
-	}
-end:
-	if (!ret && !null_terminated) {
-		ret = LTTNG_ERR_INVALID_EVENT_NAME;
-	}
-	return ret;
-}
-
 static inline bool name_starts_with(const char *name, const char *prefix)
 {
 	const size_t max_cmp_len = min(strlen(prefix), LTTNG_SYMBOL_NAME_LEN);
@@ -1813,7 +1780,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		struct lttng_event_exclusion *exclusion,
 		int wpipe, bool internal_event)
 {
-	int ret, channel_created = 0;
+	int ret = 0, channel_created = 0;
 	struct lttng_channel *attr = NULL;
 
 	assert(session);
@@ -1823,15 +1790,24 @@ static int _cmd_enable_event(struct ltt_session *session,
 	/* If we have a filter, we must have its filter expression */
 	assert(!(!!filter_expression ^ !!filter));
 
-	DBG("Enable event command for event \'%s\'", event->name);
+	/* Normalize event name as a globbing pattern */
+	strutils_normalize_star_glob_pattern(event->name);
 
-	rcu_read_lock();
+	/* Normalize exclusion names as globbing patterns */
+	if (exclusion) {
+		size_t i;
 
-	ret = validate_event_name(event->name);
-	if (ret) {
-		goto error;
+		for (i = 0; i < exclusion->count; i++) {
+			char *name = LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, i);
+
+			strutils_normalize_star_glob_pattern(name);
+		}
 	}
 
+	DBG("Enable event command for event \'%s\'", event->name);
+
+	rcu_read_lock();
+
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
 	{
@@ -2179,7 +2155,7 @@ error:
 	free(filter_expression);
 	free(filter);
 	free(exclusion);
-	free(attr);
+	channel_attr_destroy(attr);
 	rcu_read_unlock();
 	return ret;
 }
@@ -2948,8 +2924,8 @@ ssize_t cmd_list_channels(enum lttng_domain_type domain,
 
 	if (nb_chan > 0) {
 		const size_t channel_size = sizeof(struct lttng_channel) +
-			sizeof(struct lttcomm_channel_extended);
-		struct lttcomm_channel_extended *channel_exts;
+			sizeof(struct lttng_channel_extended);
+		struct lttng_channel_extended *channel_exts;
 
 		payload_size = nb_chan * channel_size;
 		*channels = zmalloc(payload_size);