From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 17 Nov 2010 14:18:03 +0000 (+0100)
Subject: Merge branch 'ff/highres'
X-Git-Tag: collectd-5.0.0-beta0~19
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=83077c18c3e78739c2d2d18debf99875944eaa72

Merge branch 'ff/highres'

Conflicts:
	src/netapp.c
---

83077c18c3e78739c2d2d18debf99875944eaa72
diff --cc src/netapp.c
index c50b3dbd,1640cfd2..5c4b6e73
--- a/src/netapp.c
+++ b/src/netapp.c
@@@ -566,7 -566,7 +566,7 @@@ static int submit_values (const char *h
  		const char *plugin_inst,
  		const char *type, const char *type_inst,
  		value_t *values, int values_len,
- 		time_t timestamp, int interval)
 -		cdtime_t timestamp)
++		cdtime_t timestamp, cdtime_t interval)
  {
  	value_list_t vl = VALUE_LIST_INIT;
  
@@@ -595,7 -592,7 +595,7 @@@
  
  static int submit_two_counters (const char *host, const char *plugin_inst, /* {{{ */
  		const char *type, const char *type_inst, counter_t val0, counter_t val1,
- 		time_t timestamp, int interval)
 -		cdtime_t timestamp)
++		cdtime_t timestamp, cdtime_t interval)
  {
  	value_t values[2];
  
@@@ -607,7 -604,7 +607,8 @@@
  } /* }}} int submit_two_counters */
  
  static int submit_counter (const char *host, const char *plugin_inst, /* {{{ */
- 		const char *type, const char *type_inst, counter_t counter, time_t timestamp, int interval)
 -		const char *type, const char *type_inst, counter_t counter, cdtime_t timestamp)
++		const char *type, const char *type_inst, counter_t counter,
++		cdtime_t timestamp, cdtime_t interval)
  {
  	value_t v;
  
@@@ -619,7 -616,7 +620,7 @@@
  
  static int submit_two_gauge (const char *host, const char *plugin_inst, /* {{{ */
  		const char *type, const char *type_inst, gauge_t val0, gauge_t val1,
- 		time_t timestamp, int interval)
 -		cdtime_t timestamp)
++		cdtime_t timestamp, cdtime_t interval)
  {
  	value_t values[2];
  
@@@ -631,7 -628,7 +632,8 @@@
  } /* }}} int submit_two_gauge */
  
  static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
- 		const char *type, const char *type_inst, double d, time_t timestamp, int interval)
 -		const char *type, const char *type_inst, double d, cdtime_t timestamp)
++		const char *type, const char *type_inst, double d,
++		cdtime_t timestamp, cdtime_t interval)
  {
  	value_t v;
  
@@@ -650,8 -647,7 +652,8 @@@ static int submit_cache_ratio (const ch
  		uint64_t new_misses,
  		uint64_t old_hits,
  		uint64_t old_misses,
- 		time_t timestamp,
- 		int interval)
 -		cdtime_t timestamp)
++		cdtime_t timestamp,
++		cdtime_t interval)
  {
  	value_t v;
  
@@@ -988,9 -994,9 +1000,9 @@@ static int cna_query_wafl (host_config_
  
  /* Data corresponding to <Disks /> */
  static int cna_handle_disk_data (const char *hostname, /* {{{ */
- 		cfg_disk_t *cfg_disk, na_elem_t *data, int interval)
 -		cfg_disk_t *cfg_disk, na_elem_t *data)
++		cfg_disk_t *cfg_disk, na_elem_t *data, cdtime_t interval)
  {
- 	time_t timestamp;
+ 	cdtime_t timestamp;
  	na_elem_t *instances;
  	na_elem_t *instance;
  	na_elem_iter_t instance_iter;
@@@ -1183,9 -1189,9 +1195,9 @@@ static int cna_query_disk (host_config_
  
  /* Data corresponding to <VolumePerf /> */
  static int cna_handle_volume_perf_data (const char *hostname, /* {{{ */
- 		cfg_volume_perf_t *cvp, na_elem_t *data, int interval)
 -		cfg_volume_perf_t *cvp, na_elem_t *data)
++		cfg_volume_perf_t *cvp, na_elem_t *data, cdtime_t interval)
  {
- 	time_t timestamp;
+ 	cdtime_t timestamp;
  	na_elem_t *elem_instances;
  	na_elem_iter_t iter_instances;
  	na_elem_t *elem_instance;