X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_daemon.c;h=3163e1865629abe2879f0bcaeb5dd583f202c66f;hb=28e399e75eb5a26a5ab1b65b7b18b4cfd69e263d;hp=0e2d2df6670e153d4517e849a86197265a9a533e;hpb=4b2de0c0e2dc2ee4bdd0e15f9b605ee76fe05f50;p=rrdtool.git diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index 0e2d2df..3163e18 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -116,6 +116,14 @@ struct cache_item_s cache_item_t *next; }; +struct callback_flush_data_s +{ + time_t now; + char **keys; + size_t keys_num; +}; +typedef struct callback_flush_data_s callback_flush_data_t; + enum queue_side_e { HEAD, @@ -148,6 +156,8 @@ static pthread_cond_t flush_cond = PTHREAD_COND_INITIALIZER; static int config_write_interval = 300; static int config_flush_interval = 3600; +static char *config_pid_file = NULL; +static char *config_base_dir = NULL; static char **config_listen_address_list = NULL; static int config_listen_address_list_len = 0; @@ -165,6 +175,46 @@ static void sig_term_handler (int s __attribute__((unused))) /* {{{ */ do_shutdown++; } /* }}} void sig_term_handler */ +static int write_pidfile (void) /* {{{ */ +{ + pid_t pid; + char *file; + FILE *fh; + + pid = getpid (); + + file = (config_pid_file != NULL) + ? config_pid_file + : LOCALSTATEDIR "/run/rrdcached.pid"; + + fh = fopen (file, "w"); + if (fh == NULL) + { + RRDD_LOG (LOG_ERR, "write_pidfile: Opening `%s' failed.", file); + return (-1); + } + + fprintf (fh, "%i\n", (int) pid); + fclose (fh); + + return (0); +} /* }}} int write_pidfile */ + +static int remove_pidfile (void) /* {{{ */ +{ + char *file; + int status; + + file = (config_pid_file != NULL) + ? config_pid_file + : LOCALSTATEDIR "/run/rrdcached.pid"; + + status = unlink (file); + if (status == 0) + return (0); + return (errno); +} /* }}} int remove_pidfile */ + /* * enqueue_cache_item: * `cache_lock' must be acquired before calling this function! @@ -241,23 +291,42 @@ static int enqueue_cache_item (cache_item_t *ci, /* {{{ */ * Called via `g_tree_foreach' in `queue_thread_main'. `cache_lock' is held * while this is in progress. */ -static gboolean tree_callback_flush (gpointer key /* {{{ */ - __attribute__((unused)), gpointer value, gpointer data) +static gboolean tree_callback_flush (gpointer key, gpointer value, /* {{{ */ + gpointer data) { cache_item_t *ci; - time_t now; - - key = NULL; /* make compiler happy */ + callback_flush_data_t *cfd; ci = (cache_item_t *) value; - now = *((time_t *) data); + cfd = (callback_flush_data_t *) data; - if (((now - ci->last_flush_time) >= config_write_interval) + if (((cfd->now - ci->last_flush_time) >= config_write_interval) && ((ci->flags & CI_FLAGS_IN_QUEUE) == 0) && (ci->values_num > 0)) + { enqueue_cache_item (ci, TAIL); + } + else if (((cfd->now - ci->last_flush_time) >= config_flush_interval) + && ((ci->flags & CI_FLAGS_IN_QUEUE) == 0) + && (ci->values_num <= 0)) + { + char **temp; - return (TRUE); + temp = (char **) realloc (cfd->keys, + sizeof (char *) * (cfd->keys_num + 1)); + if (temp == NULL) + { + RRDD_LOG (LOG_ERR, "tree_callback_flush: realloc failed."); + return (FALSE); + } + cfd->keys = temp; + /* Make really sure this points to the _same_ place */ + assert ((char *) key == ci->file); + cfd->keys[cfd->keys_num] = (char *) key; + cfd->keys_num++; + } + + return (FALSE); } /* }}} gboolean tree_callback_flush */ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */ @@ -285,13 +354,48 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */ || ((now.tv_sec == next_flush.tv_sec) && ((1000 * now.tv_usec) > next_flush.tv_nsec))) { - time_t time_now; + callback_flush_data_t cfd; + size_t k; + memset (&cfd, 0, sizeof (cfd)); /* Pass the current time as user data so that we don't need to call * `time' for each node. */ - time_now = time (NULL); + cfd.now = time (NULL); + cfd.keys = NULL; + cfd.keys_num = 0; + + /* `tree_callback_flush' will return the keys of all values that haven't + * been touched in the last `config_flush_interval' seconds in `cfd'. + * The char*'s in this array point to the same memory as ci->file, so we + * don't need to free them separately. */ + g_tree_foreach (cache_tree, tree_callback_flush, (gpointer) &cfd); - g_tree_foreach (cache_tree, tree_callback_flush, (gpointer) &time_now); + for (k = 0; k < cfd.keys_num; k++) + { + /* This must not fail. */ + ci = (cache_item_t *) g_tree_lookup (cache_tree, cfd.keys[k]); + assert (ci != NULL); + + /* If we end up here with values available, something's seriously + * messed up. */ + assert (ci->values_num == 0); + + /* Remove the node from the tree */ + g_tree_remove (cache_tree, cfd.keys[k]); + cfd.keys[k] = NULL; + + /* Now free and clean up `ci'. */ + free (ci->file); + ci->file = NULL; + free (ci); + ci = NULL; + } /* for (k = 0; k < cfd.keys_num; k++) */ + + if (cfd.keys != NULL) + { + free (cfd.keys); + cfd.keys = NULL; + } /* Determine the time of the next cache flush. */ while (next_flush.tv_sec < now.tv_sec) @@ -432,7 +536,7 @@ static int flush_file (const char *filename) /* {{{ */ pthread_mutex_lock (&cache_lock); - ci = g_tree_lookup (cache_tree, filename); + ci = (cache_item_t *) g_tree_lookup (cache_tree, filename); if (ci == NULL) { pthread_mutex_unlock (&cache_lock); @@ -637,6 +741,14 @@ static int handle_request (int fd) /* {{{ */ RRDD_LOG (LOG_INFO, "handle_request: malformed request."); return (-1); } + + /* Accept Windows style line endings, too */ + if ((buffer_size > 2) && (buffer[buffer_size - 2] == '\r')) + { + buffer_size--; + buffer[buffer_size - 1] = '\n'; + } + /* Place the normal field separator at the end to simplify * `buffer_get_field's work. */ buffer[buffer_size - 1] = ' '; @@ -838,7 +950,7 @@ static int open_listen_socket (const char *addr) /* {{{ */ ai_hints.ai_socktype = SOCK_STREAM; ai_res = NULL; - status = getaddrinfo (addr, DEFAULT_PORT, &ai_hints, &ai_res); + status = getaddrinfo (addr, RRDCACHED_DEFAULT_PORT, &ai_hints, &ai_res); if (status != 0) { RRDD_LOG (LOG_ERR, "open_listen_socket: getaddrinfo(%s) failed: " @@ -926,7 +1038,7 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */ } if (config_listen_address_list_len < 1) - open_listen_socket (RRDD_SOCK_PATH); + open_listen_socket (RRDCACHED_DEFAULT_ADDRESS); if (listen_fds_num < 1) { @@ -1035,6 +1147,13 @@ static int daemonize (void) /* {{{ */ { pid_t child; int status; + char *base_dir; + + /* These structures are static, because `sigaction' behaves weird if the are + * overwritten.. */ + static struct sigaction sa_int; + static struct sigaction sa_term; + static struct sigaction sa_pipe; child = fork (); if (child < 0) @@ -1048,7 +1167,15 @@ static int daemonize (void) /* {{{ */ } /* Change into the /tmp directory. */ - chdir ("/tmp"); + base_dir = (config_base_dir != NULL) + ? config_base_dir + : "/tmp"; + status = chdir (base_dir); + if (status != 0) + { + fprintf (stderr, "daemonize: chdir (%s) failed.\n", base_dir); + return (-1); + } /* Become session leader */ setsid (); @@ -1062,21 +1189,18 @@ static int daemonize (void) /* {{{ */ dup (0); dup (0); - { - struct sigaction sa; + /* Install signal handlers */ + memset (&sa_int, 0, sizeof (sa_int)); + sa_int.sa_handler = sig_int_handler; + sigaction (SIGINT, &sa_int, NULL); - memset (&sa, 0, sizeof (sa)); - sa.sa_handler = sig_int_handler; - sigaction (SIGINT, &sa, NULL); + memset (&sa_term, 0, sizeof (sa_term)); + sa_term.sa_handler = sig_term_handler; + sigaction (SIGINT, &sa_term, NULL); - memset (&sa, 0, sizeof (sa)); - sa.sa_handler = sig_term_handler; - sigaction (SIGINT, &sa, NULL); - - memset (&sa, 0, sizeof (sa)); - sa.sa_handler = SIG_IGN; - sigaction (SIGPIPE, &sa, NULL); - } + memset (&sa_pipe, 0, sizeof (sa_pipe)); + sa_pipe.sa_handler = SIG_IGN; + sigaction (SIGPIPE, &sa_pipe, NULL); openlog ("rrdcached", LOG_PID, LOG_DAEMON); @@ -1096,6 +1220,8 @@ static int daemonize (void) /* {{{ */ return (-1); } + write_pidfile (); + return (0); } /* }}} int daemonize */ @@ -1110,6 +1236,8 @@ static int cleanup (void) /* {{{ */ pthread_join (queue_thread, /* return = */ NULL); RRDD_LOG (LOG_DEBUG, "cleanup: done"); + remove_pidfile (); + closelog (); return (0); @@ -1120,7 +1248,7 @@ static int read_options (int argc, char **argv) /* {{{ */ int option; int status = 0; - while ((option = getopt(argc, argv, "l:f:w:h?")) != -1) + while ((option = getopt(argc, argv, "l:f:w:b:p:h?")) != -1) { switch (option) { @@ -1177,6 +1305,47 @@ static int read_options (int argc, char **argv) /* {{{ */ } break; + case 'b': + { + size_t len; + + if (config_base_dir != NULL) + free (config_base_dir); + config_base_dir = strdup (optarg); + if (config_base_dir == NULL) + { + fprintf (stderr, "read_options: strdup failed.\n"); + return (3); + } + + len = strlen (config_base_dir); + while ((len > 0) && (config_base_dir[len - 1] == '/')) + { + config_base_dir[len - 1] = 0; + len--; + } + + if (len < 1) + { + fprintf (stderr, "Invalid base directory: %s\n", optarg); + return (4); + } + } + break; + + case 'p': + { + if (config_pid_file != NULL) + free (config_pid_file); + config_pid_file = strdup (optarg); + if (config_pid_file == NULL) + { + fprintf (stderr, "read_options: strdup failed.\n"); + return (3); + } + } + break; + case 'h': case '?': printf ("RRDd %s Copyright (C) 2008 Florian octo Forster\n" @@ -1187,6 +1356,8 @@ static int read_options (int argc, char **argv) /* {{{ */ " -l
Socket address to listen to.\n" " -w Interval in which to write data.\n" " -f Interval in which to flush dead data.\n" + " -p Location of the PID-file.\n" + " -b Base directory to change to.\n" "\n" "For more information and a detailed description of all options " "please refer\n"