X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=93ef0c5a4c090ab94e7ddc22e2acd8a803daff34;hb=4ce78777c3ffcdd42e635ed45aa5dd3a7c7bd22d;hp=4a76267baada7f23619b89517a510afff69be0ee;hpb=911a481190c7af4c043bb5482152a76e9787c5b5;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 4a76267ba..93ef0c5a4 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -199,7 +199,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 		strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN);
 		ev->attr.probe.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 		DBG("probe symbol %s", ev->attr.probe.symbol_name);
-		if (strlen(s_hex) == 0) {
+		if (*s_hex == '\0') {
 			ERR("Invalid probe offset %s", s_hex);
 			ret = -1;
 			goto end;
@@ -227,7 +227,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 	/* Check for address */
 	ret = sscanf(opt, "%s", s_hex);
 	if (ret > 0) {
-		if (strlen(s_hex) == 0) {
+		if (*s_hex == '\0') {
 			ERR("Invalid probe address %s", s_hex);
 			ret = -1;
 			goto end;
@@ -255,7 +255,7 @@ int loglevel_str_to_value(const char *inputstr)
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
 
-	while (inputstr[i] != '\0' && i < LTTNG_SYMBOL_NAME_LEN) {
+	while (i < LTTNG_SYMBOL_NAME_LEN && inputstr[i] != '\0') {
 		str[i] = toupper(inputstr[i]);
 		i++;
 	}
@@ -301,7 +301,6 @@ int loglevel_str_to_value(const char *inputstr)
 static int enable_events(char *session_name)
 {
 	int err, ret = CMD_SUCCESS, warn = 0;
-	unsigned int event_enabled = 0;
 	char *event_name, *channel_name = NULL;
 	struct lttng_event ev;
 	struct lttng_domain dom;
@@ -320,8 +319,11 @@ static int enable_events(char *session_name)
 	/* Create lttng domain */
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
+		dom.buf_type = LTTNG_BUFFER_GLOBAL;
 	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
+		/* Default. */
+		dom.buf_type = LTTNG_BUFFER_PER_PID;
 	} else {
 		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
 		ret = CMD_ERROR;
@@ -367,62 +369,60 @@ static int enable_events(char *session_name)
 			}
 		}
 
-		/* Reset flag before enabling a new event. */
-		event_enabled = 0;
-
-		ret = lttng_enable_event(handle, &ev, channel_name);
-		if (ret < 0) {
-			switch (-ret) {
-			case LTTNG_ERR_KERN_EVENT_EXIST:
-				WARN("Kernel events already enabled (channel %s, session %s)",
-						channel_name, session_name);
-				break;
-			default:
-				ERR("Events: %s (channel %s, session %s)",
-						lttng_strerror(ret), channel_name, session_name);
-				break;
+		if (!opt_filter) {
+			ret = lttng_enable_event(handle, &ev, channel_name);
+			if (ret < 0) {
+				switch (-ret) {
+				case LTTNG_ERR_KERN_EVENT_EXIST:
+					WARN("Kernel events already enabled (channel %s, session %s)",
+							channel_name, session_name);
+					break;
+				default:
+					ERR("Events: %s (channel %s, session %s)",
+							lttng_strerror(ret), channel_name, session_name);
+					break;
+				}
+				goto end;
 			}
-			goto end;
-		}
-		event_enabled = 1;
 
-		switch (opt_event_type) {
-		case LTTNG_EVENT_TRACEPOINT:
-			if (opt_loglevel) {
-				MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
-						opt_kernel ? "kernel" : "UST", channel_name,
-						opt_loglevel);
-			} else {
-				MSG("All %s tracepoints are enabled in channel %s",
-						opt_kernel ? "kernel" : "UST", channel_name);
+			switch (opt_event_type) {
+			case LTTNG_EVENT_TRACEPOINT:
+				if (opt_loglevel) {
+					MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
+							opt_kernel ? "kernel" : "UST", channel_name,
+							opt_loglevel);
+				} else {
+					MSG("All %s tracepoints are enabled in channel %s",
+							opt_kernel ? "kernel" : "UST", channel_name);
 
+				}
+				break;
+			case LTTNG_EVENT_SYSCALL:
+				if (opt_kernel) {
+					MSG("All kernel system calls are enabled in channel %s",
+							channel_name);
+				}
+				break;
+			case LTTNG_EVENT_ALL:
+				if (opt_loglevel) {
+					MSG("All %s events are enabled in channel %s for loglevel %s",
+							opt_kernel ? "kernel" : "UST", channel_name,
+							opt_loglevel);
+				} else {
+					MSG("All %s events are enabled in channel %s",
+							opt_kernel ? "kernel" : "UST", channel_name);
+				}
+				break;
+			default:
+				/*
+				 * We should not be here since lttng_enable_event should have
+				 * failed on the event type.
+				 */
+				goto error;
 			}
-			break;
-		case LTTNG_EVENT_SYSCALL:
-			if (opt_kernel) {
-				MSG("All kernel system calls are enabled in channel %s",
-						channel_name);
-			}
-			break;
-		case LTTNG_EVENT_ALL:
-			if (opt_loglevel) {
-				MSG("All %s events are enabled in channel %s for loglevel %s",
-						opt_kernel ? "kernel" : "UST", channel_name,
-						opt_loglevel);
-			} else {
-				MSG("All %s events are enabled in channel %s",
-						opt_kernel ? "kernel" : "UST", channel_name);
-			}
-			break;
-		default:
-			/*
-			 * We should not be here since lttng_enable_event should have
-			 * failed on the event type.
-			 */
-			goto error;
 		}
-		if (opt_filter && event_enabled) {
-			ret = lttng_set_event_filter(handle, ev.name, channel_name,
+		if (opt_filter) {
+			ret = lttng_enable_event_with_filter(handle, &ev, channel_name,
 						opt_filter);
 			if (ret < 0) {
 				fprintf(stderr, "Ret filter: %d\n", ret);
@@ -437,19 +437,6 @@ static int enable_events(char *session_name)
 					ERR("%s", lttng_strerror(ret));
 				default:
 					ERR("Setting filter: '%s'", opt_filter);
-					/*
-					 * The event was successfully enabled before so when
-					 * failing to set a filter, disable the event. This has
-					 * been discussed in bug #343 on why we do that.
-					 */
-					err = lttng_disable_event(handle, ev.name, channel_name);
-					if (err < 0) {
-						ERR("Disabling all events after filter error: %s",
-								lttng_strerror(err));
-					} else {
-						WARN("All events of channel %s have been disabled due "
-								"to a filter error", channel_name);
-					}
 					break;
 				}
 				goto error;
@@ -510,7 +497,7 @@ static int enable_events(char *session_name)
 
 			if (opt_loglevel) {
 				MSG("Kernel loglevels are not supported.");
-				ret = CMD_UNDEFINED;
+				ret = CMD_UNSUPPORTED;
 				goto error;
 			}
 
@@ -543,7 +530,7 @@ static int enable_events(char *session_name)
 			case LTTNG_EVENT_SYSCALL:
 			default:
 				ERR("Event type not available for user-space tracing");
-				ret = CMD_UNDEFINED;
+				ret = CMD_UNSUPPORTED;
 				goto error;
 			}
 
@@ -564,30 +551,29 @@ static int enable_events(char *session_name)
 			goto error;
 		}
 
-		/* Reset flag before enabling a new event. */
-		event_enabled = 0;
-
-		ret = lttng_enable_event(handle, &ev, channel_name);
-		if (ret < 0) {
-			/* Turn ret to positive value to handle the positive error code */
-			switch (-ret) {
-			case LTTNG_ERR_KERN_EVENT_EXIST:
-				WARN("Kernel event %s already enabled (channel %s, session %s)",
-						event_name, channel_name, session_name);
-				break;
-			default:
-				ERR("Event %s: %s (channel %s, session %s)", event_name,
-						lttng_strerror(ret), channel_name, session_name);
-				break;
+		if (!opt_filter) {
+			ret = lttng_enable_event(handle, &ev, channel_name);
+			if (ret < 0) {
+				/* Turn ret to positive value to handle the positive error code */
+				switch (-ret) {
+				case LTTNG_ERR_KERN_EVENT_EXIST:
+					WARN("Kernel event %s already enabled (channel %s, session %s)",
+							event_name, channel_name, session_name);
+					break;
+				default:
+					ERR("Event %s: %s (channel %s, session %s)", event_name,
+							lttng_strerror(ret), channel_name, session_name);
+					break;
+				}
+				warn = 1;
+			} else {
+				MSG("%s event %s created in channel %s",
+						opt_kernel ? "kernel": "UST", event_name, channel_name);
 			}
-			warn = 1;
-		} else {
-			MSG("%s event %s created in channel %s",
-					opt_kernel ? "kernel": "UST", event_name, channel_name);
-			event_enabled = 1;
 		}
-		if (opt_filter && event_enabled) {
-			ret = lttng_set_event_filter(handle, ev.name, channel_name,
+
+		if (opt_filter) {
+			ret = lttng_enable_event_with_filter(handle, &ev, channel_name,
 					opt_filter);
 			if (ret < 0) {
 				switch (-ret) {
@@ -602,19 +588,6 @@ static int enable_events(char *session_name)
 				default:
 					ERR("Setting filter for event %s: '%s'", ev.name,
 							opt_filter);
-					/*
-					 * The event was successfully enabled before so when
-					 * failing to set a filter, disable the event. This has
-					 * been discussed in bug #343 on why we do that.
-					 */
-					err = lttng_disable_event(handle, ev.name, channel_name);
-					if (err < 0) {
-						ERR("Disabling event %s after filter error: %s",
-								ev.name, lttng_strerror(err));
-					} else {
-						WARN("Event %s of channel %s has been disabled due "
-								"to a filter error", ev.name, channel_name);
-					}
 					break;
 				}
 				goto error;