X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=ffdec4e35f3e8cdbd113a780f6d6ade7faf9fcfe;hp=eef504f1b972f20b9a8b5aa22d0efc0ae80f1396;hb=a7a72ca4acf7f44abca866d410e2bc80590e7fab;hpb=b0fe6d882dd35b01360a66e130d6714aff7b6a0d

diff --git a/daemon.c b/daemon.c
index eef504f1..ffdec4e3 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -26,7 +26,6 @@ struct daemon {
 	char *logfile_name;
 	/** Current loglevel, see \ref daemon_set_loglevel(). */
 	int loglevel;
-
 	/** Used by \ref server_uptime() and \ref uptime_str(). */
 	time_t startuptime;
 	/** The file pointer if the logfile is open. */
@@ -56,10 +55,8 @@ void daemon_set_default_log_colors(void)
 		[LL_CRIT] = "magenta bold",
 		[LL_EMERG] = "red bold",
 	};
-	for (i = 0; i < NUM_LOGLEVELS; i++) {
-		int ret = color_parse(default_log_colors[i], me->log_colors[i]);
-		assert(ret >= 0);
-	}
+	for (i = 0; i < NUM_LOGLEVELS; i++)
+		color_parse_or_die(default_log_colors[i], me->log_colors[i]);
 }
 
 /**
@@ -71,7 +68,7 @@ void daemon_set_default_log_colors(void)
  *
  * \return 1 On success, -1 on errors.
  */
-int daemon_set_log_color(char const *arg)
+void daemon_set_log_color_or_die(char const *arg)
 {
 	char *p = strchr(arg, ':');
 	int ret, ll;
@@ -83,14 +80,11 @@ int daemon_set_log_color(char const *arg)
 		goto err;
 	ll = ret;
 	p++;
-	ret = color_parse(p, me->log_colors[ll]);
-	if (ret < 0)
-		goto err;
-	return 1;
+	color_parse_or_die(p, me->log_colors[ll]);
+	return;
 err:
-	PARA_ERROR_LOG("%s: color syntax error\n", arg);
-	return -1;
-
+	PARA_EMERG_LOG("%s: color syntax error\n", arg);
+	exit(EXIT_FAILURE);
 }
 
 /**
@@ -282,43 +276,59 @@ void drop_privileges_or_die(const char *username, const char *groupname)
 }
 
 /**
- * Set/get the server uptime.
+ * Set the server startup time.
  *
- * \param set_or_get Chose one of the two modes.
+ * \param startuptime The value to store as the server start time.
  *
- * This should be called at startup time with \a set_or_get equal to \p
- * UPTIME_SET which sets the uptime to zero.  Subsequent calls with \a
- * set_or_get equal to \p UPTIME_GET return the uptime.
+ * This should be called once on startup with \a startuptime either NULL or a
+ * pointer to a struct timeval which contains the current time. If \a
+ * startuptime is NULL, the server start time is set to the current time.
+ *
+ * \sa time(2), difftime(3) \ref get_server_uptime(), \ref
+ * get_server_uptime_str().
+ */
+void set_server_start_time(const struct timeval *startuptime)
+{
+	if (startuptime)
+		me->startuptime = startuptime->tv_sec;
+	else
+		time(&me->startuptime);
+}
 
- * \return Zero if called with \a set_or_get equal to \p UPTIME_SET, the number
- * of seconds elapsed since the last reset otherwise.
+/**
+ * Get the server uptime.
+ *
+ * \param current_time The current time.
  *
- * \sa time(2), difftime(3).
+ * The \a current_time pointer may be \p NULL. In this case the function
+ * obtains the current time from the system.
+ *
+ * \return This returns the server uptime in seconds, i.e. the difference
+ * between the current time and the value stored previously via \ref
+ * set_server_start_time().
  */
-time_t server_uptime(enum uptime set_or_get)
+time_t get_server_uptime(const struct timeval *current_time)
 {
-	time_t now;
-	double diff;
+	time_t t;
 
-	if (set_or_get == UPTIME_SET) {
-		time(&me->startuptime);
-		return 0;
-	}
-	time(&now);
-	diff = difftime(now, me->startuptime);
-	return (time_t) diff;
+	if (current_time)
+		return current_time->tv_sec - me->startuptime;
+	time(&t);
+	return difftime(t, me->startuptime);
 }
 
 /**
- * Construct string containing uptime.
+ * Construct a string containing the current uptime.
+ *
+ * \param current_time See a \ref get_server_uptime().
  *
  * \return A dynamically allocated string of the form "days:hours:minutes".
  *
  * \sa server_uptime.
  */
-__malloc char *uptime_str(void)
+__malloc char *get_server_uptime_str(const struct timeval *current_time)
 {
-	long t = server_uptime(UPTIME_GET);
+	long t = get_server_uptime(current_time);
 	return make_message("%li:%02li:%02li", t / 86400,
 		(t / 3600) % 24, (t / 60) % 60);
 }