X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Ftrace.c;h=621e4dd3f67d7fda38ac38cbab288666ed4a6460;hb=809dc2811860434a76e4f10cb9f05d938148090c;hp=41c4355e939fa67e4c8a7f8b2c4d660e4fc0e6ff;hpb=cbbbb2757f90ecfc8bc2f51ba5bad8ed614577bb;p=lttng-tools.git

diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c
index 41c4355e9..621e4dd3f 100644
--- a/ltt-sessiond/trace.c
+++ b/ltt-sessiond/trace.c
@@ -103,6 +103,7 @@ struct ltt_kernel_session *trace_create_kernel_session(void)
 	lks->channel_count = 0;
 	lks->stream_count_global = 0;
 	lks->metadata = NULL;
+	lks->consumer_fd = 0;
 	CDS_INIT_LIST_HEAD(&lks->channel_list.head);
 
 	return lks;
@@ -183,11 +184,22 @@ struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
 		attr->u.kprobe.offset = ev->attr.probe.offset;
 		strncpy(attr->u.kprobe.symbol_name,
 				ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
+		attr->u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
 		break;
 	case LTTNG_EVENT_FUNCTION:
+		attr->instrumentation = LTTNG_KERNEL_KRETPROBE;
+		attr->u.kretprobe.addr = ev->attr.probe.addr;
+		attr->u.kretprobe.offset = ev->attr.probe.offset;
+		attr->u.kretprobe.offset = ev->attr.probe.offset;
+		strncpy(attr->u.kretprobe.symbol_name,
+				ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
+		attr->u.kretprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+		break;
+	case LTTNG_EVENT_FUNCTION_ENTRY:
 		attr->instrumentation = LTTNG_KERNEL_FUNCTION;
 		strncpy(attr->u.ftrace.symbol_name,
 				ev->attr.ftrace.symbol_name, LTTNG_SYM_NAME_LEN);
+		attr->u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
 		break;
 	case LTTNG_EVENT_TRACEPOINT:
 		attr->instrumentation = LTTNG_KERNEL_TRACEPOINT;
@@ -199,6 +211,7 @@ struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
 
 	/* Copy event name */
 	strncpy(attr->name, ev->name, LTTNG_SYM_NAME_LEN);
+	attr->name[LTTNG_SYM_NAME_LEN - 1] = '\0';
 
 	/* Setting up a kernel event */
 	lke->fd = 0;
@@ -234,8 +247,8 @@ struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path)
 
 	/* Set default attributes */
 	chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
-	chan->attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
-	chan->attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
+	chan->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE;
+	chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
 	chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
 	chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
 	chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;