/*****************************************************************************
- * RRDtool 1.2.11 Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.13 Copyright by Tobi Oetiker, 1997-2006
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
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(char *filename, char *tmplt, int argc, char **argv);
+int _rrd_update(char *filename, char *tmplt, int argc, char **argv,
info_t*);
#define IFDNAN(X,Y) (isnan(X) ? (Y) : (X));
info_t *rrd_update_v(int argc, char **argv)
{
- char *template = NULL;
+ char *tmplt = NULL;
info_t *result = NULL;
infoval rc;
optind = 0; opterr = 0; /* initialize getopt */
switch(opt) {
case 't':
- template = optarg;
+ tmplt = optarg;
break;
case '?':
goto end_tag;
}
result = info_push(NULL,sprintf_alloc("return_value"),RD_I_INT,rc);
- rc.u_int = _rrd_update(argv[optind], template,
+ rc.u_int = _rrd_update(argv[optind], tmplt,
argc - optind - 1, argv + optind + 1, result);
result->value.u_int = rc.u_int;
end_tag:
int
rrd_update(int argc, char **argv)
{
- char *template = NULL;
+ char *tmplt = NULL;
int rc;
optind = 0; opterr = 0; /* initialize getopt */
switch(opt) {
case 't':
- template = optarg;
+ tmplt = optarg;
break;
case '?':
return -1;
}
- rc = rrd_update_r(argv[optind], template,
+ rc = rrd_update_r(argv[optind], tmplt,
argc - optind - 1, argv + optind + 1);
return rc;
}
int
-rrd_update_r(char *filename, char *template, int argc, char **argv)
+rrd_update_r(char *filename, char *tmplt, int argc, 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(char *filename, char *tmplt, int argc, char **argv,
info_t *pcdp_summary)
{
* 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 */
* 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;
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)
}
tmpl_cnt= ii;
- if (template) {
+ if (tmplt) {
+ /* we should work on a writeable copy here */
char *dsname;
unsigned int tmpl_len;
- dsname = template;
+ tmplt = strdup(tmplt);
+ dsname = tmplt;
tmpl_cnt = 1; /* the first entry is the time */
- tmpl_len = strlen(template);
+ tmpl_len = strlen(tmplt);
for(i=0;i<=tmpl_len ;i++) {
- if (template[i] == ':' || template[i] == '\0') {
- template[i] = '\0';
+ if (tmplt[i] == ':' || tmplt[i] == '\0') {
+ tmplt[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);
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(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 */
+ dsname = &tmplt[i+1];
/* fix the damage we did before */
if (i<tmpl_len) {
- template[i]=':';
+ tmplt[i]=':';
}
}
}
}
+ free(tmplt);
}
if ((pdp_new = malloc(sizeof(rrd_value_t)
*rrd.stat_head->ds_cnt))==NULL){
(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 */
/* 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
/* no we have not passed a pdp_st moment. therefore update is simple */
for(i=0;i<rrd.stat_head->ds_cnt;i++){
- if(isnan(pdp_new[i]))
- rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt += floor(interval-0.5);
- 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"
pdp_temp[] will contain the rate for cdp */
for(i=0;i<rrd.stat_head->ds_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 += floor(pre_int+0.5);
- else
- rrd.pdp_prep[i].scratch[PDP_val].u_val +=
- pdp_new[i]/interval*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
/* make pdp_prep ready for the next run */
if(isnan(pdp_new[i])){
- rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt = floor(post_int + 0.5);
- 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 =