#include "rrd_client.h"
#include <stdlib.h>
+
+#ifndef WIN32
#include <stdint.h>
-#include <stdio.h>
#include <unistd.h>
-#include <string.h>
#include <strings.h>
-#include <stdint.h>
#include <inttypes.h>
+# include <sys/socket.h>
+
+#else
+
+#endif
+#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
-#include <sys/socket.h>
#include <sys/un.h>
#include <netdb.h>
#include <poll.h>
};
typedef struct listen_socket_s listen_socket_t;
+struct command;
+/* note: guard against "unused" warnings in the handlers */
+#define DISPATCH_PROTO listen_socket_t *sock __attribute__((unused)),\
+ time_t now __attribute__((unused)),\
+ char *buffer __attribute__((unused)),\
+ size_t buffer_size __attribute__((unused))
+
+#define HANDLER_PROTO struct command *cmd __attribute__((unused)),\
+ DISPATCH_PROTO
+
+struct command {
+ char *cmd;
+ int (*handler)(HANDLER_PROTO);
+ socket_privilege min_priv;
+
+ char context; /* where we expect to see it */
+#define CMD_CONTEXT_CLIENT (1<<0)
+#define CMD_CONTEXT_BATCH (1<<1)
+#define CMD_CONTEXT_JOURNAL (1<<2)
+#define CMD_CONTEXT_ANY (0x7f)
+
+ char *syntax;
+ char *help;
+};
+
struct cache_item_s;
typedef struct cache_item_s cache_item_t;
struct cache_item_s
static int do_shutdown = 0;
-static pthread_t queue_thread;
+static pthread_t *queue_threads;
+static pthread_cond_t queue_cond = PTHREAD_COND_INITIALIZER;
+static int config_queue_threads = 4;
+
+static pthread_t flush_thread;
+static pthread_cond_t flush_cond = PTHREAD_COND_INITIALIZER;
-static pthread_t *connection_threads = NULL;
static pthread_mutex_t connection_threads_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t connection_threads_done = PTHREAD_COND_INITIALIZER;
static int connection_threads_num = 0;
/* Cache stuff */
static cache_item_t *cache_queue_head = NULL;
static cache_item_t *cache_queue_tail = NULL;
static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t cache_cond = PTHREAD_COND_INITIALIZER;
static int config_write_interval = 300;
static int config_write_jitter = 0;
static void journal_done(void);
static void journal_rotate(void);
+/* prototypes for forward refernces */
+static int handle_request_help (HANDLER_PROTO);
+
/*
* Functions
*/
{
RRDD_LOG(LOG_NOTICE, "caught SIG%s", sig);
do_shutdown++;
- pthread_cond_broadcast(&cache_cond);
+ pthread_cond_broadcast(&flush_cond);
+ pthread_cond_broadcast(&queue_cond);
} /* }}} void sig_common */
static void sig_int_handler (int s __attribute__((unused))) /* {{{ */
assert(sock != NULL);
- new_buf = realloc(sock->wbuf, sock->wbuf_len + len + 1);
+ new_buf = rrd_realloc(sock->wbuf, sock->wbuf_len + len + 1);
if (new_buf == NULL)
{
RRDD_LOG(LOG_ERR, "add_to_wbuf: realloc failed");
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
- len = vsnprintf(buffer, sizeof(buffer)-1, fmt, argp);
+ len = vsnprintf(buffer, sizeof(buffer), fmt, argp);
#else
len = vsprintf(buffer, fmt, argp);
#endif
rclen = sprintf(buffer, "%d ", lines);
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
- len = vsnprintf(buffer+rclen, sizeof(buffer)-rclen-1, fmt, argp);
+ len = vsnprintf(buffer+rclen, sizeof(buffer)-rclen, fmt, argp);
#else
len = vsprintf(buffer+rclen, fmt, argp);
#endif
ci->last_flush_time = when;
if (config_write_jitter > 0)
- ci->last_flush_time += (random() % config_write_jitter);
+ ci->last_flush_time += (rrd_random() % config_write_jitter);
}
/* remove_from_queue
ci->next = ci->prev = NULL;
ci->flags &= ~CI_FLAGS_IN_QUEUE;
+
+ pthread_mutex_lock (&stats_lock);
+ assert (stats_queue_length > 0);
+ stats_queue_length--;
+ pthread_mutex_unlock (&stats_lock);
+
} /* }}} static void remove_from_queue */
/* free the resources associated with the cache_item_t
ci->flags |= CI_FLAGS_IN_QUEUE;
- pthread_cond_broadcast(&cache_cond);
+ pthread_cond_signal(&queue_cond);
pthread_mutex_lock (&stats_lock);
stats_queue_length++;
pthread_mutex_unlock (&stats_lock);
/*
* tree_callback_flush:
- * Called via `g_tree_foreach' in `queue_thread_main'. `cache_lock' is held
+ * Called via `g_tree_foreach' in `flush_thread_main'. `cache_lock' is held
* while this is in progress.
*/
static gboolean tree_callback_flush (gpointer key, gpointer value, /* {{{ */
{
char **temp;
- temp = (char **) realloc (cfd->keys,
+ temp = (char **) rrd_realloc (cfd->keys,
sizeof (char *) * (cfd->keys_num + 1));
if (temp == NULL)
{
return (0);
} /* int flush_old_values */
-static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
+static void *flush_thread_main (void *args __attribute__((unused))) /* {{{ */
{
struct timeval now;
struct timespec next_flush;
- int final_flush = 0; /* make sure we only flush once on shutdown */
+ int status;
gettimeofday (&now, NULL);
next_flush.tv_sec = now.tv_sec + config_flush_interval;
next_flush.tv_nsec = 1000 * now.tv_usec;
- pthread_mutex_lock (&cache_lock);
- while ((do_shutdown == 0) || (cache_queue_head != NULL))
- {
- cache_item_t *ci;
- char *file;
- char **values;
- int values_num;
- int status;
- int i;
+ pthread_mutex_lock(&cache_lock);
- /* First, check if it's time to do the cache flush. */
+ while (!do_shutdown)
+ {
gettimeofday (&now, NULL);
if ((now.tv_sec > next_flush.tv_sec)
|| ((now.tv_sec == next_flush.tv_sec)
pthread_mutex_lock(&cache_lock);
}
+ status = pthread_cond_timedwait(&flush_cond, &cache_lock, &next_flush);
+ if (status != 0 && status != ETIMEDOUT)
+ {
+ RRDD_LOG (LOG_ERR, "flush_thread_main: "
+ "pthread_cond_timedwait returned %i.", status);
+ }
+ }
+
+ if (config_flush_at_shutdown)
+ flush_old_values (-1); /* flush everything */
+
+ pthread_mutex_unlock(&cache_lock);
+
+ return NULL;
+} /* void *flush_thread_main */
+
+static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
+{
+ pthread_mutex_lock (&cache_lock);
+
+ while (!do_shutdown
+ || (cache_queue_head != NULL && config_flush_at_shutdown))
+ {
+ cache_item_t *ci;
+ char *file;
+ char **values;
+ int values_num;
+ int status;
+ int i;
+
/* Now, check if there's something to store away. If not, wait until
- * something comes in or it's time to do the cache flush. if we are
- * shutting down, do not wait around. */
+ * something comes in. if we are shutting down, do not wait around. */
if (cache_queue_head == NULL && !do_shutdown)
{
- status = pthread_cond_timedwait (&cache_cond, &cache_lock, &next_flush);
+ status = pthread_cond_wait (&queue_cond, &cache_lock);
if ((status != 0) && (status != ETIMEDOUT))
{
RRDD_LOG (LOG_ERR, "queue_thread_main: "
- "pthread_cond_timedwait returned %i.", status);
+ "pthread_cond_wait returned %i.", status);
}
}
- /* We're about to shut down */
- if (do_shutdown != 0 && !final_flush++)
- {
- if (config_flush_at_shutdown)
- flush_old_values (-1); /* flush everything */
- else
- break;
- }
-
/* Check if a value has arrived. This may be NULL if we timed out or there
* was an interrupt such as a signal. */
if (cache_queue_head == NULL)
wipe_ci_values(ci, time(NULL));
remove_from_queue(ci);
- pthread_mutex_lock (&stats_lock);
- assert (stats_queue_length > 0);
- stats_queue_length--;
- pthread_mutex_unlock (&stats_lock);
-
pthread_mutex_unlock (&cache_lock);
rrd_clear_error ();
}
pthread_mutex_lock (&cache_lock);
-
- /* We're about to shut down */
- if (do_shutdown != 0 && !final_flush++)
- {
- if (config_flush_at_shutdown)
- flush_old_values (-1); /* flush everything */
- else
- break;
- }
- } /* while ((do_shutdown == 0) || (cache_queue_head != NULL)) */
- pthread_mutex_unlock (&cache_lock);
-
- if (config_flush_at_shutdown)
- {
- assert(cache_queue_head == NULL);
- RRDD_LOG(LOG_INFO, "clean shutdown; all RRDs flushed");
}
-
- journal_done();
+ pthread_mutex_unlock (&cache_lock);
return (NULL);
} /* }}} void *queue_thread_main */
return (0);
} /* }}} int flush_file */
-static int handle_request_help (listen_socket_t *sock, /* {{{ */
- char *buffer, size_t buffer_size)
+static int syntax_error(listen_socket_t *sock, struct command *cmd) /* {{{ */
{
- int status;
- char **help_text;
- char *command;
-
- char *help_help[2] =
- {
- "Command overview\n"
- ,
- "HELP [<command>]\n"
- "FLUSH <filename>\n"
- "FLUSHALL\n"
- "PENDING <filename>\n"
- "FORGET <filename>\n"
- "UPDATE <filename> <values> [<values> ...]\n"
- "BATCH\n"
- "STATS\n"
- };
+ char *err = "Syntax error.\n";
- char *help_flush[2] =
- {
- "Help for FLUSH\n"
- ,
- "Usage: FLUSH <filename>\n"
- "\n"
- "Adds the given filename to the head of the update queue and returns\n"
- "after is has been dequeued.\n"
- };
+ if (cmd && cmd->syntax)
+ err = cmd->syntax;
- char *help_flushall[2] =
- {
- "Help for FLUSHALL\n"
- ,
- "Usage: FLUSHALL\n"
- "\n"
- "Triggers writing of all pending updates. Returns immediately.\n"
- };
+ return send_response(sock, RESP_ERR, "Usage: %s", err);
+} /* }}} static int syntax_error() */
- char *help_pending[2] =
- {
- "Help for PENDING\n"
- ,
- "Usage: PENDING <filename>\n"
- "\n"
- "Shows any 'pending' updates for a file, in order.\n"
- "The updates shown have not yet been written to the underlying RRD file.\n"
- };
-
- char *help_forget[2] =
- {
- "Help for FORGET\n"
- ,
- "Usage: FORGET <filename>\n"
- "\n"
- "Removes the file completely from the cache.\n"
- "Any pending updates for the file will be lost.\n"
- };
-
- char *help_update[2] =
- {
- "Help for UPDATE\n"
- ,
- "Usage: UPDATE <filename> <values> [<values> ...]\n"
- "\n"
- "Adds the given file to the internal cache if it is not yet known and\n"
- "appends the given value(s) to the entry. See the rrdcached(1) manpage\n"
- "for details.\n"
- "\n"
- "Each <values> has the following form:\n"
- " <values> = <time>:<value>[:<value>[...]]\n"
- "See the rrdupdate(1) manpage for details.\n"
- };
-
- char *help_stats[2] =
- {
- "Help for STATS\n"
- ,
- "Usage: STATS\n"
- "\n"
- "Returns some performance counters, see the rrdcached(1) manpage for\n"
- "a description of the values.\n"
- };
-
- char *help_batch[2] =
- {
- "Help for BATCH\n"
- ,
- "The 'BATCH' command permits the client to initiate a bulk load\n"
- " of commands to rrdcached.\n"
- "\n"
- "Usage:\n"
- "\n"
- " client: BATCH\n"
- " server: 0 Go ahead. End with dot '.' on its own line.\n"
- " client: command #1\n"
- " client: command #2\n"
- " client: ... and so on\n"
- " client: .\n"
- " server: 2 errors\n"
- " server: 7 message for command #7\n"
- " server: 9 message for command #9\n"
- "\n"
- "For more information, consult the rrdcached(1) documentation.\n"
- };
-
- status = buffer_get_field (&buffer, &buffer_size, &command);
- if (status != 0)
- help_text = help_help;
- else
- {
- if (strcasecmp (command, "update") == 0)
- help_text = help_update;
- else if (strcasecmp (command, "flush") == 0)
- help_text = help_flush;
- else if (strcasecmp (command, "flushall") == 0)
- help_text = help_flushall;
- else if (strcasecmp (command, "pending") == 0)
- help_text = help_pending;
- else if (strcasecmp (command, "forget") == 0)
- help_text = help_forget;
- else if (strcasecmp (command, "stats") == 0)
- help_text = help_stats;
- else if (strcasecmp (command, "batch") == 0)
- help_text = help_batch;
- else
- help_text = help_help;
- }
-
- add_response_info(sock, help_text[1]);
- return send_response(sock, RESP_OK, help_text[0]);
-} /* }}} int handle_request_help */
-
-static int handle_request_stats (listen_socket_t *sock) /* {{{ */
+static int handle_request_stats (HANDLER_PROTO) /* {{{ */
{
uint64_t copy_queue_length;
uint64_t copy_updates_received;
return (0);
} /* }}} int handle_request_stats */
-static int handle_request_flush (listen_socket_t *sock, /* {{{ */
- char *buffer, size_t buffer_size)
+static int handle_request_flush (HANDLER_PROTO) /* {{{ */
{
char *file, file_tmp[PATH_MAX];
int status;
status = buffer_get_field (&buffer, &buffer_size, &file);
if (status != 0)
{
- return send_response(sock, RESP_ERR, "Usage: flush <filename>\n");
+ return syntax_error(sock,cmd);
}
else
{
assert(1==0);
} /* }}} int handle_request_flush */
-static int handle_request_flushall(listen_socket_t *sock) /* {{{ */
+static int handle_request_flushall(HANDLER_PROTO) /* {{{ */
{
- int status;
-
- status = has_privilege(sock, PRIV_HIGH);
- if (status <= 0)
- return status;
-
RRDD_LOG(LOG_DEBUG, "Received FLUSHALL");
pthread_mutex_lock(&cache_lock);
return send_response(sock, RESP_OK, "Started flush.\n");
} /* }}} static int handle_request_flushall */
-static int handle_request_pending(listen_socket_t *sock, /* {{{ */
- char *buffer, size_t buffer_size)
+static int handle_request_pending(HANDLER_PROTO) /* {{{ */
{
int status;
char *file, file_tmp[PATH_MAX];
status = buffer_get_field(&buffer, &buffer_size, &file);
if (status != 0)
- return send_response(sock, RESP_ERR,
- "Usage: PENDING <filename>\n");
-
- status = has_privilege(sock, PRIV_HIGH);
- if (status <= 0)
- return status;
+ return syntax_error(sock,cmd);
get_abs_path(&file, file_tmp);
return send_response(sock, RESP_OK, "updates pending\n");
} /* }}} static int handle_request_pending */
-static int handle_request_forget(listen_socket_t *sock, /* {{{ */
- char *buffer, size_t buffer_size)
+static int handle_request_forget(HANDLER_PROTO) /* {{{ */
{
int status;
gboolean found;
status = buffer_get_field(&buffer, &buffer_size, &file);
if (status != 0)
- return send_response(sock, RESP_ERR,
- "Usage: FORGET <filename>\n");
-
- status = has_privilege(sock, PRIV_HIGH);
- if (status <= 0)
- return status;
+ return syntax_error(sock,cmd);
get_abs_path(&file, file_tmp);
if (!check_file_access(file, sock)) return 0;
assert(1==0);
} /* }}} static int handle_request_forget */
-static int handle_request_update (listen_socket_t *sock, /* {{{ */
- time_t now,
- char *buffer, size_t buffer_size)
+static int handle_request_queue (HANDLER_PROTO) /* {{{ */
+{
+ cache_item_t *ci;
+
+ pthread_mutex_lock(&cache_lock);
+
+ ci = cache_queue_head;
+ while (ci != NULL)
+ {
+ add_response_info(sock, "%d %s\n", ci->values_num, ci->file);
+ ci = ci->next;
+ }
+
+ pthread_mutex_unlock(&cache_lock);
+
+ return send_response(sock, RESP_OK, "in queue.\n");
+} /* }}} int handle_request_queue */
+
+static int handle_request_update (HANDLER_PROTO) /* {{{ */
{
char *file, file_tmp[PATH_MAX];
int values_num = 0;
cache_item_t *ci;
- status = has_privilege(sock, PRIV_HIGH);
- if (status <= 0)
- return status;
-
/* save it for the journal later */
strncpy(orig_buf, buffer, sizeof(orig_buf)-1);
status = buffer_get_field (&buffer, &buffer_size, &file);
if (status != 0)
- return send_response(sock, RESP_ERR,
- "Usage: UPDATE <filename> <values> [<values> ...]\n");
+ return syntax_error(sock,cmd);
pthread_mutex_lock(&stats_lock);
stats_updates_received++;
else
ci->last_update_stamp = stamp;
- temp = (char **) realloc (ci->values,
+ temp = (char **) rrd_realloc (ci->values,
sizeof (char *) * (ci->values_num + 1));
if (temp == NULL)
{
/* we came across a "WROTE" entry during journal replay.
* throw away any values that we have accumulated for this file
*/
-static int handle_request_wrote (const char *buffer, time_t now) /* {{{ */
+static int handle_request_wrote (HANDLER_PROTO) /* {{{ */
{
int i;
cache_item_t *ci;
} /* }}} int handle_request_wrote */
/* start "BATCH" processing */
-static int batch_start (listen_socket_t *sock) /* {{{ */
+static int batch_start (HANDLER_PROTO) /* {{{ */
{
int status;
if (sock->batch_start)
} /* }}} static int batch_start */
/* finish "BATCH" processing and return results to the client */
-static int batch_done (listen_socket_t *sock) /* {{{ */
+static int batch_done (HANDLER_PROTO) /* {{{ */
{
assert(sock->batch_start);
sock->batch_start = 0;
return send_response(sock, RESP_OK, "errors\n");
} /* }}} static int batch_done */
+static int handle_request_quit (HANDLER_PROTO) /* {{{ */
+{
+ return -1;
+} /* }}} static int handle_request_quit */
+
+struct command COMMANDS[] = {
+ {
+ "UPDATE",
+ handle_request_update,
+ PRIV_HIGH,
+ CMD_CONTEXT_ANY,
+ "UPDATE <filename> <values> [<values> ...]\n"
+ ,
+ "Adds the given file to the internal cache if it is not yet known and\n"
+ "appends the given value(s) to the entry. See the rrdcached(1) manpage\n"
+ "for details.\n"
+ "\n"
+ "Each <values> has the following form:\n"
+ " <values> = <time>:<value>[:<value>[...]]\n"
+ "See the rrdupdate(1) manpage for details.\n"
+ },
+ {
+ "WROTE",
+ handle_request_wrote,
+ PRIV_HIGH,
+ CMD_CONTEXT_JOURNAL,
+ NULL,
+ NULL
+ },
+ {
+ "FLUSH",
+ handle_request_flush,
+ PRIV_LOW,
+ CMD_CONTEXT_CLIENT | CMD_CONTEXT_BATCH,
+ "FLUSH <filename>\n"
+ ,
+ "Adds the given filename to the head of the update queue and returns\n"
+ "after it has been dequeued.\n"
+ },
+ {
+ "FLUSHALL",
+ handle_request_flushall,
+ PRIV_HIGH,
+ CMD_CONTEXT_CLIENT,
+ "FLUSHALL\n"
+ ,
+ "Triggers writing of all pending updates. Returns immediately.\n"
+ },
+ {
+ "PENDING",
+ handle_request_pending,
+ PRIV_HIGH,
+ CMD_CONTEXT_CLIENT,
+ "PENDING <filename>\n"
+ ,
+ "Shows any 'pending' updates for a file, in order.\n"
+ "The updates shown have not yet been written to the underlying RRD file.\n"
+ },
+ {
+ "FORGET",
+ handle_request_forget,
+ PRIV_HIGH,
+ CMD_CONTEXT_ANY,
+ "FORGET <filename>\n"
+ ,
+ "Removes the file completely from the cache.\n"
+ "Any pending updates for the file will be lost.\n"
+ },
+ {
+ "QUEUE",
+ handle_request_queue,
+ PRIV_LOW,
+ CMD_CONTEXT_CLIENT,
+ "QUEUE\n"
+ ,
+ "Shows all files in the output queue.\n"
+ "The output is zero or more lines in the following format:\n"
+ "(where <num_vals> is the number of values to be written)\n"
+ "\n"
+ "<num_vals> <filename>\n"
+ },
+ {
+ "STATS",
+ handle_request_stats,
+ PRIV_LOW,
+ CMD_CONTEXT_CLIENT,
+ "STATS\n"
+ ,
+ "Returns some performance counters, see the rrdcached(1) manpage for\n"
+ "a description of the values.\n"
+ },
+ {
+ "HELP",
+ handle_request_help,
+ PRIV_LOW,
+ CMD_CONTEXT_CLIENT,
+ "HELP [<command>]\n",
+ NULL, /* special! */
+ },
+ {
+ "BATCH",
+ batch_start,
+ PRIV_LOW,
+ CMD_CONTEXT_CLIENT,
+ "BATCH\n"
+ ,
+ "The 'BATCH' command permits the client to initiate a bulk load\n"
+ " of commands to rrdcached.\n"
+ "\n"
+ "Usage:\n"
+ "\n"
+ " client: BATCH\n"
+ " server: 0 Go ahead. End with dot '.' on its own line.\n"
+ " client: command #1\n"
+ " client: command #2\n"
+ " client: ... and so on\n"
+ " client: .\n"
+ " server: 2 errors\n"
+ " server: 7 message for command #7\n"
+ " server: 9 message for command #9\n"
+ "\n"
+ "For more information, consult the rrdcached(1) documentation.\n"
+ },
+ {
+ ".", /* BATCH terminator */
+ batch_done,
+ PRIV_LOW,
+ CMD_CONTEXT_BATCH,
+ NULL,
+ NULL
+ },
+ {
+ "QUIT",
+ handle_request_quit,
+ PRIV_LOW,
+ CMD_CONTEXT_CLIENT | CMD_CONTEXT_BATCH,
+ "QUIT\n"
+ ,
+ "Disconnect from rrdcached.\n"
+ },
+ {NULL,NULL,0,0,NULL,NULL} /* LAST ENTRY */
+};
+
+static struct command *find_command(char *cmd)
+{
+ struct command *c = COMMANDS;
+
+ while (c->cmd != NULL)
+ {
+ if (strcasecmp(cmd, c->cmd) == 0)
+ break;
+ c++;
+ }
+
+ if (c->cmd == NULL)
+ return NULL;
+ else
+ return c;
+}
+
+/* check whether commands are received in the expected context */
+static int command_check_context(listen_socket_t *sock, struct command *cmd)
+{
+ if (sock == NULL)
+ return (cmd->context & CMD_CONTEXT_JOURNAL);
+ else if (sock->batch_start)
+ return (cmd->context & CMD_CONTEXT_BATCH);
+ else
+ return (cmd->context & CMD_CONTEXT_CLIENT);
+
+ /* NOTREACHED */
+ assert(1==0);
+}
+
+static int handle_request_help (HANDLER_PROTO) /* {{{ */
+{
+ int status;
+ char *cmd_str;
+ char *resp_txt;
+ struct command *help = NULL;
+
+ status = buffer_get_field (&buffer, &buffer_size, &cmd_str);
+ if (status == 0)
+ help = find_command(cmd_str);
+
+ if (help && (help->syntax || help->help))
+ {
+ char tmp[CMD_MAX];
+
+ snprintf(tmp, sizeof(tmp)-1, "Help for %s\n", help->cmd);
+ resp_txt = tmp;
+
+ if (help->syntax)
+ add_response_info(sock, "Usage: %s\n", help->syntax);
+
+ if (help->help)
+ add_response_info(sock, "%s\n", help->help);
+ }
+ else
+ {
+ help = COMMANDS;
+ resp_txt = "Command overview\n";
+
+ while (help->cmd)
+ {
+ if (help->syntax)
+ add_response_info(sock, "%s", help->syntax);
+ help++;
+ }
+ }
+
+ return send_response(sock, RESP_OK, resp_txt);
+} /* }}} int handle_request_help */
+
/* if sock==NULL, we are in journal replay mode */
-static int handle_request (listen_socket_t *sock, /* {{{ */
- time_t now,
- char *buffer, size_t buffer_size)
+static int handle_request (DISPATCH_PROTO) /* {{{ */
{
- char *buffer_ptr;
- char *command;
+ char *buffer_ptr = buffer;
+ char *cmd_str = NULL;
+ struct command *cmd = NULL;
int status;
assert (buffer[buffer_size - 1] == '\0');
- buffer_ptr = buffer;
- command = NULL;
- status = buffer_get_field (&buffer_ptr, &buffer_size, &command);
+ status = buffer_get_field (&buffer_ptr, &buffer_size, &cmd_str);
if (status != 0)
{
RRDD_LOG (LOG_INFO, "handle_request: Unable parse command.");
if (sock != NULL && sock->batch_start)
sock->batch_cmd++;
- if (strcasecmp (command, "update") == 0)
- return (handle_request_update (sock, now, buffer_ptr, buffer_size));
- else if (strcasecmp (command, "wrote") == 0 && sock == NULL)
- {
- /* this is only valid in replay mode */
- return (handle_request_wrote (buffer_ptr, now));
- }
- else if (strcasecmp (command, "flush") == 0)
- return (handle_request_flush (sock, buffer_ptr, buffer_size));
- else if (strcasecmp (command, "flushall") == 0)
- return (handle_request_flushall(sock));
- else if (strcasecmp (command, "pending") == 0)
- return (handle_request_pending(sock, buffer_ptr, buffer_size));
- else if (strcasecmp (command, "forget") == 0)
- return (handle_request_forget(sock, buffer_ptr, buffer_size));
- else if (strcasecmp (command, "stats") == 0)
- return (handle_request_stats (sock));
- else if (strcasecmp (command, "help") == 0)
- return (handle_request_help (sock, buffer_ptr, buffer_size));
- else if (strcasecmp (command, "batch") == 0 && sock != NULL)
- return batch_start(sock);
- else if (strcasecmp (command, ".") == 0 && sock != NULL && sock->batch_start)
- return batch_done(sock);
- else if (strcasecmp (command, "quit") == 0)
- return -1;
- else
- return send_response(sock, RESP_ERR, "Unknown command: %s\n", command);
+ cmd = find_command(cmd_str);
+ if (!cmd)
+ return send_response(sock, RESP_ERR, "Unknown command: %s\n", cmd_str);
- /* NOTREACHED */
- assert(1==0);
+ status = has_privilege(sock, cmd->min_priv);
+ if (status <= 0)
+ return status;
+
+ if (!command_check_context(sock, cmd))
+ return send_response(sock, RESP_ERR, "Can't use '%s' here.\n", cmd_str);
+
+ return cmd->handler(cmd, sock, now, buffer_ptr, buffer_size);
} /* }}} int handle_request */
/* MUST NOT hold journal_lock before calling this */
static void *connection_thread_main (void *args) /* {{{ */
{
listen_socket_t *sock;
- int i;
int fd;
sock = (listen_socket_t *) args;
}
pthread_mutex_lock (&connection_threads_lock);
- {
- pthread_t *temp;
-
- temp = (pthread_t *) realloc (connection_threads,
- sizeof (pthread_t) * (connection_threads_num + 1));
- if (temp == NULL)
- {
- RRDD_LOG (LOG_ERR, "connection_thread_main: realloc(++) failed.");
- }
- else
- {
- connection_threads = temp;
- connection_threads[connection_threads_num] = pthread_self ();
- connection_threads_num++;
- }
- }
+ connection_threads_num++;
pthread_mutex_unlock (&connection_threads_lock);
while (do_shutdown == 0)
/* Remove this thread from the connection threads list */
pthread_mutex_lock (&connection_threads_lock);
- {
- pthread_t self;
- pthread_t *temp;
-
- /* Find out own index in the array */
- self = pthread_self ();
- for (i = 0; i < connection_threads_num; i++)
- if (pthread_equal (connection_threads[i], self) != 0)
- break;
- assert (i < connection_threads_num);
-
- /* Move the trailing threads forward. */
- if (i < (connection_threads_num - 1))
- {
- memmove (connection_threads + i,
- connection_threads + i + 1,
- sizeof (pthread_t) * (connection_threads_num - i - 1));
- }
-
- connection_threads_num--;
-
- temp = realloc(connection_threads,
- sizeof(*connection_threads) * connection_threads_num);
- if (connection_threads_num > 0 && temp == NULL)
- RRDD_LOG(LOG_ERR, "connection_thread_main: realloc(--) failed.");
- else
- connection_threads = temp;
- }
+ connection_threads_num--;
+ if (connection_threads_num <= 0)
+ pthread_cond_broadcast(&connection_threads_done);
pthread_mutex_unlock (&connection_threads_lock);
return (NULL);
if (strncmp(path, "unix:", strlen("unix:")) == 0)
path += strlen("unix:");
- temp = (listen_socket_t *) realloc (listen_fds,
+ temp = (listen_socket_t *) rrd_realloc (listen_fds,
sizeof (listen_fds[0]) * (listen_fds_num + 1));
if (temp == NULL)
{
char *port;
int status;
- strncpy (addr_copy, sock->addr, sizeof (addr_copy));
+ strncpy (addr_copy, sock->addr, sizeof(addr_copy)-1);
addr_copy[sizeof (addr_copy) - 1] = 0;
addr = addr_copy;
listen_socket_t *temp;
int one = 1;
- temp = (listen_socket_t *) realloc (listen_fds,
+ temp = (listen_socket_t *) rrd_realloc (listen_fds,
sizeof (listen_fds[0]) * (listen_fds_num + 1));
if (temp == NULL)
{
pthread_mutex_lock (&connection_threads_lock);
while (connection_threads_num > 0)
- {
- pthread_t wait_for;
-
- wait_for = connection_threads[0];
-
- pthread_mutex_unlock (&connection_threads_lock);
- pthread_join (wait_for, /* retval = */ NULL);
- pthread_mutex_lock (&connection_threads_lock);
- }
+ pthread_cond_wait(&connection_threads_done, &connection_threads_lock);
pthread_mutex_unlock (&connection_threads_lock);
free(pollfds);
{
listen_socket_t sock;
memset(&sock, 0, sizeof(sock));
- strncpy(sock.addr, RRDCACHED_DEFAULT_ADDRESS, sizeof(sock.addr));
+ strncpy(sock.addr, RRDCACHED_DEFAULT_ADDRESS, sizeof(sock.addr)-1);
open_listen_socket (&sock);
}
{
do_shutdown++;
- pthread_cond_signal (&cache_cond);
- pthread_join (queue_thread, /* return = */ NULL);
+ pthread_cond_broadcast (&flush_cond);
+ pthread_join (flush_thread, NULL);
+
+ pthread_cond_broadcast (&queue_cond);
+ for (int i = 0; i < config_queue_threads; i++)
+ pthread_join (queue_threads[i], NULL);
+
+ if (config_flush_at_shutdown)
+ {
+ assert(cache_queue_head == NULL);
+ RRDD_LOG(LOG_INFO, "clean shutdown; all RRDs flushed");
+ }
+ journal_done();
remove_pidfile ();
+ free(queue_threads);
free(config_base_dir);
free(config_pid_file);
free(journal_cur);
int option;
int status = 0;
- while ((option = getopt(argc, argv, "gl:L:f:w:b:Bz:p:j:h?F")) != -1)
+ while ((option = getopt(argc, argv, "gl:L:f:w:z:t:Bb:p:Fj:h?")) != -1)
{
switch (option)
{
}
memset(new, 0, sizeof(listen_socket_t));
- temp = (listen_socket_t **) realloc (config_listen_address_list,
+ temp = (listen_socket_t **) rrd_realloc (config_listen_address_list,
sizeof (listen_socket_t *) * (config_listen_address_list_len + 1));
if (temp == NULL)
{
break;
}
+ case 't':
+ {
+ int threads;
+ threads = atoi(optarg);
+ if (threads >= 1)
+ config_queue_threads = threads;
+ else
+ {
+ fprintf (stderr, "Invalid thread count: -t %s\n", optarg);
+ return 1;
+ }
+ }
+ break;
+
case 'B':
config_write_base_only = 1;
break;
" -L <address> Socket address to listen to ('FLUSH' only).\n"
" -w <seconds> Interval in which to write data.\n"
" -z <delay> Delay writes up to <delay> seconds to spread load\n"
+ " -t <threads> Number of write threads.\n"
" -f <seconds> Interval in which to flush dead data.\n"
" -p <file> Location of the PID-file.\n"
" -b <dir> Base directory to change to.\n"
journal_init();
- /* start the queue thread */
- memset (&queue_thread, 0, sizeof (queue_thread));
- status = pthread_create (&queue_thread,
- NULL, /* attr */
- queue_thread_main,
- NULL); /* args */
+ /* start the queue threads */
+ queue_threads = calloc(config_queue_threads, sizeof(*queue_threads));
+ if (queue_threads == NULL)
+ {
+ RRDD_LOG (LOG_ERR, "FATAL: cannot calloc queue threads");
+ cleanup();
+ return (1);
+ }
+ for (int i = 0; i < config_queue_threads; i++)
+ {
+ memset (&queue_threads[i], 0, sizeof (*queue_threads));
+ status = pthread_create (&queue_threads[i], NULL, queue_thread_main, NULL);
+ if (status != 0)
+ {
+ RRDD_LOG (LOG_ERR, "FATAL: cannot create queue thread");
+ cleanup();
+ return (1);
+ }
+ }
+
+ /* start the flush thread */
+ memset(&flush_thread, 0, sizeof(flush_thread));
+ status = pthread_create (&flush_thread, NULL, flush_thread_main, NULL);
if (status != 0)
{
- RRDD_LOG (LOG_ERR, "FATAL: cannot create queue thread");
+ RRDD_LOG (LOG_ERR, "FATAL: cannot create flush thread");
cleanup();
return (1);
}