int state;
} cache_entry_t;
-static avl_tree_t *cache_tree = NULL;
+static c_avl_tree_t *cache_tree = NULL;
static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
static int cache_compare (const cache_entry_t *a, const cache_entry_t *b)
notification_t n;
- memset (&n, '\0', sizeof (n));
-
name_copy = strdup (name);
if (name_copy == NULL)
{
return (-1);
}
- n.severity = NOTIF_FAILURE;
- strncpy (n.host, host, sizeof (n.host));
- n.host[sizeof (n.host) - 1] = '\0';
+ /* Copy the associative members */
+ notification_init (&n, NOTIF_FAILURE, /* host = */ NULL,
+ host, plugin, plugin_instance, type, type_instance);
sfree (name_copy);
name_copy = host = plugin = plugin_instance = type = type_instance = NULL;
pthread_mutex_lock (&cache_lock);
+ /*
+ * Set the time _after_ getting the lock because we don't know how long
+ * acquiring the lock takes and we will use this time later to decide
+ * whether or not the state is OKAY.
+ */
n.time = time (NULL);
- status = avl_get (cache_tree, name, (void *) &ce);
+ status = c_avl_get (cache_tree, name, (void *) &ce);
if (status != 0)
{
pthread_mutex_unlock (&cache_lock);
int uc_init (void)
{
if (cache_tree == NULL)
- cache_tree = avl_create ((int (*) (const void *, const void *))
+ cache_tree = c_avl_create ((int (*) (const void *, const void *))
cache_compare);
return (0);
int keys_len = 0;
char *key;
- avl_iterator_t *iter;
+ c_avl_iterator_t *iter;
int i;
pthread_mutex_lock (&cache_lock);
now = time (NULL);
/* Build a list of entries to be flushed */
- iter = avl_get_iterator (cache_tree);
- while (avl_iterator_next (iter, (void *) &key, (void *) &ce) == 0)
+ iter = c_avl_get_iterator (cache_tree);
+ while (c_avl_iterator_next (iter, (void *) &key, (void *) &ce) == 0)
{
/* If entry has not been updated, add to `keys' array */
if ((now - ce->last_update) >= (2 * ce->interval))
if (tmp == NULL)
{
ERROR ("uc_purge: realloc failed.");
- avl_iterator_destroy (iter);
+ c_avl_iterator_destroy (iter);
return (-1);
}
}
keys_len++;
}
- } /* while (avl_iterator_next) */
+ } /* while (c_avl_iterator_next) */
for (i = 0; i < keys_len; i++)
{
{
ce = NULL;
DEBUG ("uc_check_timeout: %s is missing but ``uninteresting''", keys[i]);
- status = avl_remove (cache_tree, keys[i], (void *) &key, (void *) &ce);
+ status = c_avl_remove (cache_tree, keys[i], (void *) &key, (void *) &ce);
if (status != 0)
{
- ERROR ("uc_check_timeout: avl_remove (%s) failed.", keys[i]);
+ ERROR ("uc_check_timeout: c_avl_remove (%s) failed.", keys[i]);
}
sfree (keys[i]);
sfree (ce);
}
} /* for (keys[i]) */
- avl_iterator_destroy (iter);
+ c_avl_iterator_destroy (iter);
pthread_mutex_unlock (&cache_lock);
pthread_mutex_lock (&cache_lock);
- if (avl_get (cache_tree, name, (void *) &ce) == 0)
+ if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
{
int i;
ce->interval = vl->interval;
ce->state = STATE_OKAY;
- if (avl_insert (cache_tree, key, ce) != 0)
+ if (c_avl_insert (cache_tree, key, ce) != 0)
{
pthread_mutex_unlock (&cache_lock);
- ERROR ("uc_insert: avl_insert failed.");
+ ERROR ("uc_insert: c_avl_insert failed.");
return (-1);
}
pthread_mutex_unlock (&cache_lock);
+ /* Do not send okay notifications for uninteresting values, i. e. values for
+ * which no threshold is configured. */
+ if (send_okay_notification > 0)
+ {
+ int status;
+
+ status = ut_check_interesting (name);
+ if (status <= 0)
+ send_okay_notification = 0;
+ }
+
if (send_okay_notification > 0)
{
notification_t n;
memset (&n, '\0', sizeof (n));
+ /* Copy the associative members */
+ NOTIFICATION_INIT_VL (&n, vl, ds);
+
n.severity = NOTIF_OKAY;
- strncpy (n.host, vl->host, sizeof (n.host));
- n.host[sizeof (n.host) - 1] = '\0';
n.time = vl->time;
snprintf (n.message, sizeof (n.message),
pthread_mutex_lock (&cache_lock);
- if (avl_get (cache_tree, name, (void *) &ce) == 0)
+ if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
{
assert (ce != NULL);
assert (ce->values_num == ds->ds_num);
pthread_mutex_lock (&cache_lock);
- if (avl_get (cache_tree, name, (void *) &ce) == 0)
+ if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
{
assert (ce != NULL);
ret = ce->state;
pthread_mutex_lock (&cache_lock);
- if (avl_get (cache_tree, name, (void *) &ce) == 0)
+ if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
{
assert (ce != NULL);
ret = ce->state;