#ifdef _WIN32
-#include <ws2tcpip.h> // contain #include <winsock2.h>
+#include <ws2tcpip.h> // contain #include <winsock2.h>
#ifdef _MSC_VER
// Need to link with Ws2_32.lib
#pragma comment(lib, "ws2_32.lib")
#include <sys/types.h>
#include <limits.h>
-struct rrdc_response_s
-{
- int status;
- char *message;
- char **lines;
- size_t lines_num;
+struct rrdc_response_s {
+ int status;
+ char *message;
+ char **lines;
+ size_t lines_num;
};
typedef struct rrdc_response_s rrdc_response_t;
struct rrd_client {
- int sd;
- char *sd_path;
+ int sd;
+ char *sd_path;
- char _inbuf[RRD_CMD_MAX];
- char *inbuf;
- size_t inbuf_used;
+ char _inbuf[RRD_CMD_MAX];
+ char *inbuf;
+ size_t inbuf_used;
};
-static rrd_client_t default_client = { -1, NULL, { 0 }, NULL, 0 };
+static rrd_client_t default_client = { -1, NULL, {0}, NULL, 0 };
+
static mutex_t lock = MUTEX_INITIALIZER;
-static int reconnect(rrd_client_t *client);
+static int reconnect(
+ rrd_client_t *client);
/* get_path: Return a path name appropriate to be sent to the daemon.
*
* The caller must call free() on the returned value.
*
* One must hold `lock' when calling this function with `default_client'. */
-static char *get_path(rrd_client_t *client, const char *path) /* {{{ */
-{
- char *ret = NULL;
- const char *strip = getenv(ENV_RRDCACHED_STRIPPATH);
- size_t len;
- int is_unix = 0;
-
- if ((client == NULL) || (path == NULL) || (client->sd_path == NULL))
- return (NULL);
-
- if ((*client->sd_path == '/')
- || (strncmp ("unix:", client->sd_path, strlen ("unix:")) == 0))
- is_unix = 1;
-
- if (is_unix)
- {
- if (path == NULL || strlen(path) == 0) return NULL;
- ret = realpath(path, NULL);
- if (ret == NULL) {
- /* this may happen, because the file DOES NOT YET EXIST (as would be
- * the case for rrdcreate) - retry by stripping the last path element,
- * resolving the directory and re-concatenate them.... */
- char *dir_path;
- char *lastslash = strrchr(path, '/');
- char *dir = (lastslash == NULL || lastslash == path) ? strdup(".")
+static char *get_path(
+ rrd_client_t *client,
+ const char *path)
+{ /* {{{ */
+ char *ret = NULL;
+ const char *strip = getenv(ENV_RRDCACHED_STRIPPATH);
+ size_t len;
+ int is_unix = 0;
+
+ if ((client == NULL) || (path == NULL) || (client->sd_path == NULL))
+ return (NULL);
+
+ if ((*client->sd_path == '/')
+ || (strncmp("unix:", client->sd_path, strlen("unix:")) == 0))
+ is_unix = 1;
+
+ if (is_unix) {
+ if (path == NULL || strlen(path) == 0)
+ return NULL;
+ ret = realpath(path, NULL);
+ if (ret == NULL) {
+ /* this may happen, because the file DOES NOT YET EXIST (as would be
+ * the case for rrdcreate) - retry by stripping the last path element,
+ * resolving the directory and re-concatenate them.... */
+ char *dir_path;
+ char *lastslash = strrchr(path, '/');
+ char *dir = (lastslash == NULL
+ || lastslash == path) ? strdup(".")
#ifdef HAVE_STRNDUP
: strndup(path, lastslash - path);
#else
- : strdup(path);
- if (lastslash && lastslash != path){
- dir[lastslash-path]='\0';
- }
-#endif
- if (dir != NULL) {
- dir_path = realpath(dir, NULL);
- free(dir);
- if (dir_path == NULL) {
- rrd_set_error("realpath(%s): %s", path, rrd_strerror(errno));
- return NULL;
- }
- ret = malloc(strlen(dir_path)
- + (lastslash ? strlen(lastslash) : 1 + strlen(path)) + 1);
- if (ret == NULL) {
- rrd_set_error("cannot allocate memory");
- free(dir_path);
- return NULL;
+ : strdup(path);
+
+ if (lastslash && lastslash != path) {
+ dir[lastslash - path] = '\0';
}
+#endif
+ if (dir != NULL) {
+ dir_path = realpath(dir, NULL);
+ free(dir);
+ if (dir_path == NULL) {
+ rrd_set_error("realpath(%s): %s", path,
+ rrd_strerror(errno));
+ return NULL;
+ }
+ ret = malloc(strlen(dir_path)
+ + (lastslash ? strlen(lastslash) : 1 +
+ strlen(path)) + 1);
+ if (ret == NULL) {
+ rrd_set_error("cannot allocate memory");
+ free(dir_path);
+ return NULL;
+ }
- strcpy(ret, dir_path);
- if (lastslash != NULL) {
- strcat(ret, lastslash);
+ strcpy(ret, dir_path);
+ if (lastslash != NULL) {
+ strcat(ret, lastslash);
+ } else {
+ strcat(ret, "/");
+ strcat(ret, path);
+ }
+ free(dir_path);
} else {
- strcat(ret, "/");
- strcat(ret, path);
+ // out of memory
+ rrd_set_error("cannot allocate memory");
+ ret = NULL; // redundant, but make intention clear
}
- free(dir_path);
- } else {
- // out of memory
- rrd_set_error("cannot allocate memory");
- ret = NULL; // redundant, but make intention clear
+ }
+ return ret;
+ } else {
+ if (*path == '/') { /* absolute path */
+ /* if we are stripping, then check and remove the head */
+ if (strip) {
+ len = strlen(strip);
+ if (strncmp(path, strip, len) == 0) {
+ path += len;
+ while (*path == '/')
+ path++;
+ return strdup(path);
+ }
+ } else
+ rrd_set_error("absolute path names not allowed when talking "
+ "to a remote daemon");
+ return NULL;
}
}
- return ret;
- }
- else
- {
- if (*path == '/') /* absolute path */
- {
- /* if we are stripping, then check and remove the head */
- if (strip) {
- len = strlen(strip);
- if (strncmp(path,strip,len)==0) {
- path += len;
- while (*path == '/')
- path++;
- return strdup(path);
- }
- } else
- rrd_set_error ("absolute path names not allowed when talking "
- "to a remote daemon");
- return NULL;
- }
- }
-
- return strdup(path);
-} /* }}} char *get_path */
-
-static size_t strsplit (char *string, char **fields, size_t size) /* {{{ */
-{
- size_t i;
- char *ptr;
- char *saveptr;
-
- i = 0;
- ptr = string;
- saveptr = NULL;
- while ((fields[i] = strtok_r (ptr, " \t\r\n", &saveptr)) != NULL)
- {
- ptr = NULL;
- i++;
-
- if (i >= size)
- break;
- }
-
- return (i);
-} /* }}} size_t strsplit */
-
-static int parse_header (char *line, /* {{{ */
- char **ret_key, char **ret_value)
+
+ return strdup(path);
+} /* }}} char *get_path */
+
+static size_t strsplit(
+ char *string,
+ char **fields,
+ size_t size)
+{ /* {{{ */
+ size_t i;
+ char *ptr;
+ char *saveptr;
+
+ i = 0;
+ ptr = string;
+ saveptr = NULL;
+ while ((fields[i] = strtok_r(ptr, " \t\r\n", &saveptr)) != NULL) {
+ ptr = NULL;
+ i++;
+
+ if (i >= size)
+ break;
+ }
+
+ return (i);
+} /* }}} size_t strsplit */
+
+static int parse_header(
+ char *line, /* {{{ */
+ char **ret_key,
+ char **ret_value)
{
- char *tmp;
+ char *tmp;
- *ret_key = line;
+ *ret_key = line;
- tmp = strchr (line, ':');
- if (tmp == NULL)
- return (-1);
+ tmp = strchr(line, ':');
+ if (tmp == NULL)
+ return (-1);
- do
- {
- *tmp = 0;
- tmp++;
- }
- while ((tmp[0] == ' ') || (tmp[0] == '\t'));
+ do {
+ *tmp = 0;
+ tmp++;
+ }
+ while ((tmp[0] == ' ') || (tmp[0] == '\t'));
- if (*tmp == 0)
- return (-1);
+ if (*tmp == 0)
+ return (-1);
- *ret_value = tmp;
- return (0);
-} /* }}} int parse_header */
+ *ret_value = tmp;
+ return (0);
+} /* }}} int parse_header */
-static int parse_ulong_header (char *line, /* {{{ */
- char **ret_key, unsigned long *ret_value)
+static int parse_ulong_header(
+ char *line, /* {{{ */
+ char **ret_key,
+ unsigned long *ret_value)
{
- char *str_value;
- char *endptr;
- int status;
+ char *str_value;
+ char *endptr;
+ int status;
- str_value = NULL;
- status = parse_header (line, ret_key, &str_value);
- if (status != 0)
- return (status);
-
- endptr = NULL;
- errno = 0;
- *ret_value = (unsigned long) strtol (str_value, &endptr, /* base = */ 0);
- if ((endptr == str_value) || (errno != 0))
- return (-1);
+ str_value = NULL;
+ status = parse_header(line, ret_key, &str_value);
+ if (status != 0)
+ return (status);
- return (0);
-} /* }}} int parse_ulong_header */
+ endptr = NULL;
+ errno = 0;
+ *ret_value = (unsigned long) strtol(str_value, &endptr, /* base = */ 0);
+ if ((endptr == str_value) || (errno != 0))
+ return (-1);
-static int parse_char_array_header (char *line, /* {{{ */
- char **ret_key, char **array, size_t array_len, int alloc)
+ return (0);
+} /* }}} int parse_ulong_header */
+
+static int parse_char_array_header(
+ char *line, /* {{{ */
+ char **ret_key,
+ char **array,
+ size_t array_len,
+ int alloc)
{
- char **tmp_array;
- char *value;
- size_t num;
- int status;
+ char **tmp_array;
+ char *value;
+ size_t num;
+ int status;
- if ((tmp_array = (char**)malloc(array_len * sizeof (char*))) == NULL)
- return (-1);
+ if ((tmp_array = (char **) malloc(array_len * sizeof(char *))) == NULL)
+ return (-1);
- value = NULL;
- status = parse_header (line, ret_key, &value);
- if (status != 0) {
- free(tmp_array);
- return (-1);
- }
+ value = NULL;
+ status = parse_header(line, ret_key, &value);
+ if (status != 0) {
+ free(tmp_array);
+ return (-1);
+ }
- num = strsplit (value, tmp_array, array_len);
- if (num != array_len)
- {
- free(tmp_array);
- return (-1);
- }
+ num = strsplit(value, tmp_array, array_len);
+ if (num != array_len) {
+ free(tmp_array);
+ return (-1);
+ }
- if (alloc == 0)
- {
- memcpy (array, tmp_array, array_len * sizeof (char*));
- }
- else
- {
- size_t i;
+ if (alloc == 0) {
+ memcpy(array, tmp_array, array_len * sizeof(char *));
+ } else {
+ size_t i;
- for (i = 0; i < array_len; i++)
- array[i] = strdup (tmp_array[i]);
- }
+ for (i = 0; i < array_len; i++)
+ array[i] = strdup(tmp_array[i]);
+ }
- free(tmp_array);
+ free(tmp_array);
- return (0);
-} /* }}} int parse_char_array_header */
+ return (0);
+} /* }}} int parse_char_array_header */
-static int parse_value_array_header (char *line, /* {{{ */
- time_t *ret_time, rrd_value_t *array, size_t array_len)
+static int parse_value_array_header(
+ char *line, /* {{{ */
+ time_t *ret_time,
+ rrd_value_t *array,
+ size_t array_len)
{
- char *str_key;
- char **str_array;
- char *endptr;
- int status;
- size_t i;
- double tmp;
-
- if ((str_array = (char**)malloc(array_len * sizeof (char*))) == NULL)
- return (-1);
-
- str_key = NULL;
- status = parse_char_array_header (line, &str_key,
- str_array, array_len, /* alloc = */ 0);
- if (status != 0) {
- free(str_array);
- return (-1);
- }
+ char *str_key;
+ char **str_array;
+ char *endptr;
+ int status;
+ size_t i;
+ double tmp;
+
+ if ((str_array = (char **) malloc(array_len * sizeof(char *))) == NULL)
+ return (-1);
- errno = 0;
- endptr = NULL;
- *ret_time = (time_t) strtol (str_key, &endptr, /* base = */ 10);
- if ((endptr == str_key) || (errno != 0)) {
- free(str_array);
- return (-1);
- }
-
- /* Enforce the "C" locale so that parsing of the response is not dependent on
- * the locale. For example, when using a German locale the strtod() function
- * will expect a comma as the decimal separator, i.e. "42,77". */
- for (i = 0; i < array_len; i++)
- {
- if( rrd_strtodbl(str_array[i], 0, &tmp, "parse_value_array_header") == 2) {
- array[i] = (rrd_value_t)tmp;
- } else {
+ str_key = NULL;
+ status = parse_char_array_header(line, &str_key,
+ str_array, array_len, /* alloc = */ 0);
+ if (status != 0) {
free(str_array);
return (-1);
}
- }
- free(str_array);
- return (0);
-} /* }}} int parse_value_array_header */
+ errno = 0;
+ endptr = NULL;
+ *ret_time = (time_t) strtol(str_key, &endptr, /* base = */ 10);
+ if ((endptr == str_key) || (errno != 0)) {
+ free(str_array);
+ return (-1);
+ }
-static void close_socket(rrd_client_t *client)
+ /* Enforce the "C" locale so that parsing of the response is not dependent on
+ * the locale. For example, when using a German locale the strtod() function
+ * will expect a comma as the decimal separator, i.e. "42,77". */
+ for (i = 0; i < array_len; i++) {
+ if (rrd_strtodbl(str_array[i], 0, &tmp, "parse_value_array_header") ==
+ 2) {
+ array[i] = (rrd_value_t) tmp;
+ } else {
+ free(str_array);
+ return (-1);
+ }
+ }
+
+ free(str_array);
+ return (0);
+} /* }}} int parse_value_array_header */
+
+static void close_socket(
+ rrd_client_t *client)
{
- if (client->sd >= 0) {
+ if (client->sd >= 0) {
#ifdef _WIN32
- closesocket(client->sd);
- WSACleanup();
+ closesocket(client->sd);
+ WSACleanup();
#else
- close(client->sd);
+ close(client->sd);
#endif
- }
+ }
- client->sd = -1;
- client->inbuf = NULL;
- client->inbuf_used = 0;
+ client->sd = -1;
+ client->inbuf = NULL;
+ client->inbuf_used = 0;
}
-static void close_connection(rrd_client_t *client) /* {{{ */
-{
- if (client == NULL)
- return;
+static void close_connection(
+ rrd_client_t *client)
+{ /* {{{ */
+ if (client == NULL)
+ return;
- close_socket(client);
+ close_socket(client);
- if (client->sd_path != NULL)
- free(client->sd_path);
- client->sd_path = NULL;
-} /* }}} void close_connection */
+ if (client->sd_path != NULL)
+ free(client->sd_path);
+ client->sd_path = NULL;
+} /* }}} void close_connection */
-static int buffer_add_string (const char *str, /* {{{ */
- char **buffer_ret, size_t *buffer_size_ret)
+static int buffer_add_string(
+ const char *str, /* {{{ */
+ char **buffer_ret,
+ size_t *buffer_size_ret)
{
- char *buffer;
- size_t buffer_size;
- size_t buffer_pos;
- size_t i;
- int status;
-
- buffer = *buffer_ret;
- buffer_size = *buffer_size_ret;
- buffer_pos = 0;
-
- i = 0;
- status = -1;
- while (buffer_pos < buffer_size)
- {
- if (str[i] == 0)
- {
- buffer[buffer_pos] = ' ';
- buffer_pos++;
- status = 0;
- break;
- }
- else if ((str[i] == ' ') || (str[i] == '\\'))
- {
- if (buffer_pos >= (buffer_size - 1))
- break;
- buffer[buffer_pos] = '\\';
- buffer_pos++;
- buffer[buffer_pos] = str[i];
- buffer_pos++;
- }
- else
- {
- buffer[buffer_pos] = str[i];
- buffer_pos++;
- }
- i++;
- } /* while (buffer_pos < buffer_size) */
+ char *buffer;
+ size_t buffer_size;
+ size_t buffer_pos;
+ size_t i;
+ int status;
+
+ buffer = *buffer_ret;
+ buffer_size = *buffer_size_ret;
+ buffer_pos = 0;
+
+ i = 0;
+ status = -1;
+ while (buffer_pos < buffer_size) {
+ if (str[i] == 0) {
+ buffer[buffer_pos] = ' ';
+ buffer_pos++;
+ status = 0;
+ break;
+ } else if ((str[i] == ' ') || (str[i] == '\\')) {
+ if (buffer_pos >= (buffer_size - 1))
+ break;
+ buffer[buffer_pos] = '\\';
+ buffer_pos++;
+ buffer[buffer_pos] = str[i];
+ buffer_pos++;
+ } else {
+ buffer[buffer_pos] = str[i];
+ buffer_pos++;
+ }
+ i++;
+ } /* while (buffer_pos < buffer_size) */
- if (status != 0)
- return (-1);
+ if (status != 0)
+ return (-1);
- *buffer_ret = buffer + buffer_pos;
- *buffer_size_ret = buffer_size - buffer_pos;
+ *buffer_ret = buffer + buffer_pos;
+ *buffer_size_ret = buffer_size - buffer_pos;
- return (0);
-} /* }}} int buffer_add_string */
+ return (0);
+} /* }}} int buffer_add_string */
-static int buffer_add_value (const char *value, /* {{{ */
- char **buffer_ret, size_t *buffer_size_ret)
+static int buffer_add_value(
+ const char *value, /* {{{ */
+ char **buffer_ret,
+ size_t *buffer_size_ret)
{
- char temp[RRD_CMD_MAX];
+ char temp[RRD_CMD_MAX];
- if (strncmp (value, "N:", 2) == 0)
- snprintf (temp, sizeof (temp), "%lu:%s",
- (unsigned long) time (NULL), value + 2);
- else
- strncpy (temp, value, sizeof (temp));
- temp[sizeof (temp) - 1] = 0;
+ if (strncmp(value, "N:", 2) == 0)
+ snprintf(temp, sizeof(temp), "%lu:%s",
+ (unsigned long) time(NULL), value + 2);
+ else
+ strncpy(temp, value, sizeof(temp));
+ temp[sizeof(temp) - 1] = 0;
- return (buffer_add_string (temp, buffer_ret, buffer_size_ret));
-} /* }}} int buffer_add_value */
+ return (buffer_add_string(temp, buffer_ret, buffer_size_ret));
+} /* }}} int buffer_add_value */
-static int buffer_add_ulong (const unsigned long value, /* {{{ */
- char **buffer_ret, size_t *buffer_size_ret)
+static int buffer_add_ulong(
+ const unsigned long value, /* {{{ */
+ char **buffer_ret,
+ size_t *buffer_size_ret)
{
- char temp[RRD_CMD_MAX];
+ char temp[RRD_CMD_MAX];
- snprintf (temp, sizeof (temp), "%lu", value);
- temp[sizeof (temp) - 1] = 0;
- return (buffer_add_string (temp, buffer_ret, buffer_size_ret));
-} /* }}} int buffer_add_ulong */
+ snprintf(temp, sizeof(temp), "%lu", value);
+ temp[sizeof(temp) - 1] = 0;
+ return (buffer_add_string(temp, buffer_ret, buffer_size_ret));
+} /* }}} int buffer_add_ulong */
/* Remove trailing newline (NL) and carriage return (CR) characters. Similar to
* the Perl function `chomp'. Returns the number of characters that have been
* removed. */
-static int chomp (char *str) /* {{{ */
-{
- size_t len;
- int removed;
+static int chomp(
+ char *str)
+{ /* {{{ */
+ size_t len;
+ int removed;
+
+ if (str == NULL)
+ return (-1);
+
+ len = strlen(str);
+ removed = 0;
+ while ((len > 0) && ((str[len - 1] == '\n') || (str[len - 1] == '\r'))) {
+ str[len - 1] = 0;
+ len--;
+ removed++;
+ }
- if (str == NULL)
- return (-1);
+ return (removed);
+} /* }}} int chomp */
- len = strlen (str);
- removed = 0;
- while ((len > 0) && ((str[len - 1] == '\n') || (str[len - 1] == '\r')))
- {
- str[len - 1] = 0;
- len--;
- removed++;
- }
+static void response_free(
+ rrdc_response_t *res)
+{ /* {{{ */
+ if (res == NULL)
+ return;
- return (removed);
-} /* }}} int chomp */
+ if (res->lines != NULL) {
+ size_t i;
-static void response_free (rrdc_response_t *res) /* {{{ */
-{
- if (res == NULL)
- return;
+ for (i = 0; i < res->lines_num; i++)
+ if (res->lines[i] != NULL)
+ free(res->lines[i]);
+ free(res->lines);
+ }
- if (res->lines != NULL)
- {
- size_t i;
+ free(res);
+} /* }}} void response_free */
- for (i = 0; i < res->lines_num; i++)
- if (res->lines[i] != NULL)
- free (res->lines[i]);
- free (res->lines);
- }
+static int recvline(
+ rrd_client_t *client,
+ char *buf,
+ size_t n)
+{ /* {{{ */
+ size_t len;
+ char *s, *p, *t;
- free (res);
-} /* }}} void response_free */
+ /* Sanity check */
+ if ((client == NULL) || (n <= 0))
+ return (-1);
-static int recvline(rrd_client_t *client, char *buf, size_t n) /* {{{ */
-{
- size_t len;
- char *s, *p, *t;
-
- /* Sanity check */
- if ((client == NULL) || (n <= 0))
- return (-1);
-
- s = buf;
- n--; /* leave space for the NULL */
- while (n != 0)
- {
- /*
+ s = buf;
+ n--; /* leave space for the NULL */
+ while (n != 0) {
+ /*
* If the buffer is empty, refill it.
*/
- if (((len = client->inbuf_used) <= 0) || (client->inbuf == NULL))
- {
- client->inbuf = client->_inbuf;
- client->inbuf_used = recv(client->sd, client->inbuf, RRD_CMD_MAX, 0);
- if (client->inbuf_used <= 0)
- {
- if (s == buf)
- {
- /* EOF/error: stop with partial or no line */
- return (-1);
+ if (((len = client->inbuf_used) <= 0) || (client->inbuf == NULL)) {
+ client->inbuf = client->_inbuf;
+ client->inbuf_used =
+ recv(client->sd, client->inbuf, RRD_CMD_MAX, 0);
+ if (client->inbuf_used <= 0) {
+ if (s == buf) {
+ /* EOF/error: stop with partial or no line */
+ return (-1);
+ }
+ }
+ len = client->inbuf_used;
}
- }
- len = client->inbuf_used;
- }
- p = client->inbuf;
- /*
+ p = client->inbuf;
+ /*
* Scan through at most n bytes of the current buffer,
* looking for '\n'. If found, copy up to and including
* newline, and stop. Otherwise, copy entire chunk
* and loop.
*/
- if (len > n)
- len = n;
- t = (char*)memchr((void *)p, '\n', len);
- if (t != NULL)
- {
- len = ++t - p;
- client->inbuf_used -= len;
- client->inbuf = t;
- (void)memcpy((void *)s, (void *)p, len);
- s[len] = 0;
- return (1);
- }
- client->inbuf_used -= len;
- client->inbuf += len;
- (void)memcpy((void *)s, (void *)p, len);
- s += len;
- n -= len;
- }
- *s = 0;
- return (1);
-} /* }}} int recvline */
-
-static int response_read(rrd_client_t *client, rrdc_response_t **ret_response) /* {{{ */
-{
- rrdc_response_t *ret = NULL;
- int status = 0;
+ if (len > n)
+ len = n;
+ t = (char *) memchr((void *) p, '\n', len);
+ if (t != NULL) {
+ len = ++t - p;
+ client->inbuf_used -= len;
+ client->inbuf = t;
+ (void) memcpy((void *) s, (void *) p, len);
+ s[len] = 0;
+ return (1);
+ }
+ client->inbuf_used -= len;
+ client->inbuf += len;
+ (void) memcpy((void *) s, (void *) p, len);
+ s += len;
+ n -= len;
+ }
+ *s = 0;
+ return (1);
+} /* }}} int recvline */
+
+static int response_read(
+ rrd_client_t *client,
+ rrdc_response_t **ret_response)
+{ /* {{{ */
+ rrdc_response_t *ret = NULL;
+ int status = 0;
- char buffer[RRD_CMD_MAX];
+ char buffer[RRD_CMD_MAX];
- size_t i;
+ size_t i;
#define DIE(code) do { status = code; goto err_out; } while(0)
- if ((client == NULL) || (client->sd == -1))
- DIE(-1);
+ if ((client == NULL) || (client->sd == -1))
+ DIE(-1);
- ret = (rrdc_response_t *) malloc (sizeof (rrdc_response_t));
- if (ret == NULL)
- DIE(-2);
- memset (ret, 0, sizeof (*ret));
- ret->lines = NULL;
- ret->lines_num = 0;
+ ret = (rrdc_response_t *) malloc(sizeof(rrdc_response_t));
+ if (ret == NULL)
+ DIE(-2);
+ memset(ret, 0, sizeof(*ret));
+ ret->lines = NULL;
+ ret->lines_num = 0;
- if (recvline(client, buffer, sizeof (buffer)) == -1)
- DIE(-3);
+ if (recvline(client, buffer, sizeof(buffer)) == -1)
+ DIE(-3);
- chomp (buffer);
+ chomp(buffer);
- ret->status = strtol (buffer, &ret->message, 0);
- if (buffer == ret->message)
- DIE(-4);
+ ret->status = strtol(buffer, &ret->message, 0);
+ if (buffer == ret->message)
+ DIE(-4);
- /* Skip leading whitespace of the status message */
- ret->message += strspn (ret->message, " \t");
+ /* Skip leading whitespace of the status message */
+ ret->message += strspn(ret->message, " \t");
- if (ret->status <= 0)
- {
- if (ret->status < 0)
- rrd_set_error("rrdcached@%s: %s", client->sd_path, ret->message);
- goto out;
- }
+ if (ret->status <= 0) {
+ if (ret->status < 0)
+ rrd_set_error("rrdcached@%s: %s", client->sd_path, ret->message);
+ goto out;
+ }
- ret->lines = (char **) malloc (sizeof (char *) * ret->status);
- if (ret->lines == NULL)
- DIE(-5);
+ ret->lines = (char **) malloc(sizeof(char *) * ret->status);
+ if (ret->lines == NULL)
+ DIE(-5);
- memset (ret->lines, 0, sizeof (char *) * ret->status);
- ret->lines_num = (size_t) ret->status;
+ memset(ret->lines, 0, sizeof(char *) * ret->status);
+ ret->lines_num = (size_t) ret->status;
- for (i = 0; i < ret->lines_num; i++)
- {
- if (recvline(client, buffer, sizeof (buffer)) == -1)
- DIE(-6);
+ for (i = 0; i < ret->lines_num; i++) {
+ if (recvline(client, buffer, sizeof(buffer)) == -1)
+ DIE(-6);
- chomp (buffer);
+ chomp(buffer);
- ret->lines[i] = strdup (buffer);
- if (ret->lines[i] == NULL)
- DIE(-7);
- }
+ ret->lines[i] = strdup(buffer);
+ if (ret->lines[i] == NULL)
+ DIE(-7);
+ }
-out:
- *ret_response = ret;
- return (status);
+ out:
+ *ret_response = ret;
+ return (status);
-err_out:
- response_free(ret);
- close_connection(client);
- return (status);
+ err_out:
+ response_free(ret);
+ close_connection(client);
+ return (status);
#undef DIE
-} /* }}} rrdc_response_t *response_read */
+} /* }}} rrdc_response_t *response_read */
-static int sendall(rrd_client_t *client, /* {{{ */
- const char *msg, size_t len, int allow_retry)
+static int sendall(
+ rrd_client_t *client, /* {{{ */
+ const char *msg,
+ size_t len,
+ int allow_retry)
{
- int ret = 0;
- char *bufp = (char*)msg;
+ int ret = 0;
+ char *bufp = (char *) msg;
- if (client == NULL)
- return -1;
+ if (client == NULL)
+ return -1;
- while (ret != -1 && len > 0) {
- ret = send(client->sd, msg, len, 0);
- if (ret > 0) {
- bufp += ret;
- len -= ret;
+ while (ret != -1 && len > 0) {
+ ret = send(client->sd, msg, len, 0);
+ if (ret > 0) {
+ bufp += ret;
+ len -= ret;
+ }
}
- }
- if ((ret < 0) && allow_retry) {
- /* Try to reconnect and start over.
- * Don't further allow retries to avoid endless loops. */
- if (reconnect(client) == 0)
- return sendall(client, msg, len, 0);
- }
+ if ((ret < 0) && allow_retry) {
+ /* Try to reconnect and start over.
+ * Don't further allow retries to avoid endless loops. */
+ if (reconnect(client) == 0)
+ return sendall(client, msg, len, 0);
+ }
- return ret;
-} /* }}} int sendall */
+ return ret;
+} /* }}} int sendall */
-static int request(rrd_client_t *client, const char *buffer, size_t buffer_size, /* {{{ */
+static int request(
+ rrd_client_t *client,
+ const char *buffer,
+ size_t buffer_size, /* {{{ */
rrdc_response_t **ret_response)
{
- int status;
- rrdc_response_t *res;
+ int status;
+ rrdc_response_t *res;
- if ((client == NULL) || (client->sd == -1))
- return (ENOTCONN);
+ if ((client == NULL) || (client->sd == -1))
+ return (ENOTCONN);
- status = sendall(client, buffer, buffer_size, 1);
- if (status == -1)
- {
- close_connection(client);
- rrd_set_error("request: socket error (%d) while talking to rrdcached",
- status);
- return (-1);
- }
-
- res = NULL;
- status = response_read(client, &res);
-
- if (status != 0)
- {
- if (status < 0)
- rrd_set_error("request: internal error while talking to rrdcached");
- return (status);
- }
+ status = sendall(client, buffer, buffer_size, 1);
+ if (status == -1) {
+ close_connection(client);
+ rrd_set_error("request: socket error (%d) while talking to rrdcached",
+ status);
+ return (-1);
+ }
- *ret_response = res;
- return (0);
-} /* }}} int request */
+ res = NULL;
+ status = response_read(client, &res);
-int rrd_client_is_connected(rrd_client_t *client) /* {{{ */
-{
- return (client != NULL) && (client->sd >= 0);
-} /* }}} rrd_client_is_connected */
+ if (status != 0) {
+ if (status < 0)
+ rrd_set_error
+ ("request: internal error while talking to rrdcached");
+ return (status);
+ }
-const char *rrd_client_address(rrd_client_t *client) /* {{{ */
-{
- if (!client)
- return NULL;
- return client->sd_path;
-} /* }}} rrd_client_address */
+ *ret_response = res;
+ return (0);
+} /* }}} int request */
+
+int rrd_client_is_connected(
+ rrd_client_t *client)
+{ /* {{{ */
+ return (client != NULL) && (client->sd >= 0);
+} /* }}} rrd_client_is_connected */
+
+const char *rrd_client_address(
+ rrd_client_t *client)
+{ /* {{{ */
+ if (!client)
+ return NULL;
+ return client->sd_path;
+} /* }}} rrd_client_address */
/* determine whether we are connected to the specified daemon_addr if
* NULL, return whether we are connected at all
*/
-int rrdc_is_connected(const char *daemon_addr) /* {{{ */
-{
- if (default_client.sd < 0)
- return 0;
- else if (daemon_addr == NULL)
- {
- char *addr = getenv(ENV_RRDCACHED_ADDRESS);
- /* here we have to handle the case i.e.
- * UPDATE --daemon ...; UPDATEV (no --daemon) ...
- * In other words: we have a cached connection,
- * but it is not specified in the current command.
- * Daemon is only implied in this case if set in ENV
- */
- if (addr != NULL && strcmp(addr,"") != 0)
- return 1;
+int rrdc_is_connected(
+ const char *daemon_addr)
+{ /* {{{ */
+ if (default_client.sd < 0)
+ return 0;
+ else if (daemon_addr == NULL) {
+ char *addr = getenv(ENV_RRDCACHED_ADDRESS);
+
+ /* here we have to handle the case i.e.
+ * UPDATE --daemon ...; UPDATEV (no --daemon) ...
+ * In other words: we have a cached connection,
+ * but it is not specified in the current command.
+ * Daemon is only implied in this case if set in ENV
+ */
+ if (addr != NULL && strcmp(addr, "") != 0)
+ return 1;
+ else
+ return 0;
+ } else if (strcmp(daemon_addr, default_client.sd_path) == 0)
+ return 1;
else
- return 0;
- }
- else if (strcmp(daemon_addr, default_client.sd_path) == 0)
- return 1;
- else
- return 0;
-} /* }}} int rrdc_is_connected */
+ return 0;
+} /* }}} int rrdc_is_connected */
/* determine whether we are connected to any daemon */
-int rrdc_is_any_connected(void)
+int rrdc_is_any_connected(
+ void)
{
- return default_client.sd >= 0;
+ return default_client.sd >= 0;
}
-int rrd_client_ping(rrd_client_t *client) /* {{{ */
-{
- int status;
- rrdc_response_t *res = NULL;
+int rrd_client_ping(
+ rrd_client_t *client)
+{ /* {{{ */
+ int status;
+ rrdc_response_t *res = NULL;
- status = request(client, "PING\n", strlen("PING\n"), &res);
- if (status != 0)
- return 0;
+ status = request(client, "PING\n", strlen("PING\n"), &res);
+ if (status != 0)
+ return 0;
- status = res->status;
- response_free (res);
+ status = res->status;
+ response_free(res);
- return status == 0;
-} /* }}} int rrd_client_ping */
-int rrdc_ping(void) /* {{{ */
-{
- int status;
- mutex_lock(&lock);
- status = rrd_client_ping(&default_client);
- mutex_unlock(&lock);
- return status;
-} /* }}} int rrdc_ping */
-
-static int connect_unix(rrd_client_t *client, const char *path) /* {{{ */
-{
+ return status == 0;
+} /* }}} int rrd_client_ping */
+
+int rrdc_ping(
+ void)
+{ /* {{{ */
+ int status;
+
+ mutex_lock(&lock);
+ status = rrd_client_ping(&default_client);
+ mutex_unlock(&lock);
+ return status;
+} /* }}} int rrdc_ping */
+
+static int connect_unix(
+ rrd_client_t *client,
+ const char *path)
+{ /* {{{ */
#ifdef _WIN32
- return (WSAEPROTONOSUPPORT);
+ return (WSAEPROTONOSUPPORT);
#else
- struct sockaddr_un sa;
- int status;
+ struct sockaddr_un sa;
+ int status;
- assert (path != NULL);
- assert (client->sd == -1);
+ assert(path != NULL);
+ assert(client->sd == -1);
- client->sd = socket(PF_UNIX, SOCK_STREAM, /* protocol = */ 0);
- if (client->sd < 0)
- {
- status = errno;
- return (status);
- }
+ client->sd = socket(PF_UNIX, SOCK_STREAM, /* protocol = */ 0);
+ if (client->sd < 0) {
+ status = errno;
+ return (status);
+ }
- memset (&sa, 0, sizeof (sa));
- sa.sun_family = AF_UNIX;
- strncpy (sa.sun_path, path, sizeof (sa.sun_path) - 1);
+ memset(&sa, 0, sizeof(sa));
+ sa.sun_family = AF_UNIX;
+ strncpy(sa.sun_path, path, sizeof(sa.sun_path) - 1);
- status = connect(client->sd, (struct sockaddr *) &sa, sizeof (sa));
- if (status != 0)
- {
- status = errno;
- close_connection(client);
- return (status);
- }
+ status = connect(client->sd, (struct sockaddr *) &sa, sizeof(sa));
+ if (status != 0) {
+ status = errno;
+ close_connection(client);
+ return (status);
+ }
- return (0);
+ return (0);
#endif
-} /* }}} int connect_unix */
-
-static int connect_network(rrd_client_t *client, const char *addr_orig) /* {{{ */
-{
- struct addrinfo ai_hints;
- struct addrinfo *ai_res;
- struct addrinfo *ai_ptr;
- char addr_copy[NI_MAXHOST];
- char *addr;
- char *port;
-
- assert (addr_orig != NULL);
- assert (client->sd == -1);
-
- strncpy(addr_copy, addr_orig, sizeof(addr_copy));
- addr_copy[sizeof(addr_copy) - 1] = '\0';
- addr = addr_copy;
-
- int status;
- memset (&ai_hints, 0, sizeof (ai_hints));
- ai_hints.ai_flags = 0;
+} /* }}} int connect_unix */
+
+static int connect_network(
+ rrd_client_t *client,
+ const char *addr_orig)
+{ /* {{{ */
+ struct addrinfo ai_hints;
+ struct addrinfo *ai_res;
+ struct addrinfo *ai_ptr;
+ char addr_copy[NI_MAXHOST];
+ char *addr;
+ char *port;
+
+ assert(addr_orig != NULL);
+ assert(client->sd == -1);
+
+ strncpy(addr_copy, addr_orig, sizeof(addr_copy));
+ addr_copy[sizeof(addr_copy) - 1] = '\0';
+ addr = addr_copy;
+
+ int status;
+
+ memset(&ai_hints, 0, sizeof(ai_hints));
+ ai_hints.ai_flags = 0;
#ifdef AI_ADDRCONFIG
- ai_hints.ai_flags |= AI_ADDRCONFIG;
+ ai_hints.ai_flags |= AI_ADDRCONFIG;
#endif
- ai_hints.ai_family = AF_UNSPEC;
- ai_hints.ai_socktype = SOCK_STREAM;
-
- port = NULL;
- if (*addr == '[') /* IPv6+port format */
- {
- /* `addr' is something like "[2001:780:104:2:211:24ff:feab:26f8]:12345" */
- addr++;
-
- port = strchr (addr, ']');
- if (port == NULL)
- {
- rrd_set_error("malformed address: %s", addr_orig);
- return (-1);
- }
- *port = 0;
- port++;
-
- if (*port == ':')
- port++;
- else if (*port == 0)
- port = NULL;
- else
- {
- rrd_set_error("garbage after address: %s", port);
- return (-1);
- }
- } /* if (*addr == '[') */
- else
- {
- port = strrchr(addr, ':');
- if (port != NULL)
- {
- *port = 0;
- port++;
+ ai_hints.ai_family = AF_UNSPEC;
+ ai_hints.ai_socktype = SOCK_STREAM;
+
+ port = NULL;
+ if (*addr == '[') { /* IPv6+port format */
+ /* `addr' is something like "[2001:780:104:2:211:24ff:feab:26f8]:12345" */
+ addr++;
+
+ port = strchr(addr, ']');
+ if (port == NULL) {
+ rrd_set_error("malformed address: %s", addr_orig);
+ return (-1);
+ }
+ *port = 0;
+ port++;
+
+ if (*port == ':')
+ port++;
+ else if (*port == 0)
+ port = NULL;
+ else {
+ rrd_set_error("garbage after address: %s", port);
+ return (-1);
+ }
+ } /* if (*addr == '[') */
+ else {
+ port = strrchr(addr, ':');
+ if (port != NULL) {
+ *port = 0;
+ port++;
+ }
}
- }
#ifdef _WIN32
- WORD wVersionRequested;
- WSADATA wsaData;
-
- wVersionRequested = MAKEWORD(2, 0);
- status = WSAStartup(wVersionRequested, &wsaData);
- if (status != 0)
- {
- rrd_set_error("failed to initialize socket library %d", status);
- return (-1);
- }
+ WORD wVersionRequested;
+ WSADATA wsaData;
+
+ wVersionRequested = MAKEWORD(2, 0);
+ status = WSAStartup(wVersionRequested, &wsaData);
+ if (status != 0) {
+ rrd_set_error("failed to initialize socket library %d", status);
+ return (-1);
+ }
#endif
- ai_res = NULL;
- status = getaddrinfo (addr,
- port == NULL ? RRDCACHED_DEFAULT_PORT : port,
- &ai_hints, &ai_res);
- if (status != 0)
- {
- rrd_set_error ("failed to resolve address '%s' (port %s): %s (%d)",
- addr, port == NULL ? RRDCACHED_DEFAULT_PORT : port,
- gai_strerror (status), status);
- return (-1);
- }
-
- for (ai_ptr = ai_res; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
- {
- client->sd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
- if (client->sd < 0)
- {
- status = errno;
- client->sd = -1;
- continue;
- }
-
- status = connect (client->sd, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
- if (status != 0)
- {
- status = errno;
- close_connection(client);
- continue;
+ ai_res = NULL;
+ status = getaddrinfo(addr,
+ port == NULL ? RRDCACHED_DEFAULT_PORT : port,
+ &ai_hints, &ai_res);
+ if (status != 0) {
+ rrd_set_error("failed to resolve address '%s' (port %s): %s (%d)",
+ addr, port == NULL ? RRDCACHED_DEFAULT_PORT : port,
+ gai_strerror(status), status);
+ return (-1);
}
- assert (status == 0);
- break;
- } /* for (ai_ptr) */
- freeaddrinfo(ai_res);
+ for (ai_ptr = ai_res; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) {
+ client->sd =
+ socket(ai_ptr->ai_family, ai_ptr->ai_socktype,
+ ai_ptr->ai_protocol);
+ if (client->sd < 0) {
+ status = errno;
+ client->sd = -1;
+ continue;
+ }
- return (status);
-} /* }}} int connect_network */
+ status = connect(client->sd, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
+ if (status != 0) {
+ status = errno;
+ close_connection(client);
+ continue;
+ }
+ assert(status == 0);
+ break;
+ } /* for (ai_ptr) */
-static int client_connect(rrd_client_t *client, const char *addr) /* {{{ */
-{
- rrd_clear_error ();
- if (strncmp ("unix:", addr, strlen ("unix:")) == 0)
- return connect_unix(client, addr + strlen ("unix:"));
- else if (addr[0] == '/')
- return connect_unix(client, addr);
- return connect_network(client, addr);
-} /* }}} int client_connect */
-
-static int reconnect(rrd_client_t *client) /* {{{ */
-{
- if ((client == NULL) || (client->sd_path == NULL))
- return -1;
+ freeaddrinfo(ai_res);
+
+ return (status);
+} /* }}} int connect_network */
+
+static int client_connect(
+ rrd_client_t *client,
+ const char *addr)
+{ /* {{{ */
+ rrd_clear_error();
+ if (strncmp("unix:", addr, strlen("unix:")) == 0)
+ return connect_unix(client, addr + strlen("unix:"));
+ else if (addr[0] == '/')
+ return connect_unix(client, addr);
+ return connect_network(client, addr);
+} /* }}} int client_connect */
+
+static int reconnect(
+ rrd_client_t *client)
+{ /* {{{ */
+ if ((client == NULL) || (client->sd_path == NULL))
+ return -1;
+
+ close_socket(client);
+ return client_connect(client, client->sd_path);
+} /* }}} int reconnect */
+
+int rrd_client_connect(
+ rrd_client_t *client,
+ const char *addr)
+{ /* {{{ */
+ int status = 0;
+
+ if (addr == NULL) {
+ addr = getenv(ENV_RRDCACHED_ADDRESS);
+ }
- close_socket(client);
- return client_connect(client, client->sd_path);
-} /* }}} int reconnect */
+ if ((client == NULL) || (addr == NULL) || (strcmp(addr, "") == 0)) {
+ return 0;
+ }
-int rrd_client_connect(rrd_client_t *client, const char *addr) /* {{{ */
-{
- int status = 0;
+ if ((client->sd >= 0) && (client->sd_path != NULL)
+ && (strcmp(addr, client->sd_path) == 0)) {
+ /* connection to the same daemon; use existing connection */
+ return (0);
+ } else {
+ close_connection(client);
+ }
- if (addr == NULL) {
- addr = getenv (ENV_RRDCACHED_ADDRESS);
- }
+ status = client_connect(client, addr);
+
+ if ((status == 0) && (client->sd >= 0))
+ client->sd_path = strdup(addr);
+ else {
+ char *err = rrd_test_error()? rrd_get_error() : "Internal error";
+
+ /* err points the string that gets written to by rrd_set_error(), thus we
+ * cannot pass it to that function */
+ err = strdup(err);
+ rrd_set_error("Unable to connect to rrdcached: %s", (status < 0)
+ ? (err ? err : "Internal error")
+ : rrd_strerror(status));
+ if (err != NULL)
+ free(err);
+ }
- if ((client == NULL) || (addr == NULL) || (strcmp(addr,"") == 0)) {
+ return (status);
+} /* }}} rrd_client_connect */
+
+int rrdc_connect(
+ const char *addr)
+{ /* {{{ */
+ int status;
+
+ mutex_lock(&lock);
+ status = rrd_client_connect(&default_client, addr);
+ mutex_unlock(&lock);
+ return status;
+} /* }}} int rrdc_connect */
+
+int rrdc_disconnect(
+ void)
+{ /* {{{ */
+ mutex_lock(&lock);
+ close_connection(&default_client);
+ mutex_unlock(&lock);
return 0;
- }
+} /* }}} int rrdc_disconnect */
+
+rrd_client_t *rrd_client_new(
+ const char *addr)
+{ /* {{{ */
+ rrd_client_t *client;
+
+ client = calloc(1, sizeof(*client));
+ if (client == NULL)
+ return NULL;
+
+ client->sd = -1;
+
+ if (addr == NULL)
+ return client;
+
+ if (rrd_client_connect(client, addr) != 0) {
+ rrd_client_destroy(client);
+ return NULL;
+ }
+
+ return client;
+} /* }}} rrd_client_t rrd_client_new */
+
+void rrd_client_destroy(
+ rrd_client_t *client)
+{ /* {{{ */
+ if (client == NULL)
+ return;
- if ((client->sd >= 0) && (client->sd_path != NULL) && (strcmp(addr, client->sd_path) == 0))
- {
- /* connection to the same daemon; use existing connection */
- return (0);
- }
- else
- {
close_connection(client);
- }
-
- status = client_connect(client, addr);
-
- if ((status == 0) && (client->sd >= 0))
- client->sd_path = strdup(addr);
- else
- {
- char *err = rrd_test_error () ? rrd_get_error () : "Internal error";
- /* err points the string that gets written to by rrd_set_error(), thus we
- * cannot pass it to that function */
- err = strdup (err);
- rrd_set_error("Unable to connect to rrdcached: %s",
- (status < 0)
- ? (err ? err : "Internal error")
- : rrd_strerror (status));
- if (err != NULL)
- free (err);
- }
-
- return (status);
-} /* }}} rrd_client_connect */
-int rrdc_connect (const char *addr) /* {{{ */
-{
- int status;
- mutex_lock(&lock);
- status = rrd_client_connect(&default_client, addr);
- mutex_unlock(&lock);
- return status;
-} /* }}} int rrdc_connect */
-
-int rrdc_disconnect (void) /* {{{ */
+ free(client);
+} /* }}} void rrd_client_destroy */
+
+int rrd_client_update(
+ rrd_client_t *client,
+ const char *filename, /* {{{ */
+ int values_num,
+ const char *const *values)
{
- mutex_lock(&lock);
- close_connection(&default_client);
- mutex_unlock(&lock);
- return 0;
-} /* }}} int rrdc_disconnect */
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
+ int i;
+ char *file_path;
+
+ if (client == NULL)
+ return -1;
+
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+
+ status = buffer_add_string("update", &buffer_ptr, &buffer_free);
+ if (status != 0)
+ return (ENOBUFS);
-rrd_client_t *rrd_client_new(const char *addr) /* {{{ */
-{
- rrd_client_t *client;
+ file_path = get_path(client, filename);
+ if (file_path == NULL) {
+ return (-1);
+ }
- client = calloc(1, sizeof(*client));
- if (client == NULL)
- return NULL;
+ status = buffer_add_string(file_path, &buffer_ptr, &buffer_free);
+ free(file_path);
- client->sd = -1;
+ if (status != 0) {
+ return (ENOBUFS);
+ }
- if (addr == NULL)
- return client;
+ for (i = 0; i < values_num; i++) {
+ status = buffer_add_value(values[i], &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ return (ENOBUFS);
+ }
+ }
- if (rrd_client_connect(client, addr) != 0) {
- rrd_client_destroy(client);
- return NULL;
- }
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
- return client;
-} /* }}} rrd_client_t rrd_client_new */
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
+
+ if (status != 0)
+ return (status);
+
+ status = res->status;
+ response_free(res);
-void rrd_client_destroy(rrd_client_t *client) /* {{{ */
+ return (status);
+} /* int rrd_client_update */
+
+int rrdc_update(
+ const char *filename,
+ int values_num, /* {{{ */
+ const char *const *values)
{
- if (client == NULL)
- return;
+ int status;
- close_connection(client);
- free(client);
-} /* }}} void rrd_client_destroy */
+ mutex_lock(&lock);
+ status = rrd_client_update(&default_client, filename, values_num, values);
+ mutex_unlock(&lock);
+ return status;
+} /* }}} int rrdc_update */
-int rrd_client_update (rrd_client_t *client, const char *filename, /* {{{ */
- int values_num, const char * const *values)
+static int filebased_command(
+ rrd_client_t *client, /* {{{ */
+ const char *command,
+ const char *filename)
{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
- int i;
- char *file_path;
-
- if (client == NULL)
- return -1;
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
-
- status = buffer_add_string ("update", &buffer_ptr, &buffer_free);
- if (status != 0)
- return (ENOBUFS);
-
- file_path = get_path(client, filename);
- if (file_path == NULL)
- {
- return (-1);
- }
-
- status = buffer_add_string (file_path, &buffer_ptr, &buffer_free);
- free (file_path);
-
- if (status != 0)
- {
- return (ENOBUFS);
- }
-
- for (i = 0; i < values_num; i++)
- {
- status = buffer_add_value (values[i], &buffer_ptr, &buffer_free);
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
+ char *file_path;
+
+ if ((client == NULL) || (filename == NULL))
+ return (-1);
+
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+
+ status = buffer_add_string(command, &buffer_ptr, &buffer_free);
if (status != 0)
- {
- return (ENOBUFS);
+ return (ENOBUFS);
+
+ file_path = get_path(client, filename);
+ if (file_path == NULL) {
+ return (-1);
}
- }
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
+ status = buffer_add_string(file_path, &buffer_ptr, &buffer_free);
+ free(file_path);
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
+ if (status != 0) {
+ return (ENOBUFS);
+ }
- if (status != 0)
- return (status);
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
- status = res->status;
- response_free (res);
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
- return (status);
-} /* int rrd_client_update */
-int rrdc_update (const char *filename, int values_num, /* {{{ */
- const char * const *values)
-{
- int status;
- mutex_lock(&lock);
- status = rrd_client_update(&default_client, filename, values_num, values);
- mutex_unlock(&lock);
- return status;
-} /* }}} int rrdc_update */
-
-static int filebased_command(rrd_client_t *client, /* {{{ */
- const char *command, const char *filename)
-{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
- char *file_path;
-
- if ((client == NULL) || (filename == NULL))
- return (-1);
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
-
- status = buffer_add_string (command, &buffer_ptr, &buffer_free);
- if (status != 0)
- return (ENOBUFS);
-
- file_path = get_path(client, filename);
- if (file_path == NULL)
- {
- return (-1);
- }
-
- status = buffer_add_string (file_path, &buffer_ptr, &buffer_free);
- free (file_path);
-
- if (status != 0)
- {
- return (ENOBUFS);
- }
-
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
-
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
-
- if (status != 0)
- return (status);
+ if (status != 0)
+ return (status);
- status = res->status;
- response_free (res);
- return (status);
-} /* }}} int rrdc_flush */
+ status = res->status;
+ response_free(res);
+ return (status);
+} /* }}} int rrdc_flush */
-int rrd_client_flush(rrd_client_t *client, const char *filename)
+int rrd_client_flush(
+ rrd_client_t *client,
+ const char *filename)
{
- return filebased_command(client, "flush", filename);
-}
-int rrdc_flush (const char *filename) {
- int status;
- mutex_lock(&lock);
- status = rrd_client_flush(&default_client, filename);
- mutex_unlock(&lock);
- return status;
+ return filebased_command(client, "flush", filename);
}
-int rrd_client_forget(rrd_client_t *client, const char *filename) {
- return filebased_command(client, "forget", filename);
+int rrdc_flush(
+ const char *filename)
+{
+ int status;
+
+ mutex_lock(&lock);
+ status = rrd_client_flush(&default_client, filename);
+ mutex_unlock(&lock);
+ return status;
}
-int rrdc_forget(const char *filename) {
- int status;
- mutex_lock(&lock);
- status = rrd_client_forget(&default_client, filename);
- mutex_unlock(&lock);
- return status;
+
+int rrd_client_forget(
+ rrd_client_t *client,
+ const char *filename)
+{
+ return filebased_command(client, "forget", filename);
}
-int rrd_client_flushall (rrd_client_t *client) /* {{{ */
+int rrdc_forget(
+ const char *filename)
{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
+ int status;
+
+ mutex_lock(&lock);
+ status = rrd_client_forget(&default_client, filename);
+ mutex_unlock(&lock);
+ return status;
+}
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
+int rrd_client_flushall(
+ rrd_client_t *client)
+{ /* {{{ */
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
- status = buffer_add_string ("flushall", &buffer_ptr, &buffer_free);
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
- if (status != 0)
- return (ENOBUFS);
+ status = buffer_add_string("flushall", &buffer_ptr, &buffer_free);
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
+ if (status != 0)
+ return (ENOBUFS);
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
+
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
+
+ if (status != 0)
+ return (status);
+
+ status = res->status;
+ response_free(res);
- if (status != 0)
return (status);
+} /* }}} int rrd_client_flushall */
- status = res->status;
- response_free (res);
+int rrdc_flushall(
+ void)
+{ /* {{{ */
+ int status;
- return (status);
-} /* }}} int rrd_client_flushall */
-int rrdc_flushall (void) /* {{{ */
-{
- int status;
- mutex_lock(&lock);
- status = rrd_client_flushall(&default_client);
- mutex_unlock(&lock);
- return status;
-} /* }}} int rrdc_flushall */
-
-rrd_info_t *rrd_client_info(rrd_client_t *client, const char *filename) /* {{{ */
-{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
- char *file_path;
- rrd_info_t *data = NULL, *cd;
- rrd_infoval_t info;
- unsigned int l;
- rrd_info_type_t itype;
- char *k, *s;
-
- if (client == NULL)
- return NULL;
- if (filename == NULL) {
- rrd_set_error ("rrdc_info: no filename");
- return (NULL);
- }
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
-
- status = buffer_add_string ("info", &buffer_ptr, &buffer_free);
- if (status != 0) {
- rrd_set_error ("rrdc_info: out of memory");
- return (NULL);
- }
-
- file_path = get_path(client, filename);
- if (file_path == NULL)
- {
- return (NULL);
- }
-
- status = buffer_add_string (file_path, &buffer_ptr, &buffer_free);
- free (file_path);
-
- if (status != 0)
- {
- rrd_set_error ("rrdc_info: out of memory");
- return (NULL);
- }
-
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
-
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
-
- if (status != 0 || res->status < 0)
- goto out_free_res;
-
- data = cd = NULL;
- for( l=0 ; l < res->lines_num ; l++ ) {
- /* first extract the keyword */
- for(k = s = res->lines[l];s && *s;s++) {
- if(*s == ' ') { *s = 0; s++; break; }
- }
- if(!s || !*s) break;
- itype = (rrd_info_type_t)atoi(s); /* extract type code */
- for(;*s;s++) { if(*s == ' ') { *s = 0; s++; break; } }
- if(!*s) break;
- /* finally, we're pointing to the value */
- switch(itype) {
- case RD_I_VAL:
- if(*s == 'N') { info.u_val = DNAN; } else { info.u_val = atof(s); }
- break;
- case RD_I_CNT:
- info.u_cnt = atol(s);
- break;
- case RD_I_INT:
- info.u_int = atoi(s);
- break;
- case RD_I_STR:
- chomp(s);
- info.u_str = strdup(s);
- break;
- case RD_I_BLO:
- rrd_set_error ("rrdc_info: BLOB objects are not supported");
- if (cd && cd != data) free(cd);
- if (data) free(data);
- response_free(res);
+ mutex_lock(&lock);
+ status = rrd_client_flushall(&default_client);
+ mutex_unlock(&lock);
+ return status;
+} /* }}} int rrdc_flushall */
+
+rrd_info_t *rrd_client_info(
+ rrd_client_t *client,
+ const char *filename)
+{ /* {{{ */
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
+ char *file_path;
+ rrd_info_t *data = NULL, *cd;
+ rrd_infoval_t info;
+ unsigned int l;
+ rrd_info_type_t itype;
+ char *k, *s;
+
+ if (client == NULL)
+ return NULL;
+ if (filename == NULL) {
+ rrd_set_error("rrdc_info: no filename");
return (NULL);
- default:
- rrd_set_error ("rrdc_info: Unsupported info type %d",itype);
- if (cd && cd != data) free(cd);
- if (data) free(data);
- response_free(res);
+ }
+
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+
+ status = buffer_add_string("info", &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_info: out of memory");
return (NULL);
}
- cd = rrd_info_push(cd, sprintf_alloc("%s",k), itype, info);
- if(!data) data = cd;
- if (itype == RD_I_STR) {
- free(info.u_str);
- info.u_str = NULL;
+ file_path = get_path(client, filename);
+ if (file_path == NULL) {
+ return (NULL);
}
- }
-out_free_res:
- response_free (res);
+ status = buffer_add_string(file_path, &buffer_ptr, &buffer_free);
+ free(file_path);
- return (data);
-} /* }}} rrd_client_info */
-rrd_info_t * rrdc_info (const char *filename) /* {{{ */
-{
- rrd_info_t *info;
- mutex_lock(&lock);
- info = rrd_client_info(&default_client, filename);
- mutex_unlock(&lock);
- return info;
-} /* }}} int rrdc_info */
-
-char *rrd_client_list(rrd_client_t *client, int recursive, const char *dirname) /* {{{ */
-{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
- unsigned int i;
- char *list = NULL;
- int list_len = 0;
-
- if (client == NULL)
- return NULL;
- if (dirname == NULL) {
- rrd_set_error ("rrdc_info: no directory name");
- return (NULL);
- }
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
-
- status = buffer_add_string ("list", &buffer_ptr, &buffer_free);
-
- if (status != 0) {
- rrd_set_error ("rrdc_list: out of memory");
- return NULL;
- }
-
- if (recursive) {
- status = buffer_add_string ("RECURSIVE", &buffer_ptr, &buffer_free);
- if (status != 0)
- {
- rrd_set_error ("rrdc_list: out of memory");
- return (NULL);
+ if (status != 0) {
+ rrd_set_error("rrdc_info: out of memory");
+ return (NULL);
+ }
+
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
+
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
+
+ if (status != 0 || res->status < 0)
+ goto out_free_res;
+
+ data = cd = NULL;
+ for (l = 0; l < res->lines_num; l++) {
+ /* first extract the keyword */
+ for (k = s = res->lines[l]; s && *s; s++) {
+ if (*s == ' ') {
+ *s = 0;
+ s++;
+ break;
+ }
+ }
+ if (!s || !*s)
+ break;
+ itype = (rrd_info_type_t) atoi(s); /* extract type code */
+ for (; *s; s++) {
+ if (*s == ' ') {
+ *s = 0;
+ s++;
+ break;
+ }
+ }
+ if (!*s)
+ break;
+ /* finally, we're pointing to the value */
+ switch (itype) {
+ case RD_I_VAL:
+ if (*s == 'N') {
+ info.u_val = DNAN;
+ } else {
+ info.u_val = atof(s);
+ }
+ break;
+ case RD_I_CNT:
+ info.u_cnt = atol(s);
+ break;
+ case RD_I_INT:
+ info.u_int = atoi(s);
+ break;
+ case RD_I_STR:
+ chomp(s);
+ info.u_str = strdup(s);
+ break;
+ case RD_I_BLO:
+ rrd_set_error("rrdc_info: BLOB objects are not supported");
+ if (cd && cd != data)
+ free(cd);
+ if (data)
+ free(data);
+ response_free(res);
+ return (NULL);
+ default:
+ rrd_set_error("rrdc_info: Unsupported info type %d", itype);
+ if (cd && cd != data)
+ free(cd);
+ if (data)
+ free(data);
+ response_free(res);
+ return (NULL);
+ }
+
+ cd = rrd_info_push(cd, sprintf_alloc("%s", k), itype, info);
+ if (!data)
+ data = cd;
+ if (itype == RD_I_STR) {
+ free(info.u_str);
+ info.u_str = NULL;
+ }
+ }
+
+ out_free_res:
+ response_free(res);
+
+ return (data);
+} /* }}} rrd_client_info */
+
+rrd_info_t *rrdc_info(
+ const char *filename)
+{ /* {{{ */
+ rrd_info_t *info;
+
+ mutex_lock(&lock);
+ info = rrd_client_info(&default_client, filename);
+ mutex_unlock(&lock);
+ return info;
+} /* }}} int rrdc_info */
+
+char *rrd_client_list(
+ rrd_client_t *client,
+ int recursive,
+ const char *dirname)
+{ /* {{{ */
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
+ unsigned int i;
+ char *list = NULL;
+ int list_len = 0;
+
+ if (client == NULL)
+ return NULL;
+ if (dirname == NULL) {
+ rrd_set_error("rrdc_info: no directory name");
+ return (NULL);
+ }
+
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+
+ status = buffer_add_string("list", &buffer_ptr, &buffer_free);
+
+ if (status != 0) {
+ rrd_set_error("rrdc_list: out of memory");
+ return NULL;
+ }
+
+ if (recursive) {
+ status = buffer_add_string("RECURSIVE", &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_list: out of memory");
+ return (NULL);
+ }
+ }
+
+ status = buffer_add_string(dirname, &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_list: out of memory");
+ return (NULL);
}
- }
- status = buffer_add_string (dirname, &buffer_ptr, &buffer_free);
- if (status != 0)
- {
- rrd_set_error ("rrdc_list: out of memory");
- return (NULL);
- }
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
+ if (status != 0 || res->status < 0)
+ goto out_free_res;
- if (status != 0 || res->status < 0)
- goto out_free_res;
+ /* Handle the case where the list is empty, allocate
+ * a single byte zeroed string.
+ */
+ if (res->lines_num == 0) {
+ list = calloc(1, 1);
- /* Handle the case where the list is empty, allocate
- * a single byte zeroed string.
- */
- if (res->lines_num == 0) {
- list = calloc(1, 1);
+ if (!list) {
+ rrd_set_error("rrdc_list: out of memory");
+ goto out_free_res;
+ }
- if (!list) {
- rrd_set_error ("rrdc_list: out of memory");
- goto out_free_res;
+ goto out_free_res;
}
- goto out_free_res;
- }
+ for (i = 0; i < res->lines_num; i++) {
+ int len;
+ char *buf;
- for (i = 0; i < res->lines_num ; i++ ) {
- int len;
- char *buf;
+ len = strlen(res->lines[i]);
+ buf = realloc(list, list_len + len + 2);
- len = strlen(res->lines[i]);
- buf = realloc(list, list_len + len + 2);
+ if (!buf) {
+ rrd_set_error("rrdc_list: out of memory");
- if (!buf) {
- rrd_set_error ("rrdc_list: out of memory");
+ if (list) {
+ free(list);
+ list = NULL;
+ }
- if (list) {
- free(list);
- list = NULL;
- }
+ goto out_free_res;
+ }
- goto out_free_res;
+ if (!list)
+ buf[0] = '\0';
+
+ strcat(buf, res->lines[i]);
+ strcat(buf, "\n");
+
+ list = buf;
+ list_len += (len + 1);
}
- if (!list)
- buf[0] = '\0';
+ out_free_res:
+ response_free(res);
- strcat(buf, res->lines[i]);
- strcat(buf, "\n");
+ return list;
+} /* }}} char *rrd_client_list */
- list = buf;
- list_len += (len + 1);
- }
+char *rrdc_list(
+ int recursive,
+ const char *dirname)
+{ /* {{{ */
+ char *files;
-out_free_res:
- response_free (res);
+ mutex_lock(&lock);
+ files = rrd_client_list(&default_client, recursive, dirname);
+ mutex_unlock(&lock);
+ return files;
+} /* }}} char *rrdc_list */
+
+time_t rrd_client_last(
+ rrd_client_t *client,
+ const char *filename)
+{ /* {{{ */
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
+ char *file_path;
+ time_t lastup;
+
+ if (client == NULL)
+ return 0;
+ if (filename == NULL) {
+ rrd_set_error("rrdc_last: no filename");
+ return (-1);
+ }
- return list;
-} /* }}} char *rrd_client_list */
-char *rrdc_list(int recursive, const char *dirname) /* {{{ */
-{
- char *files;
- mutex_lock(&lock);
- files = rrd_client_list(&default_client, recursive, dirname);
- mutex_unlock(&lock);
- return files;
-} /* }}} char *rrdc_list */
-
-time_t rrd_client_last(rrd_client_t *client, const char *filename) /* {{{ */
-{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
- char *file_path;
- time_t lastup;
-
- if (client == NULL)
- return 0;
- if (filename == NULL) {
- rrd_set_error ("rrdc_last: no filename");
- return (-1);
- }
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
-
- status = buffer_add_string ("last", &buffer_ptr, &buffer_free);
- if (status != 0) {
- rrd_set_error ("rrdc_last: out of memory");
- return (-1);
- }
-
- file_path = get_path(client, filename);
- if (file_path == NULL)
- {
- return (-1);
- }
-
- status = buffer_add_string (file_path, &buffer_ptr, &buffer_free);
- free (file_path);
-
- if (status != 0)
- {
- rrd_set_error ("rrdc_last: out of memory");
- return (-1);
- }
-
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
-
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
-
- if (status != 0)
- return (-1);
- if (res->status < 0) {
- response_free (res);
- return (-1);
- }
-
- lastup = atol(res->message);
- response_free (res);
-
- return (lastup);
-} /* }}} int rrd_client_last */
-time_t rrdc_last (const char *filename) /* {{{ */
-{
- time_t t;
- mutex_lock(&lock);
- t = rrd_client_last(&default_client, filename);
- mutex_unlock(&lock);
- return t;
-} /* }}} int rrdc_last */
-
-time_t rrd_client_first (rrd_client_t *client, const char *filename, int rraindex) /* {{{ */
-{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
- char *file_path;
- time_t firstup;
-
- if (client == NULL)
- return 0;
- if (filename == NULL) {
- rrd_set_error ("rrdc_first: no filename specified");
- return (-1);
- }
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
-
- status = buffer_add_string ("first", &buffer_ptr, &buffer_free);
- if (status != 0) {
- rrd_set_error ("rrdc_first: out of memory");
- return (-1);
- }
-
- file_path = get_path(client, filename);
- if (file_path == NULL)
- {
- return (-1);
- }
-
- status = buffer_add_string (file_path, &buffer_ptr, &buffer_free);
- free(file_path);
-
- if (status != 0)
- {
- rrd_set_error ("rrdc_first: out of memory");
- return (-1);
- }
- status = buffer_add_ulong (rraindex, &buffer_ptr, &buffer_free);
- if (status != 0)
- {
- rrd_set_error ("rrdc_first: out of memory");
- return (-1);
- }
-
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
-
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
-
- if (status != 0)
- return (-1);
- if (res->status < 0) {
- response_free (res);
- return (-1);
- }
-
- firstup = atol(res->message);
- response_free (res);
-
- return (firstup);
-} /* }}} int rrd_client_first */
-time_t rrdc_first (const char *filename, int rraindex) /* {{{ */
-{
- time_t t;
- mutex_lock(&lock);
- t = rrd_client_first(&default_client, filename, rraindex);
- mutex_unlock(&lock);
- return t;
-} /* }}} int rrdc_first */
-
-int rrd_client_create(rrd_client_t *client, const char *filename, /* {{{ */
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+
+ status = buffer_add_string("last", &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_last: out of memory");
+ return (-1);
+ }
+
+ file_path = get_path(client, filename);
+ if (file_path == NULL) {
+ return (-1);
+ }
+
+ status = buffer_add_string(file_path, &buffer_ptr, &buffer_free);
+ free(file_path);
+
+ if (status != 0) {
+ rrd_set_error("rrdc_last: out of memory");
+ return (-1);
+ }
+
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
+
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
+
+ if (status != 0)
+ return (-1);
+ if (res->status < 0) {
+ response_free(res);
+ return (-1);
+ }
+
+ lastup = atol(res->message);
+ response_free(res);
+
+ return (lastup);
+} /* }}} int rrd_client_last */
+
+time_t rrdc_last(
+ const char *filename)
+{ /* {{{ */
+ time_t t;
+
+ mutex_lock(&lock);
+ t = rrd_client_last(&default_client, filename);
+ mutex_unlock(&lock);
+ return t;
+} /* }}} int rrdc_last */
+
+time_t rrd_client_first(
+ rrd_client_t *client,
+ const char *filename,
+ int rraindex)
+{ /* {{{ */
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
+ char *file_path;
+ time_t firstup;
+
+ if (client == NULL)
+ return 0;
+ if (filename == NULL) {
+ rrd_set_error("rrdc_first: no filename specified");
+ return (-1);
+ }
+
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+
+ status = buffer_add_string("first", &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_first: out of memory");
+ return (-1);
+ }
+
+ file_path = get_path(client, filename);
+ if (file_path == NULL) {
+ return (-1);
+ }
+
+ status = buffer_add_string(file_path, &buffer_ptr, &buffer_free);
+ free(file_path);
+
+ if (status != 0) {
+ rrd_set_error("rrdc_first: out of memory");
+ return (-1);
+ }
+ status = buffer_add_ulong(rraindex, &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_first: out of memory");
+ return (-1);
+ }
+
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
+
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
+
+ if (status != 0)
+ return (-1);
+ if (res->status < 0) {
+ response_free(res);
+ return (-1);
+ }
+
+ firstup = atol(res->message);
+ response_free(res);
+
+ return (firstup);
+} /* }}} int rrd_client_first */
+
+time_t rrdc_first(
+ const char *filename,
+ int rraindex)
+{ /* {{{ */
+ time_t t;
+
+ mutex_lock(&lock);
+ t = rrd_client_first(&default_client, filename, rraindex);
+ mutex_unlock(&lock);
+ return t;
+} /* }}} int rrdc_first */
+
+int rrd_client_create(
+ rrd_client_t *client,
+ const char *filename, /* {{{ */
unsigned long pdp_step,
time_t last_up,
int no_overwrite,
int argc,
const char **argv)
{
- return rrd_client_create_r2(client, filename, pdp_step, last_up, no_overwrite,
- NULL, NULL, argc, argv);
+ return rrd_client_create_r2(client, filename, pdp_step, last_up,
+ no_overwrite, NULL, NULL, argc, argv);
}
-int rrdc_create (const char *filename, /* {{{ */
+
+int rrdc_create(
+ const char *filename, /* {{{ */
unsigned long pdp_step,
time_t last_up,
int no_overwrite,
int argc,
const char **argv)
{
- return rrdc_create_r2(filename, pdp_step, last_up, no_overwrite,
- NULL, NULL, argc, argv);
+ return rrdc_create_r2(filename, pdp_step, last_up, no_overwrite,
+ NULL, NULL, argc, argv);
}
-int rrd_client_create_r2(rrd_client_t *client, const char *filename, /* {{{ */
+int rrd_client_create_r2(
+ rrd_client_t *client,
+ const char *filename, /* {{{ */
unsigned long pdp_step,
time_t last_up,
int no_overwrite,
int argc,
const char **argv)
{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- int status;
- char *file_path;
- int i;
-
- if (client == NULL)
- return -1;
- if (filename == NULL) {
- rrd_set_error ("rrdc_create: no filename specified");
- return (-1);
- }
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
-
- status = buffer_add_string ("create", &buffer_ptr, &buffer_free);
- if (status != 0) {
- rrd_set_error ("rrdc_create: out of memory");
- return (-1);
- }
-
- file_path = get_path(client, filename);
- if (file_path == NULL)
- {
- return (-1);
- }
-
- status = buffer_add_string (file_path, &buffer_ptr, &buffer_free);
- free (file_path);
-
- if (last_up >= 0) {
- status = buffer_add_string ("-b", &buffer_ptr, &buffer_free);
- status = buffer_add_ulong (last_up, &buffer_ptr, &buffer_free);
- }
- status = buffer_add_string ("-s", &buffer_ptr, &buffer_free);
- status = buffer_add_ulong (pdp_step, &buffer_ptr, &buffer_free);
- if(no_overwrite) {
- status = buffer_add_string ("-O", &buffer_ptr, &buffer_free);
- }
-
- if (sources != NULL) {
- for (const char **p = sources ; *p ; p++) {
- status = buffer_add_string ("-r", &buffer_ptr, &buffer_free);
- status = buffer_add_string (*p, &buffer_ptr, &buffer_free);
- }
- }
-
- if (template != NULL) {
- status = buffer_add_string ("-t", &buffer_ptr, &buffer_free);
- status = buffer_add_string (template, &buffer_ptr, &buffer_free);
- }
-
- if (status != 0)
- {
- rrd_set_error ("rrdc_create: out of memory");
- return (-1);
- }
-
- for( i=0; i<argc; i++ ) {
- if( argv[i] ) {
- status = buffer_add_string (argv[i], &buffer_ptr, &buffer_free);
- if (status != 0)
- {
- rrd_set_error ("rrdc_create: out of memory");
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ int status;
+ char *file_path;
+ int i;
+
+ if (client == NULL)
+ return -1;
+ if (filename == NULL) {
+ rrd_set_error("rrdc_create: no filename specified");
+ return (-1);
+ }
+
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+
+ status = buffer_add_string("create", &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_create: out of memory");
+ return (-1);
+ }
+
+ file_path = get_path(client, filename);
+ if (file_path == NULL) {
return (-1);
- }
}
- }
- /* buffer ready to send? */
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
+ status = buffer_add_string(file_path, &buffer_ptr, &buffer_free);
+ free(file_path);
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
+ if (last_up >= 0) {
+ status = buffer_add_string("-b", &buffer_ptr, &buffer_free);
+ status = buffer_add_ulong(last_up, &buffer_ptr, &buffer_free);
+ }
+ status = buffer_add_string("-s", &buffer_ptr, &buffer_free);
+ status = buffer_add_ulong(pdp_step, &buffer_ptr, &buffer_free);
+ if (no_overwrite) {
+ status = buffer_add_string("-O", &buffer_ptr, &buffer_free);
+ }
+
+ if (sources != NULL) {
+ for (const char **p = sources; *p; p++) {
+ status = buffer_add_string("-r", &buffer_ptr, &buffer_free);
+ status = buffer_add_string(*p, &buffer_ptr, &buffer_free);
+ }
+ }
+
+ if (template != NULL) {
+ status = buffer_add_string("-t", &buffer_ptr, &buffer_free);
+ status = buffer_add_string(template, &buffer_ptr, &buffer_free);
+ }
+
+ if (status != 0) {
+ rrd_set_error("rrdc_create: out of memory");
+ return (-1);
+ }
+
+ for (i = 0; i < argc; i++) {
+ if (argv[i]) {
+ status = buffer_add_string(argv[i], &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ rrd_set_error("rrdc_create: out of memory");
+ return (-1);
+ }
+ }
+ }
- if (status != 0)
- return (-1);
+ /* buffer ready to send? */
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
- status = res->status;
- response_free (res);
- return(status);
-} /* }}} int rrd_client_create_r2 */
-int rrdc_create_r2(const char *filename, /* {{{ */
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
+
+ if (status != 0)
+ return (-1);
+
+ status = res->status;
+ response_free(res);
+ return (status);
+} /* }}} int rrd_client_create_r2 */
+
+int rrdc_create_r2(
+ const char *filename, /* {{{ */
unsigned long pdp_step,
time_t last_up,
int no_overwrite,
int argc,
const char **argv)
{
- int status;
- mutex_lock(&lock);
- status = rrd_client_create_r2(&default_client, filename, pdp_step, last_up, no_overwrite,
- sources, template, argc, argv);
- mutex_unlock(&lock);
- return status;
-} /* }}} int rrdc_create_r2 */
-
-int rrd_client_fetch (rrd_client_t *client, const char *filename, /* {{{ */
+ int status;
+
+ mutex_lock(&lock);
+ status =
+ rrd_client_create_r2(&default_client, filename, pdp_step, last_up,
+ no_overwrite, sources, template, argc, argv);
+ mutex_unlock(&lock);
+ return status;
+} /* }}} int rrdc_create_r2 */
+
+int rrd_client_fetch(
+ rrd_client_t *client,
+ const char *filename, /* {{{ */
const char *cf,
- time_t *ret_start, time_t *ret_end,
+ time_t *ret_start,
+ time_t *ret_end,
unsigned long *ret_step,
unsigned long *ret_ds_num,
char ***ret_ds_names,
rrd_value_t **ret_data)
{
- char buffer[RRD_CMD_MAX];
- char *buffer_ptr;
- size_t buffer_free;
- size_t buffer_size;
- rrdc_response_t *res;
- char *file_path;
-
- char *str_tmp;
- unsigned long flush_version;
-
- time_t start;
- time_t end;
- unsigned long step;
- unsigned long ds_num;
- char **ds_names;
-
- rrd_value_t *data;
- size_t data_size;
- size_t data_fill;
-
- int status;
- size_t current_line;
- time_t t;
-
- if ((client == NULL) || (filename == NULL) || (cf == NULL))
- return (-1);
-
- /* Send request {{{ */
-
- memset (buffer, 0, sizeof (buffer));
- buffer_ptr = &buffer[0];
- buffer_free = sizeof (buffer);
- status = buffer_add_string ("FETCH", &buffer_ptr, &buffer_free);
- if (status != 0){
- return (ENOBUFS);
- }
-
- /* change to path for rrdcached */
- file_path = get_path(client, filename);
- if (file_path == NULL){
- return (EINVAL);
- }
-
- status = buffer_add_string (file_path, &buffer_ptr, &buffer_free);
- free (file_path);
-
- if (status != 0) {
- return (ENOBUFS);
- }
-
- status = buffer_add_string (cf, &buffer_ptr, &buffer_free);
- if (status != 0) {
- return (ENOBUFS);
- }
-
- if ((ret_start != NULL) && (*ret_start > 0))
- {
- char tmp[64];
- snprintf (tmp, sizeof (tmp), "%lu", (unsigned long) *ret_start);
- tmp[sizeof (tmp) - 1] = 0;
- status = buffer_add_string (tmp, &buffer_ptr, &buffer_free);
+ char buffer[RRD_CMD_MAX];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ rrdc_response_t *res;
+ char *file_path;
+
+ char *str_tmp;
+ unsigned long flush_version;
+
+ time_t start;
+ time_t end;
+ unsigned long step;
+ unsigned long ds_num;
+ char **ds_names;
+
+ rrd_value_t *data;
+ size_t data_size;
+ size_t data_fill;
+
+ int status;
+ size_t current_line;
+ time_t t;
+
+ if ((client == NULL) || (filename == NULL) || (cf == NULL))
+ return (-1);
+
+ /* Send request {{{ */
+
+ memset(buffer, 0, sizeof(buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof(buffer);
+ status = buffer_add_string("FETCH", &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ return (ENOBUFS);
+ }
+
+ /* change to path for rrdcached */
+ file_path = get_path(client, filename);
+ if (file_path == NULL) {
+ return (EINVAL);
+ }
+
+ status = buffer_add_string(file_path, &buffer_ptr, &buffer_free);
+ free(file_path);
+
if (status != 0) {
- return (ENOBUFS);
+ return (ENOBUFS);
}
- if ((ret_end != NULL) && (*ret_end > 0))
- {
- snprintf (tmp, sizeof (tmp), "%lu", (unsigned long) *ret_end);
- tmp[sizeof (tmp) - 1] = 0;
- status = buffer_add_string (tmp, &buffer_ptr, &buffer_free);
- if (status != 0){
+ status = buffer_add_string(cf, &buffer_ptr, &buffer_free);
+ if (status != 0) {
return (ENOBUFS);
- }
}
- }
- assert (buffer_free < sizeof (buffer));
- buffer_size = sizeof (buffer) - buffer_free;
- assert (buffer[buffer_size - 1] == ' ');
- buffer[buffer_size - 1] = '\n';
+ if ((ret_start != NULL) && (*ret_start > 0)) {
+ char tmp[64];
- res = NULL;
- status = request(client, buffer, buffer_size, &res);
- if (status != 0){
- return (status);
- }
- status = res->status;
- if (status < 0) {
- response_free(res);
- return (status);
- }
+ snprintf(tmp, sizeof(tmp), "%lu", (unsigned long) *ret_start);
+ tmp[sizeof(tmp) - 1] = 0;
+ status = buffer_add_string(tmp, &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ return (ENOBUFS);
+ }
+
+ if ((ret_end != NULL) && (*ret_end > 0)) {
+ snprintf(tmp, sizeof(tmp), "%lu", (unsigned long) *ret_end);
+ tmp[sizeof(tmp) - 1] = 0;
+ status = buffer_add_string(tmp, &buffer_ptr, &buffer_free);
+ if (status != 0) {
+ return (ENOBUFS);
+ }
+ }
+ }
- /* }}} Send request */
+ assert(buffer_free < sizeof(buffer));
+ buffer_size = sizeof(buffer) - buffer_free;
+ assert(buffer[buffer_size - 1] == ' ');
+ buffer[buffer_size - 1] = '\n';
- ds_names = NULL;
- ds_num = 0;
- data = NULL;
- current_line = 0;
+ res = NULL;
+ status = request(client, buffer, buffer_size, &res);
+ if (status != 0) {
+ return (status);
+ }
+ status = res->status;
+ if (status < 0) {
+ response_free(res);
+ return (status);
+ }
- /* Macros to make error handling a little easier (i. e. less to type and
- * read. `BAIL_OUT' sets the error message, frees all dynamically allocated
- * variables and returns the provided status code. */
+ /* }}} Send request */
+
+ ds_names = NULL;
+ ds_num = 0;
+ data = NULL;
+ current_line = 0;
+
+ /* Macros to make error handling a little easier (i. e. less to type and
+ * read. `BAIL_OUT' sets the error message, frees all dynamically allocated
+ * variables and returns the provided status code. */
#define BAIL_OUT(status, ...) do { \
rrd_set_error ("rrdc_fetch: " __VA_ARGS__); \
free (data); \
current_line++; \
} while (0)
- if (res->lines_num < 1)
- BAIL_OUT (-1, "Premature end of response packet");
-
- /* We're making some very strong assumptions about the fields below. We
- * therefore check the version of the `flush' command first, so that later
- * versions can change the order of fields and it's easier to implement
- * backwards compatibility. */
- READ_NUMERIC_FIELD ("FlushVersion", unsigned long, flush_version);
- if (flush_version != 1)
- BAIL_OUT (-1, "Don't know how to handle flush format version %lu.",
- flush_version);
-
- if (res->lines_num < 5)
- BAIL_OUT (-1, "Premature end of response packet");
-
- READ_NUMERIC_FIELD ("Start", time_t, start);
- READ_NUMERIC_FIELD ("End", time_t, end);
- if (start >= end)
- BAIL_OUT (-1, "Malformed start and end times: start = %lu; end = %lu;",
- (unsigned long) start,
- (unsigned long) end);
-
- READ_NUMERIC_FIELD ("Step", unsigned long, step);
- if (step < 1)
- BAIL_OUT (-1, "Invalid number for Step: %lu", step);
-
- READ_NUMERIC_FIELD ("DSCount", unsigned long, ds_num);
- if (ds_num < 1)
- BAIL_OUT (-1, "Invalid number for DSCount: %lu", ds_num);
-
- /* It's time to allocate some memory */
- ds_names = (char **)calloc ((size_t) ds_num, sizeof (*ds_names));
- if (ds_names == NULL)
- BAIL_OUT (-1, "Out of memory");
-
- status = parse_char_array_header (res->lines[current_line],
- &str_tmp, ds_names, (size_t) ds_num, /* alloc = */ 1);
- if (status != 0)
- BAIL_OUT (-1, "Unable to parse header `DSName'");
- if (strcasecmp ("DSName", str_tmp) != 0)
- BAIL_OUT (-1, "Unexpected header line: Expected `DSName', got `%s'", str_tmp);
- current_line++;
-
- data_size = ds_num * (end - start) / step;
- if (data_size < 1)
- BAIL_OUT (-1, "No data returned or headers invalid.");
-
- if (res->lines_num != (6 + (data_size / ds_num)))
- BAIL_OUT (-1, "Got %zu lines, expected %zu",
- res->lines_num, (6 + (data_size / ds_num)));
-
- data = (rrd_value_t *)calloc (data_size, sizeof (*data));
- if (data == NULL)
- BAIL_OUT (-1, "Out of memory");
-
-
- data_fill = 0;
- for (t = start + step; t <= end; t += step, current_line++)
- {
- time_t tmp;
-
- assert (current_line < res->lines_num);
-
- status = parse_value_array_header (res->lines[current_line],
- &tmp, data + data_fill, (size_t) ds_num);
+ if (res->lines_num < 1)
+ BAIL_OUT(-1, "Premature end of response packet");
+
+ /* We're making some very strong assumptions about the fields below. We
+ * therefore check the version of the `flush' command first, so that later
+ * versions can change the order of fields and it's easier to implement
+ * backwards compatibility. */
+ READ_NUMERIC_FIELD("FlushVersion", unsigned long,
+ flush_version);
+
+ if (flush_version != 1)
+ BAIL_OUT(-1, "Don't know how to handle flush format version %lu.",
+ flush_version);
+
+ if (res->lines_num < 5)
+ BAIL_OUT(-1, "Premature end of response packet");
+
+ READ_NUMERIC_FIELD("Start", time_t,
+ start);
+ READ_NUMERIC_FIELD("End", time_t,
+ end);
+
+ if (start >= end)
+ BAIL_OUT(-1, "Malformed start and end times: start = %lu; end = %lu;",
+ (unsigned long) start, (unsigned long) end);
+
+ READ_NUMERIC_FIELD("Step", unsigned long,
+ step);
+
+ if (step < 1)
+ BAIL_OUT(-1, "Invalid number for Step: %lu", step);
+
+ READ_NUMERIC_FIELD("DSCount", unsigned long,
+ ds_num);
+
+ if (ds_num < 1)
+ BAIL_OUT(-1, "Invalid number for DSCount: %lu", ds_num);
+
+ /* It's time to allocate some memory */
+ ds_names = (char **) calloc((size_t) ds_num, sizeof(*ds_names));
+ if (ds_names == NULL)
+ BAIL_OUT(-1, "Out of memory");
+
+ status = parse_char_array_header(res->lines[current_line],
+ &str_tmp, ds_names, (size_t) ds_num,
+ /* alloc = */ 1);
if (status != 0)
- BAIL_OUT (-1, "Cannot parse value line");
+ BAIL_OUT(-1, "Unable to parse header `DSName'");
+ if (strcasecmp("DSName", str_tmp) != 0)
+ BAIL_OUT(-1, "Unexpected header line: Expected `DSName', got `%s'",
+ str_tmp);
+ current_line++;
+
+ data_size = ds_num * (end - start) / step;
+ if (data_size < 1)
+ BAIL_OUT(-1, "No data returned or headers invalid.");
+
+ if (res->lines_num != (6 + (data_size / ds_num)))
+ BAIL_OUT(-1, "Got %zu lines, expected %zu",
+ res->lines_num, (6 + (data_size / ds_num)));
- data_fill += (size_t) ds_num;
- }
+ data = (rrd_value_t *) calloc(data_size, sizeof(*data));
+ if (data == NULL)
+ BAIL_OUT(-1, "Out of memory");
- *ret_start = start;
- *ret_end = end;
- *ret_step = step;
- *ret_ds_num = ds_num;
- *ret_ds_names = ds_names;
- *ret_data = data;
- response_free (res);
- return (0);
+ data_fill = 0;
+ for (t = start + step; t <= end; t += step, current_line++) {
+ time_t tmp;
+
+ assert(current_line < res->lines_num);
+
+ status = parse_value_array_header(res->lines[current_line],
+ &tmp, data + data_fill,
+ (size_t) ds_num);
+ if (status != 0)
+ BAIL_OUT(-1, "Cannot parse value line");
+
+ data_fill += (size_t) ds_num;
+ }
+
+ *ret_start = start;
+ *ret_end = end;
+ *ret_step = step;
+ *ret_ds_num = ds_num;
+ *ret_ds_names = ds_names;
+ *ret_data = data;
+
+ response_free(res);
+ return (0);
#undef READ_NUMERIC_FIELD
#undef BAIL_OUT
-} /* }}} int_rrd_client_fetch */
-int rrdc_fetch (const char *filename, /* {{{ */
+} /* }}} int_rrd_client_fetch */
+
+int rrdc_fetch(
+ const char *filename, /* {{{ */
const char *cf,
- time_t *ret_start, time_t *ret_end,
+ time_t *ret_start,
+ time_t *ret_end,
unsigned long *ret_step,
unsigned long *ret_ds_num,
char ***ret_ds_names,
rrd_value_t **ret_data)
{
- int status;
- mutex_lock(&lock);
- status = rrd_client_fetch(&default_client, filename, cf, ret_start, ret_end,
- ret_step, ret_ds_num, ret_ds_names, ret_data);
- mutex_unlock(&lock);
- return status;
-} /* }}} int rrdc_fetch */
+ int status;
+
+ mutex_lock(&lock);
+ status =
+ rrd_client_fetch(&default_client, filename, cf, ret_start, ret_end,
+ ret_step, ret_ds_num, ret_ds_names, ret_data);
+ mutex_unlock(&lock);
+ return status;
+} /* }}} int rrdc_fetch */
/* convenience function; if there is a daemon specified, or if we can
* detect one from the environment, then flush the file. Otherwise, no-op
*/
-int rrdc_flush_if_daemon(const char *opt_daemon, const char *filename) /* {{{ */
-{
- int status;
-
- mutex_lock(&lock);
- rrd_client_connect(&default_client, opt_daemon);
+int rrdc_flush_if_daemon(
+ const char *opt_daemon,
+ const char *filename)
+{ /* {{{ */
+ int status;
+
+ mutex_lock(&lock);
+ rrd_client_connect(&default_client, opt_daemon);
+
+ if (!rrdc_is_connected(opt_daemon)) {
+ mutex_unlock(&lock);
+ return 0;
+ }
- if (!rrdc_is_connected(opt_daemon)) {
+ rrd_clear_error();
+ status = rrd_client_flush(&default_client, filename);
mutex_unlock(&lock);
- return 0;
- }
- rrd_clear_error();
- status = rrd_client_flush(&default_client, filename);
- mutex_unlock(&lock);
-
- if (status != 0 && !rrd_test_error())
- {
- if (status > 0)
- {
- rrd_set_error("rrdc_flush (%s) failed: %s",
- filename, rrd_strerror(status));
- }
- else if (status < 0)
- {
- rrd_set_error("rrdc_flush (%s) failed with status %i.",
- filename, status);
+ if (status != 0 && !rrd_test_error()) {
+ if (status > 0) {
+ rrd_set_error("rrdc_flush (%s) failed: %s",
+ filename, rrd_strerror(status));
+ } else if (status < 0) {
+ rrd_set_error("rrdc_flush (%s) failed with status %i.",
+ filename, status);
+ }
}
- }
- return status;
-} /* }}} int rrdc_flush_if_daemon */
+ return status;
+} /* }}} int rrdc_flush_if_daemon */
/* convenience function; if there is a daemon specified, or if we can
* detect one from the environment, then flush the file. Otherwise, no-op
*/
-int rrdc_flushall_if_daemon(const char *opt_daemon) /* {{{ */
-{
- int status;
+int rrdc_flushall_if_daemon(
+ const char *opt_daemon)
+{ /* {{{ */
+ int status;
- mutex_lock(&lock);
- rrd_client_connect(&default_client, opt_daemon);
+ mutex_lock(&lock);
+ rrd_client_connect(&default_client, opt_daemon);
- if (!rrdc_is_connected(opt_daemon)) {
- mutex_unlock(&lock);
- return 0;
- }
+ if (!rrdc_is_connected(opt_daemon)) {
+ mutex_unlock(&lock);
+ return 0;
+ }
- rrd_clear_error();
- status = rrd_client_flushall(&default_client);
- mutex_unlock(&lock);
+ rrd_clear_error();
+ status = rrd_client_flushall(&default_client);
+ mutex_unlock(&lock);
- if (status != 0 && !rrd_test_error())
- {
- if (status > 0)
- {
- rrd_set_error("rrdc_flushall failed: %s", rrd_strerror(status));
- }
- else if (status < 0)
- {
- rrd_set_error("rrdc_flushall failed with status %i.", status);
+ if (status != 0 && !rrd_test_error()) {
+ if (status > 0) {
+ rrd_set_error("rrdc_flushall failed: %s", rrd_strerror(status));
+ } else if (status < 0) {
+ rrd_set_error("rrdc_flushall failed with status %i.", status);
+ }
}
- }
- return status;
-} /* }}} rrdc_flushall_if_daemon */
+ return status;
+} /* }}} rrdc_flushall_if_daemon */
-int rrd_client_stats_get(rrd_client_t *client, rrdc_stats_t **ret_stats) /* {{{ */
-{
- rrdc_stats_t *head;
- rrdc_stats_t *tail;
+int rrd_client_stats_get(
+ rrd_client_t *client,
+ rrdc_stats_t **ret_stats)
+{ /* {{{ */
+ rrdc_stats_t *head;
+ rrdc_stats_t *tail;
- rrdc_response_t *res;
+ rrdc_response_t *res;
- int status;
- size_t i;
+ int status;
+ size_t i;
- /* Protocol example: {{{
- * -> STATS
- * <- 5 Statistics follow
- * <- QueueLength: 0
- * <- UpdatesWritten: 0
- * <- DataSetsWritten: 0
- * <- TreeNodesNumber: 0
- * <- TreeDepth: 0
- * }}} */
+ /* Protocol example: {{{
+ * -> STATS
+ * <- 5 Statistics follow
+ * <- QueueLength: 0
+ * <- UpdatesWritten: 0
+ * <- DataSetsWritten: 0
+ * <- TreeNodesNumber: 0
+ * <- TreeDepth: 0
+ * }}} */
- res = NULL;
- status = request(client, "STATS\n", strlen ("STATS\n"), &res);
+ res = NULL;
+ status = request(client, "STATS\n", strlen("STATS\n"), &res);
- if (status != 0)
- return (status);
-
- if (res->status <= 0)
- {
- response_free (res);
- return (EIO);
- }
-
- head = NULL;
- tail = NULL;
- for (i = 0; i < res->lines_num; i++)
- {
- char *key;
- char *value;
- char *endptr;
- rrdc_stats_t *s;
-
- key = res->lines[i];
- value = strchr (key, ':');
- if (value == NULL)
- continue;
- *value = 0;
- value++;
-
- while ((value[0] == ' ') || (value[0] == '\t'))
- value++;
-
- s = (rrdc_stats_t *) malloc (sizeof (rrdc_stats_t));
- if (s == NULL)
- continue;
- memset (s, 0, sizeof (*s));
-
- s->name = strdup (key);
+ if (status != 0)
+ return (status);
- endptr = NULL;
- if ((strcmp ("QueueLength", key) == 0)
- || (strcmp ("TreeDepth", key) == 0)
- || (strcmp ("TreeNodesNumber", key) == 0))
- {
- s->type = RRDC_STATS_TYPE_GAUGE;
- rrd_strtodbl(value, &endptr, &(s->value.gauge),
- "QueueLength or TreeDepth or TreeNodesNumber");
- }
- else if ((strcmp ("DataSetsWritten", key) == 0)
- || (strcmp ("FlushesReceived", key) == 0)
- || (strcmp ("JournalBytes", key) == 0)
- || (strcmp ("JournalRotate", key) == 0)
- || (strcmp ("UpdatesReceived", key) == 0)
- || (strcmp ("UpdatesWritten", key) == 0))
- {
- s->type = RRDC_STATS_TYPE_COUNTER;
- s->value.counter = (uint64_t) strtoll (value, &endptr, /* base = */ 0);
- }
- else
- {
- free (s);
- continue;
+ if (res->status <= 0) {
+ response_free(res);
+ return (EIO);
}
- /* Conversion failed */
- if ( (endptr == value) || (endptr[0] != '\0') )
- {
- free (s);
- continue;
- }
+ head = NULL;
+ tail = NULL;
+ for (i = 0; i < res->lines_num; i++) {
+ char *key;
+ char *value;
+ char *endptr;
+ rrdc_stats_t *s;
+
+ key = res->lines[i];
+ value = strchr(key, ':');
+ if (value == NULL)
+ continue;
+ *value = 0;
+ value++;
+
+ while ((value[0] == ' ') || (value[0] == '\t'))
+ value++;
+
+ s = (rrdc_stats_t *) malloc(sizeof(rrdc_stats_t));
+ if (s == NULL)
+ continue;
+ memset(s, 0, sizeof(*s));
+
+ s->name = strdup(key);
+
+ endptr = NULL;
+ if ((strcmp("QueueLength", key) == 0)
+ || (strcmp("TreeDepth", key) == 0)
+ || (strcmp("TreeNodesNumber", key) == 0)) {
+ s->type = RRDC_STATS_TYPE_GAUGE;
+ rrd_strtodbl(value, &endptr, &(s->value.gauge),
+ "QueueLength or TreeDepth or TreeNodesNumber");
+ } else if ((strcmp("DataSetsWritten", key) == 0)
+ || (strcmp("FlushesReceived", key) == 0)
+ || (strcmp("JournalBytes", key) == 0)
+ || (strcmp("JournalRotate", key) == 0)
+ || (strcmp("UpdatesReceived", key) == 0)
+ || (strcmp("UpdatesWritten", key) == 0)) {
+ s->type = RRDC_STATS_TYPE_COUNTER;
+ s->value.counter =
+ (uint64_t) strtoll(value, &endptr, /* base = */ 0);
+ } else {
+ free(s);
+ continue;
+ }
- if (head == NULL)
- {
- head = s;
- tail = s;
- s->next = NULL;
- }
- else
- {
- tail->next = s;
- tail = s;
- }
- } /* for (i = 0; i < res->lines_num; i++) */
+ /* Conversion failed */
+ if ((endptr == value) || (endptr[0] != '\0')) {
+ free(s);
+ continue;
+ }
- response_free (res);
+ if (head == NULL) {
+ head = s;
+ tail = s;
+ s->next = NULL;
+ } else {
+ tail->next = s;
+ tail = s;
+ }
+ } /* for (i = 0; i < res->lines_num; i++) */
+
+ response_free(res);
- if (head == NULL)
+ if (head == NULL)
#ifdef EPROTO
- return (EPROTO);
+ return (EPROTO);
#else
- return (EINVAL);
+ return (EINVAL);
#endif
- *ret_stats = head;
- return (0);
-} /* }}} int rrd_client_stats_get */
-int rrdc_stats_get (rrdc_stats_t **ret_stats) /* {{{ */
-{
- int status;
- mutex_lock (&lock);
- status = rrd_client_stats_get(&default_client, ret_stats);
- mutex_unlock (&lock);
- return status;
-} /* }}} int rrdc_stats_get */
-
-void rrdc_stats_free (rrdc_stats_t *ret_stats) /* {{{ */
-{
- rrdc_stats_t *stats;
+ *ret_stats = head;
+ return (0);
+} /* }}} int rrd_client_stats_get */
+
+int rrdc_stats_get(
+ rrdc_stats_t **ret_stats)
+{ /* {{{ */
+ int status;
- stats = ret_stats;
- while (stats != NULL)
- {
- rrdc_stats_t *next;
+ mutex_lock(&lock);
+ status = rrd_client_stats_get(&default_client, ret_stats);
+ mutex_unlock(&lock);
+ return status;
+} /* }}} int rrdc_stats_get */
- next = stats->next;
+void rrdc_stats_free(
+ rrdc_stats_t *ret_stats)
+{ /* {{{ */
+ rrdc_stats_t *stats;
- if (stats->name != NULL)
- {
- free ((char *)stats->name);
- stats->name = NULL;
- }
- free (stats);
+ stats = ret_stats;
+ while (stats != NULL) {
+ rrdc_stats_t *next;
+
+ next = stats->next;
+
+ if (stats->name != NULL) {
+ free((char *) stats->name);
+ stats->name = NULL;
+ }
+ free(stats);
- stats = next;
- } /* while (this != NULL) */
-} /* }}} void rrdc_stats_free */
+ stats = next;
+ } /* while (this != NULL) */
+} /* }}} void rrdc_stats_free */
/*
* vim: set sw=2 sts=2 ts=8 et fdm=marker :
projects / thirdparty / rrdtool-1.x.git / commitdiff
