X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2Fsrc%2Frrd_update.c;h=ed5068953605085ece14bcc2c969d4f9b5530151;hb=093a3aef272b7197ae4539de48dd2ed4c67a46e4;hp=8a689fca6e45b3fde63f76c5b59e7506f1271b78;hpb=bd97406d1dea5fc3028c30b1bda24ad74c9aab82;p=rrdtool-all.git diff --git a/program/src/rrd_update.c b/program/src/rrd_update.c index 8a689fca..ed506895 100644 --- a/program/src/rrd_update.c +++ b/program/src/rrd_update.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.13 Copyright by Tobi Oetiker, 1997-2006 + * RRDtool 1.2.30 Copyright by Tobi Oetiker, 1997-2009 ***************************************************************************** * rrd_update.c RRD Update Function ***************************************************************************** @@ -9,9 +9,6 @@ #include "rrd_tool.h" #include #include -#ifdef HAVE_MMAP - #include -#endif #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) #include @@ -32,12 +29,15 @@ */ #include -#ifndef __MINGW32__ +#if (defined(__MINGW32__) && \ + ((__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 12) || __MINGW32_MAJOR_VERSION > 3)) +#include +#else + struct timeval { time_t tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; -#endif struct __timezone { int tz_minuteswest; /* minutes W of Greenwich */ @@ -56,7 +56,9 @@ static int gettimeofday(struct timeval *t, struct __timezone *tz) { return 0; } +#endif /* mingw32 3.4.5 */ #endif + /* * normilize time as returned by gettimeofday. usec part must * be always >= 0 @@ -87,38 +89,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 *tmplt, int argc, char **argv); -int _rrd_update(char *filename, char *tmplt, 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 *tmplt = NULL; info_t *result = NULL; infoval rc; + rc.u_int = -1; optind = 0; opterr = 0; /* initialize getopt */ while (1) { @@ -142,7 +125,6 @@ info_t *rrd_update_v(int argc, char **argv) case '?': rrd_set_error("unknown option '%s'",argv[optind-1]); - rc.u_int = -1; goto end_tag; } } @@ -150,12 +132,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], tmplt, - argc - optind - 1, argv + optind + 1, result); + argc - optind - 1, (const char **)(argv + optind + 1), result); result->value.u_int = rc.u_int; end_tag: return result; @@ -201,18 +183,18 @@ rrd_update(int argc, char **argv) } rc = rrd_update_r(argv[optind], tmplt, - argc - optind - 1, argv + optind + 1); + argc - optind - 1, (const char **)(argv + optind + 1)); return rc; } int -rrd_update_r(char *filename, char *tmplt, int argc, char **argv) +rrd_update_r(const char *filename, const char *tmplt, int argc, const char **argv) { return _rrd_update(filename, tmplt, argc, argv, NULL); } int -_rrd_update(char *filename, char *tmplt, int argc, char **argv, +_rrd_update(const char *filename, const char *tmplt, int argc, const char **argv, info_t *pcdp_summary) { @@ -281,11 +263,13 @@ _rrd_update(char *filename, char *tmplt, 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. */ @@ -299,6 +283,7 @@ _rrd_update(char *filename, char *tmplt, 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); @@ -383,13 +368,13 @@ _rrd_update(char *filename, char *tmplt, int argc, char **argv, /* we should work on a writeable copy here */ char *dsname; unsigned int tmpl_len; - tmplt = strdup(tmplt); - dsname = tmplt; + char *tmplt_copy = strdup(tmplt); + dsname = tmplt_copy; tmpl_cnt = 1; /* the first entry is the time */ - tmpl_len = strlen(tmplt); + tmpl_len = strlen(tmplt_copy); for(i=0;i<=tmpl_len ;i++) { - if (tmplt[i] == ':' || tmplt[i] == '\0') { - tmplt[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("tmplt contains more DS definitions than RRD"); free(updvals); free(pdp_temp); @@ -399,23 +384,23 @@ _rrd_update(char *filename, char *tmplt, 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); + 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 tmplt */ - dsname = &tmplt[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){ @@ -444,10 +429,15 @@ _rrd_update(char *filename, char *tmplt, int argc, 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_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 */ @@ -481,7 +471,7 @@ _rrd_update(char *filename, char *tmplt, 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; @@ -500,7 +490,7 @@ _rrd_update(char *filename, char *tmplt, 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; @@ -543,9 +533,9 @@ _rrd_update(char *filename, char *tmplt, int argc, 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; } @@ -609,9 +599,9 @@ _rrd_update(char *filename, char *tmplt, int argc, char **argv, dst_idx= dst_conv(rrd.ds_def[i].dst); /* make sure we do not build diffs with old last_ds values */ - if(rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt < interval - && ( dst_idx == DST_COUNTER || dst_idx == DST_DERIVE)){ + 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 @@ -632,16 +622,16 @@ _rrd_update(char *filename, char *tmplt, int argc, 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 */ @@ -720,11 +710,8 @@ _rrd_update(char *filename, char *tmplt, 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()){ @@ -792,7 +779,7 @@ _rrd_update(char *filename, char *tmplt, int argc, 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 { @@ -1215,7 +1202,7 @@ _rrd_update(char *filename, char *tmplt, int argc, 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 */ @@ -1418,7 +1405,7 @@ _rrd_update(char *filename, char *tmplt, int argc, 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"); @@ -1438,6 +1425,8 @@ _rrd_update(char *filename, char *tmplt, 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) {