Update loglevel ABI

[lttng-tools.git] / src / bin / lttng-sessiond / main.c

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 9b2d1fe0079c91753877dec1ca724466187ac9f3..8e4afb00ba0827295d86f53ed728763eb5ebe463 100644 (file)
--- 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++;