From b7904bffb08b7f715ef30d58520bb9fde7e35e85 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 4 Mar 2016 11:41:19 +0200
Subject: [PATCH] Expose maxscale starttime.

Maxinfo needs access to the time MaxScale was started.
Now exposed in a way similar to the uptime.
---
 server/core/gateway.c     |  2 +-
 server/core/misc.c        | 16 ++++++++++++----
 server/include/maxscale.h |  6 +++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/server/core/gateway.c b/server/core/gateway.c
index ee9336953..9dc266aef 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -1291,7 +1291,7 @@ int main(int argc, char **argv)
     *maxlog_enabled = 1;
     *log_to_shm = 0;
 
-    maxscale_reset_uptime();
+    maxscale_reset_starttime();
 
     sigemptyset(&sigpipe_mask);
     sigaddset(&sigpipe_mask, SIGPIPE);
diff --git a/server/core/misc.c b/server/core/misc.c
index 9cf681f59..a52ffdaea 100644
--- a/server/core/misc.c
+++ b/server/core/misc.c
@@ -20,14 +20,22 @@
 #include <maxscale.h>
 #include <time.h>
 
-static time_t maxscale_started;
+static time_t started;
 
 /**
  * Reset the start time from which the uptime is calculated.
  */
-void maxscale_reset_uptime(void)
+void maxscale_reset_starttime(void)
 {
-    maxscale_started = time(0);
+    started = time(0);
+}
+
+/**
+ * Return the time when MaxScale was started.
+ */
+time_t maxscale_started(void)
+{
+    return started;
 }
 
 /**
@@ -37,5 +45,5 @@ void maxscale_reset_uptime(void)
  */
 int maxscale_uptime()
 {
-    return time(0) - maxscale_started;
+    return time(0) - started;
 }
diff --git a/server/include/maxscale.h b/server/include/maxscale.h
index ad790cd00..3f5c78b6e 100644
--- a/server/include/maxscale.h
+++ b/server/include/maxscale.h
@@ -32,6 +32,9 @@
  * @endverbatim
  */
 
+#include <time.h>
+
+
 /* Exit status for MaxScale */
 #define	MAXSCALE_SHUTDOWN	0	/* Good shutdown */
 #define MAXSCALE_BADCONFIG	1	/* Configuration fiel error */
@@ -41,7 +44,8 @@
 #define MAXSCALE_BADARG		5	/* Bad command line argument */
 #define MAXSCALE_INTERNALERROR	6	/* Internal error, see error log */
 
-void maxscale_reset_uptime(void);
+void maxscale_reset_starttime(void);
+time_t maxscale_started(void);
 int maxscale_uptime(void);
 
 #endif