![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 95ca90ea3abc63004d97ebb06a6e6a440cc2c608..de24b8fe75255f361f418faa3a68faba2562e6c5 100644 (file)
--- a/program/src/rrd_update.c
+++ b/program/src/rrd_update.c
/*****************************************************************************
- * RRDtool 1.2.19 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.2.29 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
#include "rrd_tool.h"
#include <sys/types.h>
#include <fcntl.h>
-#ifdef HAVE_MMAP
- #include <sys/mman.h>
-#endif
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
#include <sys/locking.h>
*/
#include <sys/timeb.h>
-#ifndef __MINGW32__
+#if (defined(__MINGW32__) && \
+ ((__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 12) || __MINGW32_MAJOR_VERSION > 3))
+#include <sys/time.h>
+#else
+
struct timeval {
time_t tv_sec; /* seconds */
long tv_usec; /* microseconds */
};
-#endif
struct __timezone {
int tz_minuteswest; /* minutes W of Greenwich */
return 0;
}
+#endif /* mingw32 3.4.5 */
#endif
+
/*
* normilize time as returned by gettimeofday. usec part must
* be always >= 0
@@ -261,6 +263,7 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
rpnstack_t rpnstack; /* used for COMPUTE DS */
int version; /* rrd version */
char *endptr; /* used in the conversion */
+
#ifdef HAVE_MMAP
void *rrd_mmaped_file;
unsigned long rrd_filesize;
@@ -280,6 +283,7 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
if(rrd_open(filename,&rrd_file,&rrd, RRD_READWRITE)==-1){
return -1;
}
+
/* initialize time */
version = atoi(rrd.stat_head->version);
gettimeofday(&tmp_time, 0);
@@ -425,6 +429,11 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
fclose(rrd_file);
return(-1);
}
+#ifdef USE_MADVISE
+ /* when we use mmaping we tell the kernel the mmap equivalent
+ of POSIX_FADV_RANDOM */
+ madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
+#endif
#endif
/* loop through the arguments. */
for(arg_i=0; arg_i<argc;arg_i++) {
@@ -524,9 +533,9 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
if(current_time < rrd.live_head->last_up ||
(current_time == rrd.live_head->last_up &&
(long)current_time_usec <= (long)rrd.live_head->last_up_usec)) {
- rrd_set_error("illegal attempt to update using time %ld when "
+ rrd_set_error("%s: illegal attempt to update using time %ld when "
"last update time is %ld (minimum one second step)",
- current_time, rrd.live_head->last_up);
+ filename, current_time, rrd.live_head->last_up);
free(step_start);
break;
}
@@ -613,16 +622,16 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
switch(dst_idx){
case DST_COUNTER:
case DST_DERIVE:
+ for(ii=0;updvals[i+1][ii] != '\0';ii++){
+ if((updvals[i+1][ii] < '0' || updvals[i+1][ii] > '9') && (ii != 0 && updvals[i+1][ii] != '-')){
+ rrd_set_error("not a simple integer: '%s'",updvals[i+1]);
+ break;
+ }
+ }
+ if (rrd_test_error()){
+ break;
+ }
if(rrd.pdp_prep[i].last_ds[0] != 'U'){
- for(ii=0;updvals[i+1][ii] != '\0';ii++){
- if((updvals[i+1][ii] < '0' || updvals[i+1][ii] > '9') && (ii != 0 && updvals[i+1][ii] != '-')){
- rrd_set_error("not a simple integer: '%s'",updvals[i+1]);
- break;
- }
- }
- if (rrd_test_error()){
- break;
- }
pdp_new[i]= rrd_diff(updvals[i+1],rrd.pdp_prep[i].last_ds);
if(dst_idx == DST_COUNTER) {
/* simple overflow catcher suggested by Andres Kroonmaa */
@@ -770,7 +779,7 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
> rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) || */
/* if the interval is larger thatn mrhb we get NAN */
(interval > rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) ||
- (occu_pdp_st-proc_pdp_st <=
+ (rrd.stat_head -> pdp_step / 2.0 <
rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt)) {
pdp_temp[i] = DNAN;
} else {
@@ -1193,7 +1202,7 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
i < rrd.stat_head->rra_cnt;
rra_start += rrd.rra_def[i].row_cnt * rrd.stat_head -> ds_cnt * sizeof(rrd_value_t),
i++) {
- /* is there anything to write for this RRA? If not, continue. */
+ /* is th5Aere anything to write for this RRA? If not, continue. */
if (rra_step_cnt[i] == 0) continue;
/* write the first row */
@@ -1396,7 +1405,7 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
fclose(rrd_file);
return(-1);
}
-
+
/* OK now close the files and free the memory */
if(fclose(rrd_file) != 0){
rrd_set_error("closing rrd");
@@ -1416,6 +1425,8 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
if (schedule_smooth)
{
rrd_file = fopen(filename,"rb+");
+
+
rra_start = rra_begin;
for (i = 0; i < rrd.stat_head -> rra_cnt; ++i)
{