#include <netdb.h>
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-static int sd;
-static FILE *sh;
+static int sd = -1;
+
+static ssize_t sread (void *buffer_void, size_t buffer_size) /* {{{ */
+{
+ char *buffer;
+ size_t buffer_used;
+ size_t buffer_free;
+ ssize_t status;
+
+ buffer = (char *) buffer_void;
+ buffer_used = 0;
+ buffer_free = buffer_size;
+
+ while (buffer_free > 0)
+ {
+ status = read (sd, buffer + buffer_used, buffer_free);
+ if ((status < 0) && ((errno == EAGAIN) || (errno == EINTR)))
+ continue;
+
+ if (status < 0)
+ return (-1);
+
+ if (status == 0)
+ {
+ close (sd);
+ sd = -1;
+ errno = EPROTO;
+ return (-1);
+ }
+
+ assert ((0 > status) || (buffer_free >= (size_t) status));
+
+ buffer_free = buffer_free - status;
+ buffer_used = buffer_used + status;
+
+ if (buffer[buffer_used - 1] == '\n')
+ break;
+ }
+
+ if (buffer[buffer_used - 1] != '\n')
+ {
+ errno = ENOBUFS;
+ return (-1);
+ }
+
+ buffer[buffer_used - 1] = 0;
+ return (buffer_used);
+} /* }}} ssize_t sread */
+
+static ssize_t swrite (const void *buf, size_t count) /* {{{ */
+{
+ const char *ptr;
+ size_t nleft;
+ ssize_t status;
+
+ ptr = (const char *) buf;
+ nleft = count;
+
+ while (nleft > 0)
+ {
+ status = write (sd, (const void *) ptr, nleft);
+
+ if ((status < 0) && ((errno == EAGAIN) || (errno == EINTR)))
+ continue;
+
+ if (status < 0)
+ {
+ close (sd);
+ sd = -1;
+ return (status);
+ }
+
+ nleft = nleft - status;
+ ptr = ptr + status;
+ }
+
+ return (0);
+} /* }}} ssize_t swrite */
static int buffer_add_string (const char *str, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
- size_t str_size;
+ char *buffer;
+ size_t buffer_size;
+ size_t buffer_pos;
+ size_t i;
+ int status;
- str_size = strlen (str) + 1;
+ 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 (*buffer_size_ret < str_size)
+ if (status != 0)
return (-1);
- memcpy (*buffer_ret, str, str_size);
- *buffer_ret += str_size;
- *buffer_size_ret -= str_size;
+ *buffer_ret = buffer + buffer_pos;
+ *buffer_size_ret = buffer_size - buffer_pos;
return (0);
} /* }}} int buffer_add_string */
struct sockaddr_un sa;
int status;
- if (path == NULL)
- path = RRDD_SOCK_PATH;
+ assert (path != NULL);
pthread_mutex_lock (&lock);
- if (sh != NULL)
+ if (sd >= 0)
{
pthread_mutex_unlock (&lock);
return (0);
return (status);
}
- sh = fdopen (sd, "w+");
- if (sh == NULL)
- {
- status = errno;
- close (sd);
- sd = -1;
- pthread_mutex_unlock (&lock);
- return (status);
- }
-
pthread_mutex_unlock (&lock);
return (0);
int status;
if (addr == NULL)
- addr = RRDD_SOCK_PATH;
+ addr = RRDCACHED_DEFAULT_ADDRESS;
if (strncmp ("unix:", addr, strlen ("unix:")) == 0)
return (rrdc_connect_unix (addr + strlen ("unix:")));
pthread_mutex_lock (&lock);
- if (sh != NULL)
+ if (sd >= 0)
{
pthread_mutex_unlock (&lock);
return (0);
ai_hints.ai_socktype = SOCK_STREAM;
ai_res = NULL;
- status = getaddrinfo (addr, DEFAULT_PORT, &ai_hints, &ai_res);
+ status = getaddrinfo (addr, RRDCACHED_DEFAULT_PORT, &ai_hints, &ai_res);
if (status != 0)
{
pthread_mutex_unlock (&lock);
continue;
}
- sh = fdopen (sd, "w+");
- if (sh == NULL)
- {
- status = errno;
- close (sd);
- sd = -1;
- continue;
- }
-
assert (status == 0);
break;
} /* for (ai_ptr) */
int rrdc_disconnect (void) /* {{{ */
{
- int status;
-
pthread_mutex_lock (&lock);
- if (sh == NULL)
+ if (sd < 0)
{
pthread_mutex_unlock (&lock);
- return (-1);
+ return (0);
}
- status = fclose (sh);
- if (status != 0)
- status = errno;
-
- sh = NULL;
+ close (sd);
sd = -1;
pthread_mutex_unlock (&lock);
- return (status);
+ return (0);
} /* }}} int rrdc_disconnect */
int rrdc_update (const char *filename, int values_num, /* {{{ */
{
char buffer[4096];
char *buffer_ptr;
+ size_t buffer_free;
size_t buffer_size;
int status;
int i;
memset (buffer, 0, sizeof (buffer));
buffer_ptr = &buffer[0];
- buffer_size = sizeof (buffer) - 1;
+ buffer_free = sizeof (buffer);
+
+ status = buffer_add_string ("update", &buffer_ptr, &buffer_free);
+ if (status != 0)
+ return (ENOBUFS);
+
+ status = buffer_add_string (filename, &buffer_ptr, &buffer_free);
+ if (status != 0)
+ return (ENOBUFS);
- buffer_add_string ("update", &buffer_ptr, &buffer_size);
- buffer_add_string (filename, &buffer_ptr, &buffer_size);
for (i = 0; i < values_num; i++)
- buffer_add_value (values[i], &buffer_ptr, &buffer_size);
+ {
+ status = buffer_add_value (values[i], &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';
pthread_mutex_lock (&lock);
- if (sh == NULL)
+ if (sd < 0)
{
pthread_mutex_unlock (&lock);
return (ENOTCONN);
}
- status = write (sd, buffer, sizeof (buffer) - buffer_size);
+ status = swrite (buffer, buffer_size);
+ if (status != 0)
+ {
+ pthread_mutex_unlock (&lock);
+ return (status);
+ }
- status = read (sd, buffer, sizeof (buffer));
+ status = sread (buffer, sizeof (buffer));
if (status < 0)
{
status = errno;
return (ENODATA);
}
+ pthread_mutex_unlock (&lock);
+
status = atoi (buffer);
+ return (status);
+} /* }}} int rrdc_update */
+
+int rrdc_flush (const char *filename) /* {{{ */
+{
+ char buffer[4096];
+ char *buffer_ptr;
+ size_t buffer_free;
+ size_t buffer_size;
+ int status;
+
+ if (filename == NULL)
+ return (-1);
+
+ memset (buffer, 0, sizeof (buffer));
+ buffer_ptr = &buffer[0];
+ buffer_free = sizeof (buffer);
+
+ status = buffer_add_string ("flush", &buffer_ptr, &buffer_free);
+ if (status != 0)
+ return (ENOBUFS);
+
+ status = buffer_add_string (filename, &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';
+
+ pthread_mutex_lock (&lock);
+
+ if (sd < 0)
+ {
+ pthread_mutex_unlock (&lock);
+ return (ENOTCONN);
+ }
+
+ status = swrite (buffer, buffer_size);
+ if (status != 0)
+ {
+ pthread_mutex_unlock (&lock);
+ return (status);
+ }
+
+ status = sread (buffer, sizeof (buffer));
+ if (status < 0)
+ {
+ status = errno;
+ pthread_mutex_unlock (&lock);
+ return (status);
+ }
+ else if (status == 0)
+ {
+ pthread_mutex_unlock (&lock);
+ return (ENODATA);
+ }
pthread_mutex_unlock (&lock);
+ status = atoi (buffer);
return (status);
-} /* }}} int rrd_update_daemon */
+} /* }}} int rrdc_flush */
/*
* vim: set sw=2 sts=2 ts=8 et fdm=marker :
projects / rrdtool.git / blobdiff