X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=ab32994bdd95dc290a03986670c1450060f96445;hp=c6a24ada5222cd161e8287c32c6827eddfa6513a;hb=00a620843422e5c972aee0ada2181b811fc81b92;hpb=5ef79758eb474b7f658aa8ff50993d9f84913600

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index c6a24ada5..ab32994bd 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -127,7 +127,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "  -u, --userspace          Apply to the user-space tracer\n");
 	fprintf(ofp, "  -j, --jul                Apply for Java application using JUL\n");
 	fprintf(ofp, "  -l, --log4j              Apply for Java application using LOG4j\n");
-	fprintf(ofp, "  -p, --python             Apply for Java application using LOG4j\n");
+	fprintf(ofp, "  -p, --python             Apply for Python application\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Event options:\n");
 	fprintf(ofp, "    --tracepoint           Tracepoint event (default)\n");
@@ -334,6 +334,10 @@ static int loglevel_log4j_str_to_value(const char *inputstr)
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
 
+	if (!inputstr || strlen(inputstr) == 0) {
+		return -1;
+	}
+
 	/*
 	 * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
 	 * added at the end of the loop so a the upper bound we avoid the overflow.
@@ -373,6 +377,10 @@ static int loglevel_jul_str_to_value(const char *inputstr)
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
 
+	if (!inputstr || strlen(inputstr) == 0) {
+		return -1;
+	}
+
 	/*
 	 * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
 	 * added at the end of the loop so a the upper bound we avoid the overflow.
@@ -414,6 +422,10 @@ static int loglevel_python_str_to_value(const char *inputstr)
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
 
+	if (!inputstr || strlen(inputstr) == 0) {
+		return -1;
+	}
+
 	/*
 	 * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
 	 * added at the end of the loop so a the upper bound we avoid the overflow.
@@ -450,6 +462,10 @@ int loglevel_str_to_value(const char *inputstr)
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
 
+	if (!inputstr || strlen(inputstr) == 0) {
+		return -1;
+	}
+
 	/*
 	 * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
 	 * added at the end of the loop so a the upper bound we avoid the overflow.
@@ -697,11 +713,6 @@ static int enable_events(char *session_name)
 	memset(&dom, 0, sizeof(dom));
 
 	if (opt_kernel) {
-		if (opt_filter) {
-			ERR("Filter not implement for kernel tracing yet");
-			ret = CMD_ERROR;
-			goto error;
-		}
 		if (opt_loglevel) {
 			WARN("Kernel loglevels are not supported.");
 		}
@@ -761,7 +772,7 @@ static int enable_events(char *session_name)
 		/* Default setup for enable all */
 		if (opt_kernel) {
 			ev.type = opt_event_type;
-			ev.name[0] = '\0';
+			strcpy(ev.name, "*");
 			/* kernel loglevels not implemented */
 			ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 		} else {
@@ -1018,9 +1029,12 @@ static int enable_events(char *session_name)
 					print_channel_name(channel_name));
 
 			switch (opt_event_type) {
-			case LTTNG_EVENT_ALL:	/* Default behavior is tracepoint */
-				ev.type = LTTNG_EVENT_TRACEPOINT;
-				/* Fall-through */
+			case LTTNG_EVENT_ALL:	/* Enable tracepoints and syscalls */
+				/* If event name differs from *, select tracepoint. */
+				if (strcmp(ev.name, "*")) {
+					ev.type = LTTNG_EVENT_TRACEPOINT;
+				}
+				break;
 			case LTTNG_EVENT_TRACEPOINT:
 				break;
 			case LTTNG_EVENT_PROBE: