Update consumerd search paths comment

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

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 4091bb0901a6be698fc17173bb2fb2e5e4c97c63..dda9168bb48222c3f9b5081baaadc6f4eb8cc48b 100644 (file)
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1527,16 +1527,17 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
                switch (consumer_data->type) {
                case LTTNG_CONSUMER_KERNEL:
                        /*
-                        * Find out which consumerd to execute. We will first
-                        * try the 64-bit path, then the 32-bit one, then
-                        * fallback on sessiond's installation directory.
+                        * Find out which consumerd to execute. We will
+                        * first try the 64-bit path, then the
+                        * sessiond's installation directory, and
+                        * fallback on the 32-bit one, 
                         */
                        if (stat(consumerd64_bin, &st) == 0) {
                                consumer_to_use = consumerd64_bin;
-                       } else if (stat(consumerd32_bin, &st) == 0) {
-                               consumer_to_use = consumerd32_bin;
                        } else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, &st) == 0) {
                                consumer_to_use = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
+                       } else if (stat(consumerd32_bin, &st) == 0) {
+                               consumer_to_use = consumerd32_bin;
                        } else {
                                break;
                        }
@@ -2093,9 +2094,7 @@ static int list_lttng_ust_global_events(char *channel_name,
                        tmp[i].type = LTTNG_EVENT_FUNCTION;
                        break;
                case LTTNG_UST_TRACEPOINT_LOGLEVEL:
-                       /* TODO */
-                       ret = -LTTCOMM_NOT_IMPLEMENTED;
-                       goto error;
+                       tmp[i].type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL;
                        break;
                }
                i++;