From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 6 Dec 2011 21:07:51 +0000 (-0500)
Subject: Prefer using the native consumer over 32-bit consumer for kernel
X-Git-Tag: v2.0-pre15~26
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=eb1e0bd499a6f47d2bcc5a2b828356101d8b00c3;ds=sidebyside

Prefer using the native consumer over 32-bit consumer for kernel

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 86112f473..a153b2351 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1533,10 +1533,10 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			 */
 			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;
 			}