X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=3e35a6c38b42a7e585e64c316efd760d3a1c51fd;hp=718e4b3c30b3894d47d20026f4103552c3f0988c;hb=c93d9daf699c3ef6e0be64a1011baec725b3e31e;hpb=b73d0b29491b7d0dc5cde3c4c65a6cd7c80479b4

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 718e4b3c3..3e35a6c38 100644
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -3,8 +3,8 @@
  *
  * 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; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -112,15 +112,15 @@ static int parse_kprobe_opts(struct lttng_event *ev, char *opt)
 	/* Check for symbol+offset */
 	ret = sscanf(opt, "%[^'+']+%li", name, &hex);
 	if (ret == 2) {
-		strncpy(ev->attr.kprobe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN);
-		DBG("kprobe symbol %s", ev->attr.kprobe.symbol_name);
+		strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN);
+		DBG("kprobe symbol %s", ev->attr.probe.symbol_name);
 		if (hex == 0) {
 			ERR("Invalid kprobe offset %lu", hex);
 			ret = -1;
 			goto error;
 		}
-		ev->attr.kprobe.offset = hex;
-		DBG("kprobe offset %lu", ev->attr.kprobe.offset);
+		ev->attr.probe.offset = hex;
+		DBG("kprobe offset %lu", ev->attr.probe.offset);
 		goto error;
 	}
 
@@ -132,8 +132,8 @@ static int parse_kprobe_opts(struct lttng_event *ev, char *opt)
 			ret = -1;
 			goto error;
 		}
-		ev->attr.kprobe.addr = hex;
-		DBG("kprobe addr %lu", ev->attr.kprobe.addr);
+		ev->attr.probe.addr = hex;
+		DBG("kprobe addr %lu", ev->attr.probe.addr);
 		goto error;
 	}
 
@@ -154,6 +154,7 @@ static int enable_events(void)
 	int err, ret = CMD_SUCCESS;
 	char *event_name, *channel_name = NULL;
 	struct lttng_event ev;
+	struct lttng_domain dom;
 
 	if (set_session_name(opt_session_name) < 0) {
 		ret = CMD_ERROR;
@@ -170,9 +171,17 @@ static int enable_events(void)
 		channel_name = opt_channel_name;
 	}
 
+	/* Create lttng domain */
+	if (opt_kernel) {
+		dom.type = LTTNG_DOMAIN_KERNEL;
+	}
+
 	if (opt_enable_all) {
 		if (opt_kernel) {
-			ret = lttng_kernel_enable_event(NULL, channel_name);
+			ret = lttng_enable_event(&dom, NULL, channel_name);
+			if (ret == 0) {
+				MSG("All kernel events are enabled in channel %s", channel_name);
+			}
 			goto error;
 		}
 
@@ -191,30 +200,29 @@ static int enable_events(void)
 			ev.type = opt_event_type;
 
 			switch (opt_event_type) {
-			case LTTNG_EVENT_TRACEPOINTS:
-				ret = lttng_kernel_enable_event(&ev, channel_name);
+			case LTTNG_EVENT_TRACEPOINT:
 				break;
-			case LTTNG_EVENT_KPROBES:
+			case LTTNG_EVENT_PROBE:
 				ret = parse_kprobe_opts(&ev, opt_kprobe);
 				if (ret < 0) {
 					ERR("Unable to parse kprobe options");
 					ret = 0;
 					goto error;
 				}
-
-				ret = lttng_kernel_enable_event(&ev, channel_name);
 				break;
 			case LTTNG_EVENT_FUNCTION:
 				strncpy(ev.attr.ftrace.symbol_name, opt_function_symbol, LTTNG_SYMBOL_NAME_LEN);
-				ret = lttng_kernel_enable_event(&ev, channel_name);
 				break;
 			default:
 				ret = CMD_NOT_IMPLEMENTED;
 				goto error;
 			}
 
-			if (ret > 0) {
+			ret = lttng_enable_event(&dom, &ev, channel_name);
+			if (ret == 0) {
 				MSG("Kernel event %s created in channel %s", event_name, channel_name);
+			} else if (ret < 0) {
+				ERR("Unable to find event %s", ev.name);
 			}
 		} else if (opt_userspace) {		/* User-space tracer action */
 			/*
@@ -255,7 +263,7 @@ int cmd_enable_events(int argc, const char **argv)
 	poptReadDefaultConfig(pc, 0);
 
 	/* Default event type */
-	opt_event_type = LTTNG_KERNEL_TRACEPOINTS;
+	opt_event_type = LTTNG_EVENT_TRACEPOINT;
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
@@ -268,13 +276,13 @@ int cmd_enable_events(int argc, const char **argv)
 			opt_cmd_name = poptGetOptArg(pc);
 			break;
 		case OPT_TRACEPOINT:
-			opt_event_type = LTTNG_EVENT_TRACEPOINTS;
+			opt_event_type = LTTNG_EVENT_TRACEPOINT;
 			break;
 		case OPT_MARKER:
 			ret = CMD_NOT_IMPLEMENTED;
 			goto end;
 		case OPT_KPROBE:
-			opt_event_type = LTTNG_EVENT_KPROBES;
+			opt_event_type = LTTNG_EVENT_PROBE;
 			opt_kprobe = poptGetOptArg(pc);
 			break;
 		case OPT_FUNCTION: