*/
static const char *config_keys[] =
{
+ "CacheFlush",
"Listen",
"Server",
"TimeToLive",
static char send_buffer[BUFF_SIZE];
static char *send_buffer_ptr;
static int send_buffer_fill;
-static value_list_t send_buffer_vl = VALUE_LIST_INIT;
+static value_list_t send_buffer_vl = VALUE_LIST_STATIC;
static char send_buffer_type[DATA_MAX_NAME_LEN];
static pthread_mutex_t send_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
static avl_tree_t *cache_tree = NULL;
static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
+static time_t cache_flush_last;
+static int cache_flush_interval = 1800;
/*
* Private functions
*/
+static int cache_flush (void)
+{
+ char **keys = NULL;
+ int keys_num = 0;
+
+ char **tmp;
+ int i;
+
+ char *key;
+ time_t *value;
+ avl_iterator_t *iter;
+
+ time_t curtime = time (NULL);
+
+ iter = avl_get_iterator (cache_tree);
+ while (avl_iterator_next (iter, (void *) &key, (void *) &value) == 0)
+ {
+ if ((curtime - *value) <= cache_flush_interval)
+ continue;
+ tmp = (char **) realloc (keys,
+ (keys_num + 1) * sizeof (char *));
+ if (tmp == NULL)
+ {
+ sfree (keys);
+ avl_iterator_destroy (iter);
+ ERROR ("network plugin: cache_flush: realloc"
+ " failed.");
+ return (-1);
+ }
+ keys = tmp;
+ keys[keys_num] = key;
+ keys_num++;
+ } /* while (avl_iterator_next) */
+ avl_iterator_destroy (iter);
+
+ for (i = 0; i < keys_num; i++)
+ {
+ if (avl_remove (cache_tree, keys[i], (void *) &key,
+ (void *) &value) != 0)
+ {
+ WARNING ("network plugin: cache_flush: avl_remove"
+ " (%s) failed.", keys[i]);
+ continue;
+ }
+
+ sfree (key);
+ sfree (value);
+ }
+
+ sfree (keys);
+
+ DEBUG ("network plugin: cache_flush: Removed %i %s",
+ keys_num, (keys_num == 1) ? "entry" : "entries");
+ cache_flush_last = curtime;
+ return (0);
+} /* int cache_flush */
+
static int cache_check (const char *type, const value_list_t *vl)
{
char key[1024];
}
}
- /* TODO: Flush cache */
+ if ((time (NULL) - cache_flush_last) > cache_flush_interval)
+ cache_flush ();
pthread_mutex_unlock (&cache_lock);
if (buffer_len < (15))
{
- DEBUG ("packet is too short: buffer_len = %i", buffer_len);
+ DEBUG ("network plugin: packet is too short: buffer_len = %i",
+ buffer_len);
return (-1);
}
if (status == 0)
vl.time = (time_t) tmp;
}
+ else if (ntohs (header->type) == TYPE_INTERVAL)
+ {
+ uint64_t tmp = 0;
+ status = parse_part_number (&buffer, &buffer_len, &tmp);
+ if (status == 0)
+ vl.interval = (int) tmp;
+ }
else if (ntohs (header->type) == TYPE_HOST)
{
status = parse_part_string (&buffer, &buffer_len,
sockent_t *se;
int status;
- DEBUG ("buffer_len = %i", buffer_len);
+ DEBUG ("network plugin: network_send_buffer: buffer_len = %i", buffer_len);
for (se = sending_sockets; se != NULL; se = se->next)
{
(unsigned int) vl->time);
}
+ if (vl_def->interval != vl->interval)
+ {
+ if (write_part_number (&buffer, &buffer_size, TYPE_INTERVAL,
+ (uint64_t) vl->interval))
+ return (-1);
+ vl_def->interval = vl->interval;
+ DEBUG ("network plugin: add_to_buffer: interval = %i",
+ (int) vl->interval);
+ }
+
if (strcmp (vl_def->plugin, vl->plugin) != 0)
{
if (write_part_string (&buffer, &buffer_size, TYPE_PLUGIN,
else
network_config_forward = 0;
}
+ else if (strcasecmp ("CacheFlush", key) == 0)
+ {
+ int tmp = atoi (val);
+ if (tmp > 0)
+ cache_flush_interval = tmp;
+ else return (1);
+ }
else
{
return (-1);
}
return (0);
-}
+} /* int network_config */
static int network_shutdown (void)
{
memset (send_buffer_type, '\0', sizeof (send_buffer_type));
cache_tree = avl_create ((int (*) (const void *, const void *)) strcmp);
+ cache_flush_last = time (NULL);
/* setup socket(s) and so on */
if (sending_sockets != NULL)
plugin_register_config ("network", network_config,
config_keys, config_keys_num);
plugin_register_init ("network", network_init);
-}
+} /* void module_register */