X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=18ad1568fbb5074bbddd60bc99835bb49967d24e;hp=c855daa19e194ee5d6e432f89771b907bd909340;hb=24758c5f;hpb=395aeb9da9c9cc2febe91b5a906c72e59e217594 diff --git a/daemon.c b/daemon.c index c855daa1..18ad1568 100644 --- a/daemon.c +++ b/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2009 Andre Noll + * Copyright (C) 1997-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -10,6 +10,7 @@ #include #include /* getgrnam() */ #include +#include #include "para.h" #include "daemon.h" @@ -24,7 +25,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. */ @@ -54,10 +54,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]); } /** @@ -66,10 +64,8 @@ void daemon_set_default_log_colors(void) * \param arg The loglevel/color specifier. * * \a arg must be of the form "ll:[fg [bg]] [attr]". - * - * \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; @@ -81,14 +77,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); } /** @@ -141,19 +134,30 @@ void daemon_clear_flag(unsigned flag) me->flags &= ~flag; } -static unsigned daemon_test_flag(unsigned flag) +static bool daemon_test_flag(unsigned flag) { return me->flags & flag; } +static void dummy_sighandler(__a_unused int s) +{ +} + /** * Do the usual stuff to become a daemon. * - * Fork, become session leader, dup fd 0, 1, 2 to /dev/null. + * \param parent_waits Whether the parent process should pause before exit. + * + * Fork, become session leader, cd to /, and dup fd 0, 1, 2 to /dev/null. If \a + * parent_waits is false, the parent process terminates immediately. + * Otherwise, it calls pause() to sleep until it receives \p SIGTERM or \p + * SIGCHLD and exits successfully thereafter. This behaviour is useful if the + * daemon process should not detach from the console until the child process + * has completed its setup. * - * \sa fork(2), setsid(2), dup(2). + * \sa fork(2), setsid(2), dup(2), pause(2). */ -void daemonize(void) +void daemonize(bool parent_waits) { pid_t pid; int null; @@ -162,8 +166,14 @@ void daemonize(void) pid = fork(); if (pid < 0) goto err; - if (pid) + if (pid) { + if (parent_waits) { + signal(SIGTERM, dummy_sighandler); + signal(SIGCHLD, dummy_sighandler); + pause(); + } exit(EXIT_SUCCESS); /* parent exits */ + } /* become session leader */ if (setsid() < 0) goto err; @@ -280,43 +290,59 @@ void drop_privileges_or_die(const char *username, const char *groupname) } /** - * Set/get the server uptime. + * Set the server startup time. + * + * \param startuptime The value to store as the server start time. * - * \param set_or_get Chose one of the two modes. + * 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. * - * 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. + * \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. * - * \sa time(2), difftime(3). + * \param current_time The current time. + * + * 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); } @@ -327,13 +353,14 @@ __malloc char *uptime_str(void) * \param ll The log level. * \param fmt The format string describing the log message. */ -__printf_2_3 void para_log(int ll, const char* fmt,...) +__printf_2_3 void daemon_log(int ll, const char* fmt,...) { va_list argp; FILE *fp; struct tm *tm; - time_t t1; char *color; + bool log_time = daemon_test_flag(DF_LOG_TIME), log_timing = + daemon_test_flag(DF_LOG_TIMING); ll = PARA_MIN(ll, NUM_LOGLEVELS - 1); ll = PARA_MAX(ll, LL_DEBUG); @@ -344,12 +371,18 @@ __printf_2_3 void para_log(int ll, const char* fmt,...) color = daemon_test_flag(DF_COLOR_LOG)? me->log_colors[ll] : NULL; if (color) fprintf(fp, "%s", color); - if (daemon_test_flag(DF_LOG_TIME)) { /* print date and time */ - char str[100]; - time(&t1); - tm = localtime(&t1); - strftime(str, sizeof(str), "%b %d %H:%M:%S", tm); - fprintf(fp, "%s ", str); + if (log_time || log_timing) { + struct timeval tv; + clock_get_realtime(&tv); + if (daemon_test_flag(DF_LOG_TIME)) { /* print date and time */ + time_t t1 = tv.tv_sec; + char str[100]; + tm = localtime(&t1); + strftime(str, sizeof(str), "%b %d %H:%M:%S", tm); + fprintf(fp, "%s%s", str, log_timing? ":" : " "); + } + if (log_timing) /* print milliseconds */ + fprintf(fp, "%04lu ", (long unsigned)tv.tv_usec / 1000); } if (daemon_test_flag(DF_LOG_HOSTNAME)) { if (!me->hostname)