![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/unixsock.c b/src/unixsock.c
index 82cfc60433d78209affcbbae61ccfb31a18cbd85..8524beadd6fed8a30349179555ecd95e52f104e8 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
};
static int config_keys_num = 3;
+static int loop = 0;
+
/* socket configuration */
static int sock_fd = -1;
static char *sock_file = NULL;
return (vc);
} /* value_cache_t *cache_search */
-static int cache_alloc_name (char *ret, int ret_len,
- const char *hostname,
- const char *plugin, const char *plugin_instance,
- const char *type, const char *type_instance)
-{
- int status;
-
- assert (plugin != NULL);
- assert (type != NULL);
-
- if ((plugin_instance == NULL) || (strlen (plugin_instance) == 0))
- {
- if ((type_instance == NULL) || (strlen (type_instance) == 0))
- status = snprintf (ret, ret_len, "%s/%s/%s",
- hostname, plugin, type);
- else
- status = snprintf (ret, ret_len, "%s/%s/%s-%s",
- hostname, plugin, type, type_instance);
- }
- else
- {
- if ((type_instance == NULL) || (strlen (type_instance) == 0))
- status = snprintf (ret, ret_len, "%s/%s-%s/%s",
- hostname, plugin, plugin_instance, type);
- else
- status = snprintf (ret, ret_len, "%s/%s-%s/%s-%s",
- hostname, plugin, plugin_instance, type, type_instance);
- }
-
- if ((status < 1) || (status >= ret_len))
- return (-1);
- return (0);
-} /* int cache_alloc_name */
-
static int cache_insert (const data_set_t *ds, const value_list_t *vl)
{
/* We're called from `cache_update' so we don't need to lock the mutex */
value_cache_t *vc;
int i;
- DEBUG ("ds->ds_num = %i; vl->values_len = %i;",
+ DEBUG ("unixsock plugin: cache_insert: ds->ds_num = %i;"
+ " vl->values_len = %i;",
ds->ds_num, vl->values_len);
assert (ds->ds_num == vl->values_len);
return (-1);
}
- if (cache_alloc_name (vc->name, sizeof (vc->name),
- vl->host, vl->plugin, vl->plugin_instance,
- ds->type, vl->type_instance) != 0)
+ if (FORMAT_VL (vc->name, sizeof (vc->name), vl, ds))
{
pthread_mutex_unlock (&cache_lock);
- ERROR ("unixsock plugin: cache_alloc_name failed.");
+ ERROR ("unixsock plugin: FORMAT_VL failed.");
free (vc->counter);
free (vc->gauge);
free (vc);
value_cache_t *vc;
int i;
- if (cache_alloc_name (name, sizeof (name),
- vl->host,
- vl->plugin, vl->plugin_instance,
- ds->type, vl->type_instance) != 0)
+ if (FORMAT_VL (name, sizeof (name), vl, ds) != 0)
return (-1);
pthread_mutex_lock (&cache_lock);
int i;
if (fields_num != 2)
+ {
+ DEBUG ("unixsock plugin: Wrong number of fields: %i", fields_num);
+ fprintf (fh, "-1 Wrong number of fields: Got %i, expected 2.\n",
+ fields_num);
+ fflush (fh);
return (-1);
+ }
+ DEBUG ("unixsock plugin: Got query for `%s'", fields[1]);
status = parse_identifier (fields[1], &hostname,
&plugin, &plugin_instance,
&type, &type_instance);
if (status != 0)
+ {
+ DEBUG ("unixsock plugin: Cannot parse `%s'", fields[1]);
+ fprintf (fh, "-1 Cannot parse identifier.\n");
+ fflush (fh);
return (-1);
+ }
- status = cache_alloc_name (name, sizeof (name),
+ status = format_name (name, sizeof (name),
hostname, plugin, plugin_instance, type, type_instance);
+ /* FIXME: Send some response */
if (status != 0)
return (-1);
char **value_ptr;
if (fields_num != 3)
+ {
+ DEBUG ("unixsock plugin: Wrong number of fields: %i", fields_num);
+ fprintf (fh, "-1 Wrong number of fields: Got %i, expected 3.\n",
+ fields_num);
+ fflush (fh);
return (-1);
+ }
status = parse_identifier (fields[1], &hostname,
&plugin, &plugin_instance,
&type, &type_instance);
if (status != 0)
+ {
+ DEBUG ("unixsock plugin: Cannot parse `%s'", fields[1]);
+ fprintf (fh, "-1 Cannot parse identifier.\n");
+ fflush (fh);
return (-1);
+ }
+ /* FIXME: Send some response */
if ((strlen (hostname) > sizeof (vl.host))
|| (strlen (plugin) > sizeof (vl.plugin))
- || (strlen (plugin_instance) > sizeof (vl.plugin_instance))
- || (strlen (type_instance) > sizeof (vl.type_instance)))
+ || ((plugin_instance != NULL)
+ && (strlen (plugin_instance) > sizeof (vl.plugin_instance)))
+ || ((type_instance != NULL)
+ && (strlen (type_instance) > sizeof (vl.type_instance))))
return (-1);
strcpy (vl.host, hostname);
strcpy (vl.plugin, plugin);
- strcpy (vl.plugin_instance, plugin_instance);
- strcpy (vl.type_instance, type_instance);
+ if (plugin_instance != NULL)
+ strcpy (vl.plugin_instance, plugin_instance);
+ if (type_instance != NULL)
+ strcpy (vl.type_instance, type_instance);
{ /* parse the time */
char *t = fields[2];
return (-1);
value_ptr = (char **) calloc (ds->ds_num, sizeof (char *));
+ /* FIXME: Send some response */
if (value_ptr == NULL)
return (-1);
if (i != ds->ds_num)
{
- free (value_ptr);
+ sfree (value_ptr);
+ /* FIXME: Send some response */
return (-1);
}
} /* done parsing the value-list */
- vl.values_len = fields_num - 2;
+ vl.values_len = ds->ds_num;
vl.values = (value_t *) malloc (vl.values_len * sizeof (value_t));
if (vl.values == NULL)
{
- free (value_ptr);
+ sfree (value_ptr);
return (-1);
}
- vl.values_len = ds->ds_num;
+ DEBUG ("value_ptr = 0x%p; vl.values = 0x%p;", (void *) value_ptr, (void *) vl.values);
for (i = 0; i < ds->ds_num; i++)
{
else if (ds->ds[i].type == DS_TYPE_GAUGE)
vl.values[i].gauge = atof (value_ptr[i]);
} /* for (i = 2 .. fields_num) */
- sfree (value_ptr);
plugin_dispatch_values (type, &vl);
+ DEBUG ("value_ptr = 0x%p; vl.values = 0x%p;", (void *) value_ptr, (void *) vl.values);
+
+ sfree (value_ptr);
sfree (vl.values);
+ fprintf (fh, "0 Success\n");
+ fflush (fh);
+
return (0);
} /* int us_handle_putval */
if (us_open_socket () != 0)
pthread_exit ((void *) 1);
- while (42)
+ while (loop != 0)
{
DEBUG ("Calling accept..");
status = accept (sock_fd, NULL, NULL);
free (remote_fd);
continue;
}
- } /* while (42) */
+ } /* while (loop) */
+
+ close (sock_fd);
+ sock_fd = -1;
return ((void *) 0);
} /* void *us_server_thread */
{
int status;
+ loop = 1;
+
status = pthread_create (&listen_thread, NULL, us_server_thread, NULL);
if (status != 0)
{
{
void *ret;
+ loop = 0;
+
if (listen_thread != (pthread_t) 0)
{
pthread_kill (listen_thread, SIGTERM);
static int us_write (const data_set_t *ds, const value_list_t *vl)
{
cache_update (ds, vl);
- cache_flush (2 * atoi (COLLECTD_STEP));
+ cache_flush (2 * interval_g);
return (0);
}
-void module_register (void)
+void module_register (modreg_e load)
{
plugin_register_config ("unixsock", us_config,
config_keys, config_keys_num);