From 432b38d71c9d351ab607ed45a343d1d54154ab87 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Tue, 2 Oct 2018 14:06:17 -0400
Subject: [PATCH] Rename sessiond-timer.[hc] to timer.[hc]
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

There is no need to namespace the timer files as they are already
contained withing the lttng-sessiond directory.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/bin/lttng-sessiond/Makefile.am                   | 2 +-
 src/bin/lttng-sessiond/cmd.c                         | 2 +-
 src/bin/lttng-sessiond/main.c                        | 2 +-
 src/bin/lttng-sessiond/rotation-thread.c             | 2 +-
 src/bin/lttng-sessiond/{sessiond-timer.c => timer.c} | 2 +-
 src/bin/lttng-sessiond/{sessiond-timer.h => timer.h} | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/bin/lttng-sessiond/{sessiond-timer.c => timer.c} (99%)
 rename src/bin/lttng-sessiond/{sessiond-timer.h => timer.h} (100%)

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index d57c63963..2e4b95dce 100644
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -39,7 +39,7 @@ lttng_sessiond_SOURCES = utils.c utils.h \
                        sessiond-config.h sessiond-config.c \
                        rotate.h rotate.c \
                        rotation-thread.h rotation-thread.c \
-                       sessiond-timer.c sessiond-timer.h
+                       timer.c timer.h
 
 if HAVE_LIBLTTNG_UST_CTL
 lttng_sessiond_SOURCES += trace-ust.c ust-registry.c ust-app.c \
diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 0d860236e..b1bcc10a5 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -57,7 +57,7 @@
 #include "notification-thread-commands.h"
 #include "rotate.h"
 #include "rotation-thread.h"
-#include "sessiond-timer.h"
+#include "timer.h"
 #include "agent-thread.h"
 
 #include "cmd.h"
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index bd111029c..67d990027 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -81,7 +81,7 @@
 #include "agent.h"
 #include "ht-cleanup.h"
 #include "sessiond-config.h"
-#include "sessiond-timer.h"
+#include "timer.h"
 
 static const char *help_msg =
 #ifdef LTTNG_EMBED_HELP
diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 5b0267952..2dfd97357 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -42,7 +42,7 @@
 #include "rotate.h"
 #include "cmd.h"
 #include "session.h"
-#include "sessiond-timer.h"
+#include "timer.h"
 #include "notification-thread-commands.h"
 
 #include <urcu.h>
diff --git a/src/bin/lttng-sessiond/sessiond-timer.c b/src/bin/lttng-sessiond/timer.c
similarity index 99%
rename from src/bin/lttng-sessiond/sessiond-timer.c
rename to src/bin/lttng-sessiond/timer.c
index b8cf4825a..06d1d4a98 100644
--- a/src/bin/lttng-sessiond/sessiond-timer.c
+++ b/src/bin/lttng-sessiond/timer.c
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <signal.h>
 
-#include "sessiond-timer.h"
+#include "timer.h"
 #include "health-sessiond.h"
 #include "rotation-thread.h"
 
diff --git a/src/bin/lttng-sessiond/sessiond-timer.h b/src/bin/lttng-sessiond/timer.h
similarity index 100%
rename from src/bin/lttng-sessiond/sessiond-timer.h
rename to src/bin/lttng-sessiond/timer.h
-- 
2.34.1