X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Ftrace.c;h=1cddb31fac9c6bb68a8a9f401e6567a08941f33d;hp=9a3c95956439e08a462b8e1e21f25ed050359a08;hb=8c0faa1d8372c06087498985643ec9d2619d785b;hpb=5461b305aef403f7f2e48c977c188b5526746c6e

diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c
index 9a3c95956..1cddb31fa 100644
--- a/ltt-sessiond/trace.c
+++ b/ltt-sessiond/trace.c
@@ -63,7 +63,7 @@ static struct ltt_ust_trace *find_session_ust_trace_by_pid(
  */
 int get_trace_count_per_session(struct ltt_session *session)
 {
-	return session->ust_trace_count + session->kern_trace_count;
+	return session->ust_trace_count + session->kern_session_count;
 }
 
 /*
@@ -76,7 +76,6 @@ void get_traces_per_session(struct ltt_session *session, struct lttng_trace *tra
 {
 	int i = 0;
 	struct ltt_ust_trace *ust_iter;
-	struct ltt_kernel_trace *kern_iter;
 	struct lttng_trace trace;
 
 	DBG("Getting userspace traces for session %s", session->name);
@@ -95,13 +94,10 @@ void get_traces_per_session(struct ltt_session *session, struct lttng_trace *tra
 	DBG("Getting kernel traces for session %s", session->name);
 
 	/* Getting kernel traces */
-	cds_list_for_each_entry(kern_iter, &session->kernel_traces, list) {
+	if (session->kern_session_count > 0) {
 		trace.type = KERNEL;
-		strncpy(trace.name, kern_iter->name, sizeof(trace.name));
-		trace.name[sizeof(trace.name) - 1] = '\0';
+		strncpy(trace.name, "kernel", 6);
 		memcpy(&traces[i], &trace, sizeof(trace));
-		memset(&trace, 0, sizeof(trace));
-		i++;
 	}
 }