X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_update.c;h=dc1a492bfdfeeba8139f8497f48c5454718b54c2;hb=f3df7df77761c610c9ba328fac01619f4e7b563f;hp=43c0c13c078238c8e13b3d09a23c84f39e420cf9;hpb=5c59f8e02c966f320ec3cdb55df1f1ce3b441a39;p=rrdtool.git diff --git a/src/rrd_update.c b/src/rrd_update.c index 43c0c13..dc1a492 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.8 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_update.c RRD Update Function ***************************************************************************** @@ -32,24 +32,28 @@ */ #include +#ifndef __MINGW32__ struct timeval { time_t tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; +#endif struct __timezone { int tz_minuteswest; /* minutes W of Greenwich */ int tz_dsttime; /* type of dst correction */ }; -static gettimeofday(struct timeval *t, struct __timezone *tz) { - - struct timeb current_time; +static int gettimeofday(struct timeval *t, struct __timezone *tz) { + + struct _timeb current_time; _ftime(¤t_time); - + t->tv_sec = current_time.time; t->tv_usec = current_time.millitm * 1000; + + return 0; } #endif @@ -83,38 +87,19 @@ info_t *write_RRA_row (rrd_t *rrd, unsigned long rra_idx, unsigned short CDP_scratch_idx, FILE *rrd_file, info_t *pcdp_summary, time_t *rra_time); #endif -int rrd_update_r(char *filename, char *template, int argc, char **argv); -int _rrd_update(char *filename, char *template, int argc, char **argv, +int rrd_update_r(const char *filename, const char *tmplt, int argc, const char **argv); +int _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv, info_t*); #define IFDNAN(X,Y) (isnan(X) ? (Y) : (X)); -#ifdef STANDALONE -int -main(int argc, char **argv){ - rrd_update(argc,argv); - if (rrd_test_error()) { - printf("RRDtool " PACKAGE_VERSION " Copyright by Tobi Oetiker, 1997-2005\n\n" - "Usage: rrdupdate filename\n" - "\t\t\t[--template|-t ds-name:ds-name:...]\n" - "\t\t\ttime|N:value[:value...]\n\n" - "\t\t\tat-time@value[:value...]\n\n" - "\t\t\t[ time:value[:value...] ..]\n\n"); - - printf("ERROR: %s\n",rrd_get_error()); - rrd_clear_error(); - return 1; - } - return 0; -} -#endif - info_t *rrd_update_v(int argc, char **argv) { - char *template = NULL; + char *tmplt = NULL; info_t *result = NULL; infoval rc; + rc.u_int = -1; optind = 0; opterr = 0; /* initialize getopt */ while (1) { @@ -133,12 +118,11 @@ info_t *rrd_update_v(int argc, char **argv) switch(opt) { case 't': - template = optarg; + tmplt = optarg; break; case '?': rrd_set_error("unknown option '%s'",argv[optind-1]); - rc.u_int = -1; goto end_tag; } } @@ -146,12 +130,12 @@ info_t *rrd_update_v(int argc, char **argv) /* need at least 2 arguments: filename, data. */ if (argc-optind < 2) { rrd_set_error("Not enough arguments"); - rc.u_int = -1; goto end_tag; } + rc.u_int = 0; result = info_push(NULL,sprintf_alloc("return_value"),RD_I_INT,rc); - rc.u_int = _rrd_update(argv[optind], template, - argc - optind - 1, argv + optind + 1, result); + rc.u_int = _rrd_update(argv[optind], tmplt, + argc - optind - 1, (const char **)(argv + optind + 1), result); result->value.u_int = rc.u_int; end_tag: return result; @@ -160,7 +144,7 @@ end_tag: int rrd_update(int argc, char **argv) { - char *template = NULL; + char *tmplt = NULL; int rc; optind = 0; opterr = 0; /* initialize getopt */ @@ -180,7 +164,7 @@ rrd_update(int argc, char **argv) switch(opt) { case 't': - template = optarg; + tmplt = optarg; break; case '?': @@ -196,19 +180,19 @@ rrd_update(int argc, char **argv) return -1; } - rc = rrd_update_r(argv[optind], template, - argc - optind - 1, argv + optind + 1); + rc = rrd_update_r(argv[optind], tmplt, + argc - optind - 1, (const char **)(argv + optind + 1)); return rc; } int -rrd_update_r(char *filename, char *template, int argc, char **argv) +rrd_update_r(const char *filename, const char *tmplt, int argc, const char **argv) { - return _rrd_update(filename, template, argc, argv, NULL); + return _rrd_update(filename, tmplt, argc, argv, NULL); } int -_rrd_update(char *filename, char *template, int argc, char **argv, +_rrd_update(const char *filename, const char *tmplt, int argc, const char **argv, info_t *pcdp_summary) { @@ -227,7 +211,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, * spot in the rrd file. */ unsigned long rra_pos_tmp; /* temporary byte pointer. */ double interval, - pre_int,post_int; /* interval between this and + pre_int,post_int; /* interval between this and * the last run */ unsigned long proc_pdp_st; /* which pdp_st was the last * to be processed */ @@ -247,7 +231,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, * cdp values */ long *tmpl_idx; /* index representing the settings - transported by the template index */ + transported by the tmplt index */ unsigned long tmpl_cnt = 2; /* time and data */ FILE *rrd_file; @@ -277,11 +261,13 @@ _rrd_update(char *filename, char *template, int argc, 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; #endif + rpnstack_init(&rpnstack); /* need at least 1 arguments: data. */ @@ -295,6 +281,7 @@ _rrd_update(char *filename, char *template, int argc, 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); @@ -361,7 +348,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, fclose(rrd_file); return(-1); } - /* initialize template redirector */ + /* initialize tmplt redirector */ /* default config example (assume DS 1 is a CDEF DS) tmpl_idx[0] -> 0; (time) tmpl_idx[1] -> 1; (DS 0) @@ -375,17 +362,19 @@ _rrd_update(char *filename, char *template, int argc, char **argv, } tmpl_cnt= ii; - if (template) { + if (tmplt) { + /* we should work on a writeable copy here */ char *dsname; unsigned int tmpl_len; - dsname = template; + char *tmplt_copy = strdup(tmplt); + dsname = tmplt_copy; tmpl_cnt = 1; /* the first entry is the time */ - tmpl_len = strlen(template); + tmpl_len = strlen(tmplt_copy); for(i=0;i<=tmpl_len ;i++) { - if (template[i] == ':' || template[i] == '\0') { - template[i] = '\0'; + if (tmplt_copy[i] == ':' || tmplt_copy[i] == '\0') { + tmplt_copy[i] = '\0'; if (tmpl_cnt>rrd.stat_head->ds_cnt){ - rrd_set_error("Template contains more DS definitions than RRD"); + rrd_set_error("tmplt contains more DS definitions than RRD"); free(updvals); free(pdp_temp); free(tmpl_idx); rrd_free(&rrd); fclose(rrd_file); return(-1); @@ -393,21 +382,23 @@ _rrd_update(char *filename, char *template, int argc, char **argv, if ((tmpl_idx[tmpl_cnt++] = ds_match(&rrd,dsname)) == -1){ rrd_set_error("unknown DS name '%s'",dsname); free(updvals); free(pdp_temp); + free(tmplt_copy); free(tmpl_idx); rrd_free(&rrd); fclose(rrd_file); return(-1); } else { /* the first element is always the time */ tmpl_idx[tmpl_cnt-1]++; - /* go to the next entry on the template */ - dsname = &template[i+1]; + /* go to the next entry on the tmplt_copy */ + dsname = &tmplt_copy[i+1]; /* fix the damage we did before */ if (ids_cnt))==NULL){ @@ -439,7 +430,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, #endif /* loop through the arguments. */ for(arg_i=0; arg_ids_cnt;ii++) updvals[ii] = "U"; - strcpy(stepper,argv[arg_i]); updvals[0]=stepper; /* separate all ds elements; first must be examined separately due to alternate time syntax */ @@ -473,7 +464,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, *p = '\0'; stepper = p+1; } else { - rrd_set_error("expected timestamp not found in data source from %s:...", + rrd_set_error("expected timestamp not found in data source from %s", argv[arg_i]); free(step_start); break; @@ -492,7 +483,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, } if (ii != tmpl_cnt-1) { - rrd_set_error("expected %lu data source readings (got %lu) from %s:...", + rrd_set_error("expected %lu data source readings (got %lu) from %s", tmpl_cnt-1, ii, argv[arg_i]); free(step_start); break; @@ -526,13 +517,15 @@ _rrd_update(char *filename, char *template, int argc, char **argv, double tmp; tmp = strtod(updvals[0], 0); current_time = floor(tmp); - current_time_usec = (long)((tmp - current_time) * 1000000L); + current_time_usec = (long)((tmp-(double)current_time) * 1000000.0); } /* dont do any correction for old version RRDs */ if(version < 3) current_time_usec = 0; - if(current_time <= rrd.live_head->last_up){ + 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 " "last update time is %ld (minimum one second step)", current_time, rrd.live_head->last_up); @@ -561,12 +554,14 @@ _rrd_update(char *filename, char *template, int argc, char **argv, /* when did the last pdp_st occur */ occu_pdp_age = current_time % rrd.stat_head->pdp_step; occu_pdp_st = current_time - occu_pdp_age; + /* interval = current_time - rrd.live_head->last_up; */ - interval = current_time + ((double)current_time_usec - (double)rrd.live_head->last_up_usec)/1000000.0 - rrd.live_head->last_up; - + interval = (double)(current_time - rrd.live_head->last_up) + + (double)((long)current_time_usec - (long)rrd.live_head->last_up_usec)/1000000.0; + if (occu_pdp_st > proc_pdp_st){ /* OK we passed the pdp_st moment*/ - pre_int = occu_pdp_st - rrd.live_head->last_up; /* how much of the input data + pre_int = (long)occu_pdp_st - rrd.live_head->last_up; /* how much of the input data * occurred before the latest * pdp_st moment*/ pre_int -= ((double)rrd.live_head->last_up_usec)/1000000.0; /* adjust usecs */ @@ -595,15 +590,23 @@ _rrd_update(char *filename, char *template, int argc, char **argv, for(i=0;ids_cnt;i++){ enum dst_en dst_idx; dst_idx= dst_conv(rrd.ds_def[i].dst); - /* NOTE: DST_CDEF should never enter this if block, because - * updvals[i+1][0] is initialized to 'U'; unless the caller - * accidently specified a value for the DST_CDEF. To handle - * this case, an extra check is required. */ + + /* make sure we do not build diffs with old last_ds values */ + if(rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt < interval) { + strncpy(rrd.pdp_prep[i].last_ds,"U",LAST_DS_LEN-1); + rrd.pdp_prep[i].last_ds[LAST_DS_LEN-1]='\0'; + } + + /* NOTE: DST_CDEF should never enter this if block, because + * updvals[i+1][0] is initialized to 'U'; unless the caller + * accidently specified a value for the DST_CDEF. To handle + * this case, an extra check is required. */ + if((updvals[i+1][0] != 'U') && (dst_idx != DST_CDEF) && rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt >= interval) { double rate = DNAN; - /* the data source type defines how to process the data */ + /* the data source type defines how to process the data */ /* pdp_new contains rate * time ... eg the bytes * transferred during the interval. Doing it this way saves * a lot of math operations */ @@ -614,7 +617,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, case DST_DERIVE: 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] == '-')){ + 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; } @@ -687,6 +690,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv, /* no news is news all the same */ pdp_new[i] = DNAN; } + /* make a copy of the command line argument for the next run */ #ifdef DEBUG @@ -699,11 +703,8 @@ _rrd_update(char *filename, char *template, int argc, char **argv, rrd.pdp_prep[i].last_ds, updvals[i+1], pdp_new[i]); #endif - if(dst_idx == DST_COUNTER || dst_idx == DST_DERIVE){ - strncpy(rrd.pdp_prep[i].last_ds, - updvals[i+1],LAST_DS_LEN-1); - rrd.pdp_prep[i].last_ds[LAST_DS_LEN-1]='\0'; - } + strncpy(rrd.pdp_prep[i].last_ds, updvals[i+1],LAST_DS_LEN-1); + rrd.pdp_prep[i].last_ds[LAST_DS_LEN-1]='\0'; } /* break out of the argument parsing loop if the error_string is set */ if (rrd_test_error()){ @@ -716,10 +717,18 @@ _rrd_update(char *filename, char *template, int argc, char **argv, /* no we have not passed a pdp_st moment. therefore update is simple */ for(i=0;ids_cnt;i++){ - if(isnan(pdp_new[i])) - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt += interval; - else - rrd.pdp_prep[i].scratch[PDP_val].u_val+= pdp_new[i]; + if(isnan(pdp_new[i])) { + /* this is not realy accurate if we use subsecond data arival time + should have thought of it when going subsecond resolution ... + sorry next format change we will have it! */ + rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt += floor(interval); + } else { + if (isnan( rrd.pdp_prep[i].scratch[PDP_val].u_val )){ + rrd.pdp_prep[i].scratch[PDP_val].u_val= pdp_new[i]; + } else { + rrd.pdp_prep[i].scratch[PDP_val].u_val+= pdp_new[i]; + } + } #ifdef DEBUG fprintf(stderr, "NO PDP ds[%lu]\t" @@ -739,24 +748,38 @@ _rrd_update(char *filename, char *template, int argc, char **argv, pdp_temp[] will contain the rate for cdp */ for(i=0;ids_cnt;i++){ - /* update pdp_prep to the current pdp_st */ + /* update pdp_prep to the current pdp_st. */ + double pre_unknown = 0.0; if(isnan(pdp_new[i])) - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt += pre_int; - else - rrd.pdp_prep[i].scratch[PDP_val].u_val += - pdp_new[i]/(double)interval*(double)pre_int; + /* a final bit of unkonwn to be added bevore calculation + * we use a tempaorary variable for this so that we + * don't have to turn integer lines before using the value */ + pre_unknown = pre_int; + else { + if (isnan( rrd.pdp_prep[i].scratch[PDP_val].u_val )){ + rrd.pdp_prep[i].scratch[PDP_val].u_val= pdp_new[i]/interval*pre_int; + } else { + rrd.pdp_prep[i].scratch[PDP_val].u_val+= pdp_new[i]/interval*pre_int; + } + } + /* if too much of the pdp_prep is unknown we dump it */ - if ((rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt - > rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) || + if ( + /* removed because this does not agree with the definition + a heart beat can be unknown */ + /* (rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt + > 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.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt)) { pdp_temp[i] = DNAN; } else { pdp_temp[i] = rrd.pdp_prep[i].scratch[PDP_val].u_val - / (double)( occu_pdp_st - - proc_pdp_st - - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt); + / ((double)(occu_pdp_st - proc_pdp_st + - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt) + -pre_unknown); } /* process CDEF data sources; remember each CDEF DS can @@ -781,12 +804,15 @@ _rrd_update(char *filename, char *template, int argc, char **argv, /* make pdp_prep ready for the next run */ if(isnan(pdp_new[i])){ - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt = post_int; - rrd.pdp_prep[i].scratch[PDP_val].u_val = 0.0; + /* this is not realy accurate if we use subsecond data arival time + should have thought of it when going subsecond resolution ... + sorry next format change we will have it! */ + rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt = floor(post_int); + rrd.pdp_prep[i].scratch[PDP_val].u_val = DNAN; } else { rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt = 0; rrd.pdp_prep[i].scratch[PDP_val].u_val = - pdp_new[i]/(double)interval*(double)post_int; + pdp_new[i]/interval*post_int; } #ifdef DEBUG @@ -1372,6 +1398,19 @@ _rrd_update(char *filename, char *template, int argc, char **argv, fclose(rrd_file); return(-1); } +#ifdef POSIX_FADVISE + + /* with update we have write ops, so they will probably not be done by now, this means + the buffers will not get freed. But calling this for the whole file - header + will let the data off the hook as soon as it is written when if it is from a previous + update cycle. Calling fdsync to force things is much too hard here. */ + + if (0 != posix_fadvise(fileno(in_file), rra_begin, 0, POSIX_FADV_DONTNEED)) { + rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",file_name, rrd_strerror(errno)); + fclose(in_file); + return(-1); + } +#endif /* OK now close the files and free the memory */ if(fclose(rrd_file) != 0){ @@ -1392,6 +1431,8 @@ _rrd_update(char *filename, char *template, int argc, char **argv, if (schedule_smooth) { rrd_file = fopen(filename,"rb+"); + + rra_start = rra_begin; for (i = 0; i < rrd.stat_head -> rra_cnt; ++i) { @@ -1408,6 +1449,14 @@ _rrd_update(char *filename, char *template, int argc, char **argv, rra_start += rrd.rra_def[i].row_cnt *rrd.stat_head->ds_cnt*sizeof(rrd_value_t); } +#ifdef POSIX_FADVISE + /* same procedure as above ... */ + if (0 != posix_fadvise(fileno(in_file), rrd_head_size, 0, POSIX_FADV_DONTNEED)) { + rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",file_name, rrd_strerror(errno)); + fclose(in_file); + return(-1); + } +#endif fclose(rrd_file); } rrd_free(&rrd);