From 2b1173d8cb43cb5d7c9ce3772dbdbef3436c407e Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Thu, 7 Jul 2011 11:11:38 -0400 Subject: [PATCH] Rename kconsumerd to ltt-kconsumerd Avoid the confusion with a kernel thread in the process list. Signed-off-by: Julien Desfossez Signed-off-by: David Goulet --- Makefile.am | 2 +- configure.ac | 2 +- {kconsumerd => ltt-kconsumerd}/Makefile.am | 6 +++--- kconsumerd/kconsumerd.c => ltt-kconsumerd/ltt-kconsumerd.c | 1 - ltt-sessiond/main.c | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) rename {kconsumerd => ltt-kconsumerd}/Makefile.am (75%) rename kconsumerd/kconsumerd.c => ltt-kconsumerd/ltt-kconsumerd.c (99%) diff --git a/Makefile.am b/Makefile.am index b7c5f0f33..fe1c45cef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,6 @@ SUBDIRS = liblttsessiondcomm \ libustcomm \ libustctl \ lttng \ + ltt-kconsumerd \ ltt-sessiond \ - kconsumerd \ tests diff --git a/configure.ac b/configure.ac index 66c11b279..be7a328f6 100644 --- a/configure.ac +++ b/configure.ac @@ -44,9 +44,9 @@ AC_CONFIG_FILES([ liblttsessiondcomm/Makefile libustctl/Makefile libustcomm/Makefile + ltt-kconsumerd/Makefile ltt-sessiond/Makefile lttng/Makefile - kconsumerd/Makefile tests/Makefile tests/ltt-sessiond/Makefile ]) diff --git a/kconsumerd/Makefile.am b/ltt-kconsumerd/Makefile.am similarity index 75% rename from kconsumerd/Makefile.am rename to ltt-kconsumerd/Makefile.am index 5b678831a..ddef5460c 100644 --- a/kconsumerd/Makefile.am +++ b/ltt-kconsumerd/Makefile.am @@ -1,10 +1,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttkconsumerd -I$(top_srcdir)/liblttsessiondcomm -I$(top_srcdir)/libkernelctl -bin_PROGRAMS = kconsumerd +bin_PROGRAMS = ltt-kconsumerd -kconsumerd_SOURCES = kconsumerd.c +ltt_kconsumerd_SOURCES = ltt-kconsumerd.c -kconsumerd_LDADD = \ +ltt_kconsumerd_LDADD = \ $(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la \ $(top_builddir)/libkernelctl/libkernelctl.la \ $(top_builddir)/liblttkconsumerd/liblttkconsumerd.la diff --git a/kconsumerd/kconsumerd.c b/ltt-kconsumerd/ltt-kconsumerd.c similarity index 99% rename from kconsumerd/kconsumerd.c rename to ltt-kconsumerd/ltt-kconsumerd.c index ae2265296..60134e831 100644 --- a/kconsumerd/kconsumerd.c +++ b/ltt-kconsumerd/ltt-kconsumerd.c @@ -39,7 +39,6 @@ #include "lttngerr.h" #include "libkernelctl.h" -#include "liblttsessiondcomm.h" #include "liblttkconsumerd.h" /* the two threads (receive fd and poll) */ diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 205548bed..0effeb1f5 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -581,7 +581,7 @@ static pid_t spawn_kconsumerd(void) /* * Exec kconsumerd. */ - execlp("kconsumerd", "kconsumerd", "--verbose", NULL); + execlp("ltt-kconsumerd", "ltt-kconsumerd", "--verbose", NULL); if (errno != 0) { perror("kernel start consumer exec"); } -- 2.34.1