projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
utils_latency.c
diff --git
a/src/utils_latency.c
b/src/utils_latency.c
index
d570ab6
..
7a607e4
100644
(file)
--- a/
src/utils_latency.c
+++ b/
src/utils_latency.c
@@
-24,13
+24,17
@@
* Florian Forster <ff at octo.it>
**/
* Florian Forster <ff at octo.it>
**/
+#include <math.h>
+#include <limits.h>
+
#include "collectd.h"
#include "plugin.h"
#include "utils_latency.h"
#include "common.h"
#include "collectd.h"
#include "plugin.h"
#include "utils_latency.h"
#include "common.h"
-#include <math.h>
-#include <limits.h>
+#ifndef LLONG_MAX
+# define LLONG_MAX 9223372036854775807LL
+#endif
#ifndef HISTOGRAM_NUM_BINS
# define HISTOGRAM_NUM_BINS 1000
#ifndef HISTOGRAM_NUM_BINS
# define HISTOGRAM_NUM_BINS 1000
@@
-72,7
+76,7
@@
struct latency_counter_s
* So, if the required bin width is 300, then new bin width will be 512 as it is
* the next nearest power of 2.
*/
* So, if the required bin width is 300, then new bin width will be 512 as it is
* the next nearest power of 2.
*/
-void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */
+
static
void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */
{
/* This function is called because the new value is above histogram's range.
* First find the required bin width:
{
/* This function is called because the new value is above histogram's range.
* First find the required bin width:
@@
-113,7
+117,7
@@
void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */
CDTIME_T_TO_DOUBLE (new_bin_width));
} /* }}} void change_bin_width */
CDTIME_T_TO_DOUBLE (new_bin_width));
} /* }}} void change_bin_width */
-latency_counter_t *latency_counter_create () /* {{{ */
+latency_counter_t *latency_counter_create (
void
) /* {{{ */
{
latency_counter_t *lc;
{
latency_counter_t *lc;
@@
-159,7
+163,7
@@
void latency_counter_add (latency_counter_t *lc, cdtime_t latency) /* {{{ */
bin = (latency - 1) / lc->bin_width;
if (bin >= HISTOGRAM_NUM_BINS)
{
bin = (latency - 1) / lc->bin_width;
if (bin >= HISTOGRAM_NUM_BINS)
{
- ERROR ("utils_latency: latency_counter_add: Invalid bin
%lu"
, bin);
+ ERROR ("utils_latency: latency_counter_add: Invalid bin
: %"PRIu64
, bin);
return;
}
}
return;
}
}