projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netapp plugin: Fix a typo.
[collectd.git]
/
src
/
rrdtool.c
diff --git
a/src/rrdtool.c
b/src/rrdtool.c
index
2bcfb6d
..
ee5d70c
100644
(file)
--- a/
src/rrdtool.c
+++ b/
src/rrdtool.c
@@
-1,6
+1,8
@@
/**
* collectd - src/rrdtool.c
* Copyright (C) 2006-2008 Florian octo Forster
/**
* collectd - src/rrdtool.c
* Copyright (C) 2006-2008 Florian octo Forster
+ * Copyright (C) 2008-2008 Sebastian Harl
+ * Copyright (C) 2009 Mariusz Gronczewski
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-17,6
+19,8
@@
*
* Authors:
* Florian octo Forster <octo at verplant.org>
*
* Authors:
* Florian octo Forster <octo at verplant.org>
+ * Sebastian Harl <sh at tokkee.org>
+ * Mariusz Gronczewski <xani666 at gmail.com>
**/
#include "collectd.h"
**/
#include "collectd.h"
@@
-106,7
+110,6
@@
static rrdcreate_config_t rrdcreate_config =
static int cache_timeout = 0;
static int cache_flush_timeout = 0;
static int random_timeout = 1;
static int cache_timeout = 0;
static int cache_flush_timeout = 0;
static int random_timeout = 1;
-static int random_timeout_mod = 1;
static time_t cache_flush_last;
static c_avl_tree_t *cache = NULL;
static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
static time_t cache_flush_last;
static c_avl_tree_t *cache = NULL;
static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
@@
-743,17
+746,29
@@
static int rrd_cache_insert (const char *filename,
filename, rc->values_num,
(unsigned long)(rc->last_value - rc->first_value));
filename, rc->values_num,
(unsigned long)(rc->last_value - rc->first_value));
- if ((rc->last_value
- rc->first_value + rc->random_variation
) >= cache_timeout)
+ if ((rc->last_value
+ rc->random_variation - rc->first_value
) >= cache_timeout)
{
/* XXX: If you need to lock both, cache_lock and queue_lock, at
* the same time, ALWAYS lock `cache_lock' first! */
if (rc->flags == FLAG_NONE)
{
int status;
{
/* XXX: If you need to lock both, cache_lock and queue_lock, at
* the same time, ALWAYS lock `cache_lock' first! */
if (rc->flags == FLAG_NONE)
{
int status;
- rc->random_variation = (random_timeout - (rand() % random_timeout_mod));
+
status = rrd_queue_enqueue (filename, &queue_head, &queue_tail);
if (status == 0)
rc->flags = FLAG_QUEUED;
status = rrd_queue_enqueue (filename, &queue_head, &queue_tail);
if (status == 0)
rc->flags = FLAG_QUEUED;
+
+ /* Update the jitter value. Negative values are
+ * slightly preferred. */
+ if (random_timeout > 0)
+ {
+ rc->random_variation = (rand () % (2 * random_timeout))
+ - random_timeout;
+ }
+ else
+ {
+ rc->random_variation = 0;
+ }
}
else
{
}
else
{
@@
-994,16
+1009,20
@@
static int rrd_config (const char *key, const char *value)
}
else if (strcasecmp ("RandomTimeout", key) == 0)
{
}
else if (strcasecmp ("RandomTimeout", key) == 0)
{
- random_timeout = atoi (value);
- if( random_timeout < 0 )
+ int tmp;
+
+ tmp = atoi (value);
+ if (tmp < 0)
+ {
+ fprintf (stderr, "rrdtool: `RandomTimeout' must "
+ "be greater than or equal to zero.\n");
+ ERROR ("rrdtool: `RandomTimeout' must "
+ "be greater then or equal to zero.");
+ }
+ else
{
{
- fprintf (stderr, "rrdtool: `RandomTimeout' must "
- "be greater than or equal to zero.\n");
- ERROR ("rrdtool: `RandomTimeout' must "
- "be greater then or equal to zero.\n");
+ random_timeout = tmp;
}
}
- else if (random_timeout==0) {random_timeout=1;}
- else {random_timeout_mod = random_timeout * 2;}
}
else
{
}
else
{