X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=8e4afb00ba0827295d86f53ed728763eb5ebe463;hb=dad47fc4c65ec0acbfedc676895833b465d25cd6;hp=4e5771f03639b476748c97a459e8c7aab0829fee;hpb=bbccc3d2cb9f83aecf00a207de9eef68c766bf9c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 4e5771f03..8e4afb00b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -314,7 +314,7 @@ error:
 static void teardown_kernel_session(struct ltt_session *session)
 {
 	if (!session->kernel_session) {
-		DBG3("No kernel session when tearingdown session");
+		DBG3("No kernel session when tearing down session");
 		return;
 	}
 
@@ -340,7 +340,7 @@ static void teardown_ust_session(struct ltt_session *session)
 	int ret;
 
 	if (!session->ust_session) {
-		DBG3("No UST session when tearingdown session");
+		DBG3("No UST session when tearing down session");
 		return;
 	}
 
@@ -397,7 +397,7 @@ static void cleanup(void)
 	}
 	free(cmd);
 
-	DBG("Cleaning up all session");
+	DBG("Cleaning up all sessions");
 
 	/* Destroy session list mutex */
 	if (session_list_ptr != NULL) {
@@ -2031,8 +2031,15 @@ static int list_lttng_ust_global_events(char *channel_name,
 		case LTTNG_UST_FUNCTION:
 			tmp[i].type = LTTNG_EVENT_FUNCTION;
 			break;
-		case LTTNG_UST_TRACEPOINT_LOGLEVEL:
-			tmp[i].type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL;
+		}
+		strncpy(tmp[i].loglevel, uevent->attr.loglevel, LTTNG_SYMBOL_NAME_LEN);
+		tmp[i].loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+		switch (uevent->attr.loglevel_type) {
+		case LTTNG_UST_LOGLEVEL:
+			tmp[i].type = LTTNG_EVENT_LOGLEVEL;
+			break;
+		case LTTNG_UST_LOGLEVEL_ONLY:
+			tmp[i].type = LTTNG_EVENT_LOGLEVEL_ONLY;
 			break;
 		}
 		i++;
@@ -4077,14 +4084,14 @@ static void sighandler(int sig)
 {
 	switch (sig) {
 	case SIGPIPE:
-		DBG("SIGPIPE caugth");
+		DBG("SIGPIPE caught");
 		return;
 	case SIGINT:
-		DBG("SIGINT caugth");
+		DBG("SIGINT caught");
 		stop_threads();
 		break;
 	case SIGTERM:
-		DBG("SIGTERM caugth");
+		DBG("SIGTERM caught");
 		stop_threads();
 		break;
 	default:
@@ -4158,6 +4165,8 @@ int main(int argc, char **argv)
 	void *status;
 	const char *home_path;
 
+	init_kernel_workarounds();
+
 	rcu_register_thread();
 
 	/* Create thread quit pipe */