From: Florian Forster Date: Thu, 18 Oct 2012 10:43:30 +0000 (+0200) Subject: Merge branch 'collectd-4.10' into collectd-5.0 X-Git-Tag: collectd-5.0.5~2 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=400596160704146845940d7d9c4f794c0d2ddc03;hp=ab6ab6ad6428ba0a0987a20a7d1cfa47d6cc6f8b;p=collectd.git Merge branch 'collectd-4.10' into collectd-5.0 Conflicts: src/utils_db_query.c src/utils_db_query.h --- diff --git a/src/disk.c b/src/disk.c index fde0dcde..7411c225 100644 --- a/src/disk.c +++ b/src/disk.c @@ -235,6 +235,16 @@ static void disk_submit (const char *plugin_instance, plugin_dispatch_values (&vl); } /* void disk_submit */ +#if KERNEL_LINUX +static counter_t disk_calc_time_incr (counter_t delta_time, counter_t delta_ops) +{ + double avg_time = ((double) delta_time) / ((double) delta_ops); + double avg_time_incr = CDTIME_T_TO_DOUBLE (interval_g) * avg_time; + + return ((counter_t) (avg_time_incr + .5)); +} +#endif + #if HAVE_IOKIT_IOKITLIB_H static signed long long dict_get_value (CFDictionaryRef dict, const char *key) { @@ -579,13 +589,11 @@ static int disk_read (void) diff_write_time = write_time - ds->write_time; if (diff_read_ops != 0) - ds->avg_read_time += (diff_read_time - + (diff_read_ops / 2)) - / diff_read_ops; + ds->avg_read_time += disk_calc_time_incr ( + diff_read_time, diff_read_ops); if (diff_write_ops != 0) - ds->avg_write_time += (diff_write_time - + (diff_write_ops / 2)) - / diff_write_ops; + ds->avg_write_time += disk_calc_time_incr ( + diff_write_time, diff_write_ops); ds->read_ops = read_ops; ds->read_time = read_time; diff --git a/src/network.c b/src/network.c index 0b299d62..3cf22274 100644 --- a/src/network.c +++ b/src/network.c @@ -59,7 +59,18 @@ #if HAVE_LIBGCRYPT # include +# if defined __APPLE__ +/* default xcode compiler throws warnings even when deprecated functionality + * is not used. -Werror breaks the build because of erroneous warnings. + * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209 + */ +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# endif # include +# if defined __APPLE__ +/* Re enable deprecation warnings */ +# pragma GCC diagnostic warning "-Wdeprecated-declarations" +# endif GCRY_THREAD_OPTION_PTHREAD_IMPL; #endif @@ -662,7 +673,7 @@ static int write_part_number (char **ret_buffer, int *ret_buffer_len, part_header_t pkg_head; uint64_t pkg_value; - + int offset; packet_len = sizeof (pkg_head) + sizeof (pkg_value); @@ -2718,7 +2729,7 @@ static int add_to_buffer (char *buffer, int buffer_size, /* {{{ */ return (-1); sstrncpy (vl_def->type_instance, vl->type_instance, sizeof (vl_def->type_instance)); } - + if (write_part_values (&buffer, &buffer_size, ds, vl) != 0) return (-1); @@ -3431,7 +3442,7 @@ static int network_init (void) return (0); } /* int network_init */ -/* +/* * The flush option of the network plugin cannot flush individual identifiers. * All the values are added to a buffer and sent when the buffer is full, the * requested value may or may not be in there, it's not worth finding out. We diff --git a/src/utils_db_query.c b/src/utils_db_query.c index 7e7504dc..aadf9c5e 100644 --- a/src/utils_db_query.c +++ b/src/utils_db_query.c @@ -184,7 +184,7 @@ static int udb_config_set_uint (unsigned int *ret_value, /* {{{ */ */ static int udb_result_submit (udb_result_t *r, /* {{{ */ udb_result_preparation_area_t *r_area, - const udb_query_t const *q, udb_query_preparation_area_t *q_area) + udb_query_t const *q, udb_query_preparation_area_t *q_area) { value_list_t vl = VALUE_LIST_INIT; size_t i; @@ -259,7 +259,7 @@ static int udb_result_submit (udb_result_t *r, /* {{{ */ return (0); } /* }}} void udb_result_submit */ -static void udb_result_finish_result (const udb_result_t const *r, /* {{{ */ +static void udb_result_finish_result (udb_result_t const *r, /* {{{ */ udb_result_preparation_area_t *prep_area) { if ((r == NULL) || (prep_area == NULL)) @@ -275,7 +275,7 @@ static void udb_result_finish_result (const udb_result_t const *r, /* {{{ */ static int udb_result_handle_result (udb_result_t *r, /* {{{ */ udb_query_preparation_area_t *q_area, udb_result_preparation_area_t *r_area, - const udb_query_t const *q, char **column_values) + udb_query_t const *q, char **column_values) { size_t i; @@ -290,7 +290,7 @@ static int udb_result_handle_result (udb_result_t *r, /* {{{ */ return udb_result_submit (r, r_area, q, q_area); } /* }}} int udb_result_handle_result */ -static int udb_result_prepare_result (const udb_result_t const *r, /* {{{ */ +static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */ udb_result_preparation_area_t *prep_area, char **column_names, size_t column_num) { @@ -825,7 +825,7 @@ int udb_query_check_version (udb_query_t *q, unsigned int version) /* {{{ */ return (1); } /* }}} int udb_query_check_version */ -void udb_query_finish_result (const udb_query_t const *q, /* {{{ */ +void udb_query_finish_result (udb_query_t const *q, /* {{{ */ udb_query_preparation_area_t *prep_area) { udb_result_preparation_area_t *r_area; @@ -851,7 +851,7 @@ void udb_query_finish_result (const udb_query_t const *q, /* {{{ */ } } /* }}} void udb_query_finish_result */ -int udb_query_handle_result (const udb_query_t const *q, /* {{{ */ +int udb_query_handle_result (udb_query_t const *q, /* {{{ */ udb_query_preparation_area_t *prep_area, char **column_values) { udb_result_preparation_area_t *r_area; @@ -904,7 +904,7 @@ int udb_query_handle_result (const udb_query_t const *q, /* {{{ */ return (0); } /* }}} int udb_query_handle_result */ -int udb_query_prepare_result (const udb_query_t const *q, /* {{{ */ +int udb_query_prepare_result (udb_query_t const *q, /* {{{ */ udb_query_preparation_area_t *prep_area, const char *host, const char *plugin, const char *db_name, char **column_names, size_t column_num, cdtime_t interval) diff --git a/src/utils_db_query.h b/src/utils_db_query.h index 727be036..b6f4cea0 100644 --- a/src/utils_db_query.h +++ b/src/utils_db_query.h @@ -65,13 +65,13 @@ void *udb_query_get_user_data (udb_query_t *q); */ int udb_query_check_version (udb_query_t *q, unsigned int version); -int udb_query_prepare_result (const udb_query_t const *q, +int udb_query_prepare_result (udb_query_t const *q, udb_query_preparation_area_t *prep_area, const char *host, const char *plugin, const char *db_name, char **column_names, size_t column_num, cdtime_t interval); -int udb_query_handle_result (const udb_query_t const *q, +int udb_query_handle_result (udb_query_t const *q, udb_query_preparation_area_t *prep_area, char **column_values); -void udb_query_finish_result (const udb_query_t const *q, +void udb_query_finish_result (udb_query_t const *q, udb_query_preparation_area_t *prep_area); udb_query_preparation_area_t *