X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=3f304a0902ad398bfddacc76ba97ca6595836685;hp=b5b46fb36f373fdbd3b8bcc611d0583e68522c4d;hb=53a80697a772bc2e260e3dff006f910be6709f04;hpb=e08bff8d2b9c9949e0c582f5fc17e7c3bf014dd8

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index b5b46fb36..3f304a090 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -28,6 +27,7 @@
 #include <ctype.h>
 
 #include "../command.h"
+#include <src/common/sessiond-comm/sessiond-comm.h>
 
 static char *opt_event_list;
 static int opt_event_type;
@@ -41,6 +41,7 @@ static char *opt_probe;
 static char *opt_function;
 static char *opt_function_entry_symbol;
 static char *opt_channel_name;
+static char *opt_filter;
 #if 0
 /* Not implemented yet */
 static char *opt_cmd_name;
@@ -58,6 +59,7 @@ enum {
 	OPT_LOGLEVEL,
 	OPT_LOGLEVEL_ONLY,
 	OPT_LIST_OPTIONS,
+	OPT_FILTER,
 };
 
 static struct lttng_handle *handle;
@@ -90,6 +92,7 @@ static struct poptOption long_options[] = {
 	{"loglevel",       0,     POPT_ARG_STRING, 0, OPT_LOGLEVEL, 0, 0},
 	{"loglevel-only",  0,     POPT_ARG_STRING, 0, OPT_LOGLEVEL_ONLY, 0, 0},
 	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
+	{"filter",         'f', POPT_ARG_STRING, &opt_filter, OPT_FILTER, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -162,6 +165,9 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "                               TRACE_DEBUG_LINE     = 13\n");
 	fprintf(ofp, "                               TRACE_DEBUG          = 14\n");
 	fprintf(ofp, "                               (shortcuts such as \"system\" are allowed)\n");
+	fprintf(ofp, "    --filter \'expression\'\n");
+	fprintf(ofp, "                           Filter expression on event fields,\n");
+	fprintf(ofp, "                           event recording depends on evaluation.\n");
 	fprintf(ofp, "\n");
 }
 
@@ -294,6 +300,14 @@ static int enable_events(char *session_name)
 	memset(&ev, 0, sizeof(ev));
 	memset(&dom, 0, sizeof(dom));
 
+	if (opt_kernel) {
+		if (opt_filter) {
+			ERR("Filter not implement for kernel tracing yet");
+			ret = CMD_ERROR;
+			goto error;
+		}
+	}
+
 	/* Create lttng domain */
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
@@ -346,7 +360,26 @@ static int enable_events(char *session_name)
 
 		ret = lttng_enable_event(handle, &ev, channel_name);
 		if (ret < 0) {
-			goto error;
+			switch (-ret) {
+			case LTTCOMM_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;
+		}
+		if (opt_filter) {
+			ret = lttng_set_event_filter(handle, ev.name, channel_name,
+						opt_filter);
+			if (ret < 0) {
+				ERR("Error setting filter");
+				ret = -1;
+				goto error;
+			}
 		}
 
 		switch (opt_event_type) {
@@ -493,13 +526,31 @@ static int enable_events(char *session_name)
 
 		ret = lttng_enable_event(handle, &ev, channel_name);
 		if (ret < 0) {
-			ERR("Event %s: %s (channel %s, session %s)", event_name,
-					lttng_strerror(ret), channel_name, session_name);
+			/* Turn ret to positive value to handle the positive error code */
+			switch (-ret) {
+			case LTTCOMM_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);
 		}
+		if (opt_filter) {
+			ret = lttng_set_event_filter(handle, ev.name,
+				channel_name, opt_filter);
+			if (ret < 0) {
+				ERR("Error setting filter");
+				ret = -1;
+				goto error;
+			}
+		}
 
 		/* Next event */
 		event_name = strtok(NULL, ",");
@@ -567,6 +618,8 @@ int cmd_enable_events(int argc, const char **argv)
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
 			goto end;
+		case OPT_FILTER:
+			break;
 		default:
 			usage(stderr);
 			ret = CMD_UNDEFINED;