X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Ftrace.c;h=d6bd7829d882e336f476e0f1ca8b8d55c71332e5;hp=f59c96f3f7c40f06596052dc415ee6051ae4a7b2;hb=025e01cba7ac28c217fdc99d98a46bb177dd139e;hpb=b082db07f0c522527fc95fc97f3e99eb0579c0cc

diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c
index f59c96f3f..d6bd7829d 100644
--- a/ltt-sessiond/trace.c
+++ b/ltt-sessiond/trace.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
@@ -24,7 +24,6 @@
 #include <urcu/list.h>
 
 #include "lttngerr.h"
-#include "ltt-sessiond.h"
 #include "trace.h"
 
 /*
@@ -176,20 +175,20 @@ struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
 	}
 
 	switch (ev->type) {
-	case LTTNG_EVENT_KPROBES:
-		attr->instrumentation = LTTNG_KERNEL_KPROBES;
-		attr->u.kprobe.addr = ev->attr.kprobe.addr;
-		attr->u.kprobe.offset = ev->attr.kprobe.offset;
+	case LTTNG_EVENT_PROBE:
+		attr->instrumentation = LTTNG_KERNEL_KPROBE;
+		attr->u.kprobe.addr = ev->attr.probe.addr;
+		attr->u.kprobe.offset = ev->attr.probe.offset;
 		strncpy(attr->u.kprobe.symbol_name,
-				ev->attr.kprobe.symbol_name, LTTNG_SYM_NAME_LEN);
+				ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
 		break;
 	case LTTNG_EVENT_FUNCTION:
 		attr->instrumentation = LTTNG_KERNEL_FUNCTION;
 		strncpy(attr->u.ftrace.symbol_name,
 				ev->attr.ftrace.symbol_name, LTTNG_SYM_NAME_LEN);
 		break;
-	case LTTNG_EVENT_TRACEPOINTS:
-		attr->instrumentation = LTTNG_KERNEL_TRACEPOINTS;
+	case LTTNG_EVENT_TRACEPOINT:
+		attr->instrumentation = LTTNG_KERNEL_TRACEPOINT;
 		break;
 	default:
 		ERR("Unknown kernel instrumentation type (%d)", ev->type);
@@ -217,7 +216,7 @@ error:
  *
  *  Return pointer to structure or NULL.
  */
-struct ltt_kernel_metadata *trace_create_kernel_metadata(void)
+struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path)
 {
 	int ret;
 	struct ltt_kernel_metadata *lkm;
@@ -242,7 +241,7 @@ struct ltt_kernel_metadata *trace_create_kernel_metadata(void)
 	lkm->fd = 0;
 	lkm->conf = chan;
 	/* Set default metadata path */
-	ret = asprintf(&lkm->pathname, "%s/metadata", DEFAULT_TRACE_OUTPUT);
+	ret = asprintf(&lkm->pathname, "%s/metadata", path);
 	if (ret < 0) {
 		perror("asprintf kernel metadata");
 		goto error;