-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Path 1 to 3 are merged and pushed!
Very minor change on this patch. I added numbers before each location. Also, patch number 1 had some tabs vs space issues and whitespace letf. Just watch out next time :). Thanks! David On 12-01-12 05:50 PM, Alexandre Montplaisir wrote: > Signed-off-by: Alexandre Montplaisir <[email protected]> > --- > lttng-sessiond/main.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c > index 04ac25d..da72601 100644 > --- a/lttng-sessiond/main.c > +++ b/lttng-sessiond/main.c > @@ -1540,13 +1540,21 @@ static pid_t spawn_consumerd(struct consumer_data > *consumer_data) > * sessiond's installation directory, and > * fallback on the 32-bit one, > */ > + DBG3("Looking for a kernel consumer at these > locations:"); > + DBG3(" %s", consumerd64_bin); > + DBG3(" %s/%s", INSTALL_BIN_PATH, CONSUMERD_FILE); > + DBG3(" %s", consumerd32_bin); > if (stat(consumerd64_bin, &st) == 0) { > + DBG3("Found location #1"); > consumer_to_use = consumerd64_bin; > } else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, > &st) == 0) { > + DBG3("Found location #2"); > consumer_to_use = INSTALL_BIN_PATH "/" > CONSUMERD_FILE; > } else if (stat(consumerd32_bin, &st) == 0) { > + DBG3("Found location #3"); > consumer_to_use = consumerd32_bin; > } else { > + DBG("Could not find any valid consumerd > executable"); > break; > } > DBG("Using kernel consumer at: %s", consumer_to_use); -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJPEIF8AAoJEELoaioR9I02huUH/AxqfNKK3HYUtAM8UXBZUkSC lGiSFXmRJ1CS97iUNYvp17AaZcUOMQ+mDXkMYlcbTk9SxkABiUWfydPNHifPNNd3 ezPe3JPT1c+3qS5s2WEb+/5qpoaUQTBlI1Gid5fq1WyZccKN1r8giC99OMF8ty6M 2Hl0CFipP9ucYzGPtohD1fxhCHC6B561CeWrkYw3NtWecywuoWejKFR5fzzfndGw 2b/ciXj/Az8q1M6KkGpkEcedH6zOQjDIW5yKqwEf2Env/eoIlhSt88X8NZ+KJIGw UoqRyaK8GDwr0pFu7gp7F2a9TTOA3LmND9ctcO+PT3jLib38dG6WBJwDQfqd2bk= =Wc8S -----END PGP SIGNATURE----- _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
