diff --git a/src/rrd_update.c b/src/rrd_update.c
index 1d9d5150d325f90a65af55ade48702c7ddce02b5..a06b404e9d3ef26c545959bd469b8652e22834bb 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
-
/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
* Copyright by Florian Forster, 2008
*****************************************************************************
* rrd_update.c RRD Update Function
unival *scratch,
int current_cf,
rrd_value_t pdp_temp_val,
- unsigned long elapsed_pdp_st,
unsigned long start_pdp_offset,
unsigned long pdp_cnt);
int cdp_idx,
enum cf_en current_cf);
-static rrd_value_t initialize_average_carry_over(
+static rrd_value_t initialize_carry_over(
rrd_value_t pdp_temp_val,
+ int current_cf,
unsigned long elapsed_pdp_st,
unsigned long start_pdp_offset,
unsigned long pdp_cnt);
* normalize time as returned by gettimeofday. usec part must
* be always >= 0
*/
-static inline void normalize_time(
+static void normalize_time(
struct timeval *t)
{
if (t->tv_usec < 0) {
* Sets current_time and current_time_usec based on the current time.
* current_time_usec is set to 0 if the version number is 1 or 2.
*/
-static inline void initialize_time(
+static void initialize_time(
time_t *current_time,
unsigned long *current_time_usec,
int version)
{
rc = rrdc_update (argv[optind], /* file */
argc - optind - 1, /* values_num */
- (void *) (argv + optind + 1)); /* values */
+ (const char *const *) (argv + optind + 1)); /* values */
if (rc > 0)
rrd_set_error("Failed sending the values to rrdcached: %s",
rrd_strerror (rc));
return _rrd_update(filename, tmplt, argc, argv, NULL);
}
+int rrd_update_v_r(
+ const char *filename,
+ const char *tmplt,
+ int argc,
+ const char **argv,
+ rrd_info_t * pcdp_summary)
+{
+ return _rrd_update(filename, tmplt, argc, argv, pcdp_summary);
+}
+
int _rrd_update(
const char *filename,
const char *tmplt,
if (i < tmpl_cnt) {
updvals[tmpl_idx[i++]] = p + 1;
}
+ else {
+ rrd_set_error("found extra data on update argument: %s",p+1);
+ return -1;
+ }
}
}
if (i != tmpl_cnt) {
rrd_set_error("expected %lu data source readings (got %lu) from %s",
- tmpl_cnt - 1, i, input);
+ tmpl_cnt - 1, i - 1, input);
return -1;
}
*current_time_usec = tmp_time.tv_usec;
} else {
old_locale = setlocale(LC_NUMERIC, "C");
+ errno = 0;
tmp = strtod(updvals[0], 0);
+ if (errno > 0) {
+ rrd_set_error("converting '%s' to float: %s",
+ updvals[0], rrd_strerror(errno));
+ return -1;
+ };
setlocale(LC_NUMERIC, old_locale);
+ if (tmp < 0.0){
+ gettimeofday(&tmp_time, 0);
+ tmp = (double)tmp_time.tv_sec + (double)tmp_time.tv_usec * 1e-6f + tmp;
+ }
+
*current_time = floor(tmp);
*current_time_usec = (long) ((tmp - (double) *current_time) * 1e6f);
}
switch (dst_idx) {
case DST_COUNTER:
case DST_DERIVE:
- for (ii = 0; updvals[ds_idx + 1][ii] != '\0'; ii++) {
- if ((updvals[ds_idx + 1][ii] < '0'
- || updvals[ds_idx + 1][ii] > '9')
- && (ii != 0 && updvals[ds_idx + 1][ii] != '-')) {
- rrd_set_error("not a simple integer: '%s'",
- updvals[ds_idx + 1]);
+ /* Check if this is a valid integer. `U' is already handled in
+ * another branch. */
+ for (ii = 0; updvals[ds_idx + 1][ii] != 0; ii++) {
+ if ((ii == 0) && (dst_idx == DST_DERIVE)
+ && (updvals[ds_idx + 1][ii] == '-'))
+ continue;
+
+ if ((updvals[ds_idx + 1][ii] < '0')
+ || (updvals[ds_idx + 1][ii] > '9')) {
+ rrd_set_error("not a simple %s integer: '%s'",
+ (dst_idx == DST_DERIVE) ? "signed" : "unsigned",
+ updvals[ds_idx + 1]);
return -1;
}
- }
+ } /* for (ii = 0; updvals[ds_idx + 1][ii] != 0; ii++) */
+
if (rrd->pdp_prep[ds_idx].last_ds[0] != 'U') {
pdp_new[ds_idx] =
rrd_diff(updvals[ds_idx + 1],
old_locale = setlocale(LC_NUMERIC, "C");
errno = 0;
pdp_new[ds_idx] = strtod(updvals[ds_idx + 1], &endptr);
- setlocale(LC_NUMERIC, old_locale);
if (errno > 0) {
rrd_set_error("converting '%s' to float: %s",
updvals[ds_idx + 1], rrd_strerror(errno));
return -1;
};
+ setlocale(LC_NUMERIC, old_locale);
if (endptr[0] != '\0') {
rrd_set_error
("conversion of '%s' to float not complete: tail '%s'",
rate = pdp_new[ds_idx] / interval;
break;
case DST_GAUGE:
- errno = 0;
old_locale = setlocale(LC_NUMERIC, "C");
+ errno = 0;
pdp_new[ds_idx] =
strtod(updvals[ds_idx + 1], &endptr) * interval;
- setlocale(LC_NUMERIC, old_locale);
if (errno) {
rrd_set_error("converting '%s' to float: %s",
updvals[ds_idx + 1], rrd_strerror(errno));
return -1;
};
+ setlocale(LC_NUMERIC, old_locale);
if (endptr[0] != '\0') {
rrd_set_error
("conversion of '%s' to float not complete: tail '%s'",
rpnp =
rpn_expand((rpn_cdefds_t *) &(rrd->ds_def[ds_idx].par[DS_cdef]));
+ if(rpnp == NULL) {
+ rpnstack_free(&rpnstack);
+ return -1;
+ }
/* substitute data values for OP_VARIABLE nodes */
for (i = 0; rpnp[i].op != OP_END; i++) {
if (rpnp[i].op == OP_VARIABLE) {
rpnstack_free(&rpnstack);
return -1;
}
+ free(rpnp);
}
/* make pdp_prep ready for the next run */
if (elapsed_pdp_st > 2) {
reset_cdp(rrd, elapsed_pdp_st, pdp_temp, last_seasonal_coef,
seasonal_coef, rra_idx, ds_idx, cdp_idx,
- current_cf);
+ (enum cf_en)current_cf);
}
}
if (*cdp_unkn_pdp_cnt > pdp_cnt * xff) {
*cdp_primary_val = DNAN;
- if (current_cf == CF_AVERAGE) {
- *cdp_val =
- initialize_average_carry_over(pdp_temp_val,
- elapsed_pdp_st,
- start_pdp_offset, pdp_cnt);
- } else {
- *cdp_val = pdp_temp_val;
- }
} else {
initialize_cdp_val(scratch, current_cf, pdp_temp_val,
- elapsed_pdp_st, start_pdp_offset, pdp_cnt);
- } /* endif meets xff value requirement for a valid value */
+ start_pdp_offset, pdp_cnt);
+ }
+ *cdp_val =
+ initialize_carry_over(pdp_temp_val,current_cf,
+ elapsed_pdp_st,
+ start_pdp_offset, pdp_cnt);
+ /* endif meets xff value requirement for a valid value */
/* initialize carry over CDP_unkn_pdp_cnt, this must after CDP_primary_val
* is set because CDP_unkn_pdp_cnt is required to compute that value. */
if (isnan(pdp_temp_val))
unival *scratch,
int current_cf,
rrd_value_t pdp_temp_val,
- unsigned long elapsed_pdp_st,
unsigned long start_pdp_offset,
unsigned long pdp_cnt)
{
scratch[CDP_primary_val].u_val =
(cum_val + cur_val * start_pdp_offset) /
(pdp_cnt - scratch[CDP_unkn_pdp_cnt].u_cnt);
- scratch[CDP_val].u_val =
- initialize_average_carry_over(pdp_temp_val, elapsed_pdp_st,
- start_pdp_offset, pdp_cnt);
break;
- case CF_MAXIMUM:
+ case CF_MAXIMUM:
cum_val = IFDNAN(scratch[CDP_val].u_val, -DINF);
cur_val = IFDNAN(pdp_temp_val, -DINF);
+
#if 0
#ifdef DEBUG
if (isnan(scratch[CDP_val].u_val) && isnan(pdp_temp)) {
scratch[CDP_primary_val].u_val = cur_val;
else
scratch[CDP_primary_val].u_val = cum_val;
- /* initialize carry over value */
- scratch[CDP_val].u_val = pdp_temp_val;
break;
case CF_MINIMUM:
cum_val = IFDNAN(scratch[CDP_val].u_val, DINF);
scratch[CDP_primary_val].u_val = cur_val;
else
scratch[CDP_primary_val].u_val = cum_val;
- /* initialize carry over value */
- scratch[CDP_val].u_val = pdp_temp_val;
break;
case CF_LAST:
default:
scratch[CDP_primary_val].u_val = pdp_temp_val;
- /* initialize carry over value */
- scratch[CDP_val].u_val = pdp_temp_val;
break;
}
}
}
}
-static rrd_value_t initialize_average_carry_over(
+static rrd_value_t initialize_carry_over(
rrd_value_t pdp_temp_val,
+ int current_cf,
unsigned long elapsed_pdp_st,
unsigned long start_pdp_offset,
unsigned long pdp_cnt)
{
- /* initialize carry over value */
- if (isnan(pdp_temp_val)) {
- return DNAN;
- }
- return pdp_temp_val * ((elapsed_pdp_st - start_pdp_offset) % pdp_cnt);
+ unsigned long pdp_into_cdp_cnt = ((elapsed_pdp_st - start_pdp_offset) % pdp_cnt);
+ if ( pdp_into_cdp_cnt == 0 || isnan(pdp_temp_val)){
+ switch (current_cf) {
+ case CF_MAXIMUM:
+ return -DINF;
+ case CF_MINIMUM:
+ return DINF;
+ case CF_AVERAGE:
+ return 0;
+ default:
+ return DNAN;
+ }
+ }
+ else {
+ switch (current_cf) {
+ case CF_AVERAGE:
+ return pdp_temp_val * pdp_into_cdp_cnt ;
+ default:
+ return pdp_temp_val;
+ }
+ }
}
/*
scratch_idx = CDP_secondary_val,
step_subtract = 2) {
- off_t rra_pos_new;
+ size_t rra_pos_new;
#ifdef DEBUG
fprintf(stderr, " -- RRA Preseek %ld\n", rrd_file->pos);
#endif
+ ds_cnt * rra_ptr->cur_row * sizeof(rrd_value_t);
/* re-seek if the position is wrong or we wrapped around */
- if (rra_pos_new != rrd_file->pos) {
+ if ((size_t)rra_pos_new != rrd_file->pos) {
if (rrd_seek(rrd_file, rra_pos_new, SEEK_SET) != 0) {
rrd_set_error("seek error in rrd");
return -1;
/* append info to the return hash */
*pcdp_summary = rrd_info_push(*pcdp_summary,
sprintf_alloc
- ("[%d]RRA[%s][%lu]DS[%s]", rra_time,
+ ("[%lli]RRA[%s][%lu]DS[%s]",
+ (long long)rra_time,
rrd->rra_def[rra_idx].cf_nam,
rrd->rra_def[rra_idx].pdp_cnt,
rrd->ds_def[ds_idx].ds_nam),
- RD_I_VAL, iv);
+ RD_I_VAL, iv);
}
+ errno = 0;
if (rrd_write(rrd_file,
&(rrd->cdp_prep[cdp_idx].scratch[CDP_scratch_idx].
u_val), sizeof(rrd_value_t)) != sizeof(rrd_value_t)) {