X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_update.c;h=dbf74df6629611472e5c90af4f530ce36583f338;hp=9f865a68bc266d5ff06c8b7f9ffeff2764184d4a;hb=7cd3bc3512c11bb861490bb65553cea5cc0c98b4;hpb=219fd9224e3117dcf59df8818d4e9e3eab26022a diff --git a/src/rrd_update.c b/src/rrd_update.c index 9f865a6..dbf74df 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -1,6 +1,6 @@ - /***************************************************************************** - * 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 ***************************************************************************** @@ -23,6 +23,8 @@ #include "rrd_is_thread_safe.h" #include "unused.h" +#include "rrd_client.h" + #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) /* * WIN32 does not have gettimeofday and struct timeval. This is a quick and dirty @@ -95,7 +97,6 @@ static int process_arg( rrd_t *rrd, rrd_file_t *rrd_file, unsigned long rra_begin, - unsigned long *rra_current, time_t *current_time, unsigned long *current_time_usec, rrd_value_t *pdp_temp, @@ -176,7 +177,6 @@ static int update_all_cdp_prep( rrd_value_t **last_seasonal_coef, rrd_value_t **seasonal_coef, rrd_value_t *pdp_temp, - unsigned long *rra_current, unsigned long *skip_update, int *schedule_smooth); @@ -212,7 +212,6 @@ static void initialize_cdp_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); @@ -227,8 +226,9 @@ static void reset_cdp( 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); @@ -245,7 +245,6 @@ static int update_aberrant_cdps( rrd_t *rrd, rrd_file_t *rrd_file, unsigned long rra_begin, - unsigned long *rra_current, unsigned long elapsed_pdp_st, rrd_value_t *pdp_temp, rrd_value_t **seasonal_coef); @@ -255,7 +254,6 @@ static int write_to_rras( rrd_file_t *rrd_file, unsigned long *rra_step_cnt, unsigned long rra_begin, - unsigned long *rra_current, time_t current_time, unsigned long *skip_update, rrd_info_t ** pcdp_summary); @@ -264,7 +262,6 @@ static int write_RRA_row( rrd_file_t *rrd_file, rrd_t *rrd, unsigned long rra_idx, - unsigned long *rra_current, unsigned short CDP_scratch_idx, rrd_info_t ** pcdp_summary, time_t rra_time); @@ -285,7 +282,7 @@ static int write_changes_to_disk( * 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) { @@ -298,7 +295,7 @@ static inline void normalize_time( * 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) @@ -324,6 +321,7 @@ rrd_info_t *rrd_update_v( char *tmplt = NULL; rrd_info_t *result = NULL; rrd_infoval_t rc; + char *opt_daemon = NULL; struct option long_options[] = { {"template", required_argument, 0, 't'}, {0, 0, 0, 0} @@ -353,6 +351,15 @@ rrd_info_t *rrd_update_v( } } + opt_daemon = getenv (ENV_RRDCACHED_ADDRESS); + if (opt_daemon != NULL) { + rrd_set_error ("The \"%s\" environment variable is defined, " + "but \"%s\" cannot work with rrdcached. Either unset " + "the environment variable or use \"update\" instead.", + ENV_RRDCACHED_ADDRESS, argv[0]); + goto end_tag; + } + /* need at least 2 arguments: filename, data. */ if (argc - optind < 2) { rrd_set_error("Not enough arguments"); @@ -374,18 +381,20 @@ int rrd_update( { struct option long_options[] = { {"template", required_argument, 0, 't'}, + {"daemon", required_argument, 0, 'd'}, {0, 0, 0, 0} }; int option_index = 0; int opt; char *tmplt = NULL; int rc = -1; + char *opt_daemon = NULL; optind = 0; opterr = 0; /* initialize getopt */ while (1) { - opt = getopt_long(argc, argv, "t:", long_options, &option_index); + opt = getopt_long(argc, argv, "t:d:", long_options, &option_index); if (opt == EOF) break; @@ -395,6 +404,17 @@ int rrd_update( tmplt = strdup(optarg); break; + case 'd': + if (opt_daemon != NULL) + free (opt_daemon); + opt_daemon = strdup (optarg); + if (opt_daemon == NULL) + { + rrd_set_error("strdup failed."); + goto out; + } + break; + case '?': rrd_set_error("unknown option '%s'", argv[optind - 1]); goto out; @@ -407,10 +427,47 @@ int rrd_update( goto out; } - rc = rrd_update_r(argv[optind], tmplt, - argc - optind - 1, (const char **) (argv + optind + 1)); + { /* try to connect to rrdcached */ + int status = rrdc_connect(opt_daemon); + if (status != 0) { + rc = status; + goto out; + } + } + + if ((tmplt != NULL) && rrdc_is_connected(opt_daemon)) + { + rrd_set_error("The caching daemon cannot be used together with " + "templates yet."); + goto out; + } + + if (! rrdc_is_connected(opt_daemon)) + { + rc = rrd_update_r(argv[optind], tmplt, + argc - optind - 1, (const char **) (argv + optind + 1)); + } + else /* we are connected */ + { + rc = rrdc_update (argv[optind], /* file */ + argc - optind - 1, /* values_num */ + (const char *const *) (argv + optind + 1)); /* values */ + if (rc > 0) + rrd_set_error("Failed sending the values to rrdcached: %s", + rrd_strerror (rc)); + } + out: - free(tmplt); + if (tmplt != NULL) + { + free(tmplt); + tmplt = NULL; + } + if (opt_daemon != NULL) + { + free (opt_daemon); + opt_daemon = NULL; + } return rc; } @@ -423,6 +480,16 @@ int rrd_update_r( 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, @@ -436,8 +503,6 @@ int _rrd_update( unsigned long rra_begin; /* byte pointer to the rra * area in the rrd file. this * pointer never changes value */ - unsigned long rra_current; /* byte pointer to the current write - * spot in the rrd file. */ rrd_value_t *pdp_new; /* prepare the incoming data to be added * to the existing entry */ rrd_value_t *pdp_temp; /* prepare the pdp values to be added @@ -466,11 +531,12 @@ int _rrd_update( goto err_out; } + rrd_init(&rrd); if ((rrd_file = rrd_open(filename, &rrd, RRD_READWRITE)) == NULL) { goto err_free; } /* We are now at the beginning of the rra's */ - rra_current = rra_begin = rrd_file->header_len; + rra_begin = rrd_file->header_len; version = atoi(rrd.stat_head->version); @@ -497,7 +563,7 @@ int _rrd_update( rrd_set_error("failed duplication argv entry"); break; } - if (process_arg(arg_copy, &rrd, rrd_file, rra_begin, &rra_current, + if (process_arg(arg_copy, &rrd, rrd_file, rra_begin, ¤t_time, ¤t_time_usec, pdp_temp, pdp_new, rra_step_cnt, updvals, tmpl_idx, tmpl_cnt, &pcdp_summary, version, skip_update, @@ -564,41 +630,6 @@ int _rrd_update( } /* - * get exclusive lock to whole file. - * lock gets removed when we close the file - * - * returns 0 on success - */ -int rrd_lock( - rrd_file_t *file) -{ - int rcstat; - - { -#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) - struct _stat st; - - if (_fstat(file->fd, &st) == 0) { - rcstat = _locking(file->fd, _LK_NBLCK, st.st_size); - } else { - rcstat = -1; - } -#else - struct flock lock; - - lock.l_type = F_WRLCK; /* exclusive write lock */ - lock.l_len = 0; /* whole file */ - lock.l_start = 0; /* start of file */ - lock.l_whence = SEEK_SET; /* end of file */ - - rcstat = fcntl(file->fd, F_SETLK, &lock); -#endif - } - - return (rcstat); -} - -/* * Allocate some important arrays used, and initialize the template. * * When it returns, either all of the structures are allocated @@ -750,7 +781,6 @@ static int process_arg( rrd_t *rrd, rrd_file_t *rrd_file, unsigned long rra_begin, - unsigned long *rra_current, time_t *current_time, unsigned long *current_time_usec, rrd_value_t *pdp_temp, @@ -772,21 +802,11 @@ static int process_arg( double interval, pre_int, post_int; /* interval between this and * the last run */ unsigned long proc_pdp_cnt; - unsigned long rra_start; if (parse_ds(rrd, updvals, tmpl_idx, step_start, tmpl_cnt, current_time, current_time_usec, version) == -1) { return -1; } - /* seek to the beginning of the rra's */ - if (*rra_current != rra_begin) { - if (rrd_seek(rrd_file, rra_begin, SEEK_SET) != 0) { - rrd_set_error("seek error in rrd"); - return -1; - } - *rra_current = rra_begin; - } - rra_start = rra_begin; interval = (double) (*current_time - rrd->live_head->last_up) + (double) ((long) *current_time_usec - @@ -821,17 +841,17 @@ static int process_arg( proc_pdp_cnt, &last_seasonal_coef, &seasonal_coef, - pdp_temp, rra_current, + pdp_temp, skip_update, schedule_smooth) == -1) { goto err_free_coefficients; } - if (update_aberrant_cdps(rrd, rrd_file, rra_begin, rra_current, + if (update_aberrant_cdps(rrd, rrd_file, rra_begin, elapsed_pdp_st, pdp_temp, &seasonal_coef) == -1) { goto err_free_coefficients; } if (write_to_rras(rrd, rrd_file, rra_step_cnt, rra_begin, - rra_current, *current_time, skip_update, + *current_time, skip_update, pcdp_summary) == -1) { goto err_free_coefficients; } @@ -898,12 +918,16 @@ static int parse_ds( 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; } @@ -956,9 +980,21 @@ static int get_time_from_reading( *current_time = tmp_time.tv_sec; *current_time_usec = tmp_time.tv_usec; } else { - old_locale = setlocale(LC_NUMERIC, "C"); + old_locale = setlocale(LC_NUMERIC, NULL); + 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); } @@ -1021,15 +1057,22 @@ static int update_pdp_prep( 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], @@ -1050,15 +1093,16 @@ static int update_pdp_prep( } break; case DST_ABSOLUTE: - old_locale = setlocale(LC_NUMERIC, "C"); + old_locale = setlocale(LC_NUMERIC, NULL); + 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'", @@ -1068,16 +1112,17 @@ static int update_pdp_prep( rate = pdp_new[ds_idx] / interval; break; case DST_GAUGE: + old_locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); errno = 0; - old_locale = setlocale(LC_NUMERIC, "C"); 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'", @@ -1325,6 +1370,10 @@ static int process_pdp_st( 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) { @@ -1338,6 +1387,7 @@ static int process_pdp_st( rpnstack_free(&rpnstack); return -1; } + free(rpnp); } /* make pdp_prep ready for the next run */ @@ -1373,7 +1423,6 @@ static int update_all_cdp_prep( rrd_value_t **last_seasonal_coef, rrd_value_t **seasonal_coef, rrd_value_t *pdp_temp, - unsigned long *rra_current, unsigned long *skip_update, int *schedule_smooth) { @@ -1423,7 +1472,6 @@ static int update_all_cdp_prep( #endif *schedule_smooth = 1; } - *rra_current = rrd_tell(rrd_file); } if (rrd_test_error()) return -1; @@ -1516,7 +1564,7 @@ static int update_cdp_prep( 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); } } @@ -1566,18 +1614,15 @@ static void update_cdp( 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)) @@ -1613,7 +1658,6 @@ static void initialize_cdp_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) { @@ -1626,13 +1670,11 @@ static void initialize_cdp_val( 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)) { @@ -1647,8 +1689,6 @@ static void initialize_cdp_val( 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); @@ -1667,14 +1707,10 @@ static void initialize_cdp_val( 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; } } @@ -1736,17 +1772,34 @@ static void reset_cdp( } } -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; + } + } } /* @@ -1799,7 +1852,6 @@ static int update_aberrant_cdps( rrd_t *rrd, rrd_file_t *rrd_file, unsigned long rra_begin, - unsigned long *rra_current, unsigned long elapsed_pdp_st, rrd_value_t *pdp_temp, rrd_value_t **seasonal_coef) @@ -1828,7 +1880,6 @@ static int update_aberrant_cdps( lookup_seasonal(rrd, rra_idx, rra_start, rrd_file, elapsed_pdp_st + 2, seasonal_coef); } - *rra_current = rrd_tell(rrd_file); } if (rrd_test_error()) return -1; @@ -1859,7 +1910,6 @@ static int write_to_rras( rrd_file_t *rrd_file, unsigned long *rra_step_cnt, unsigned long rra_begin, - unsigned long *rra_current, time_t current_time, unsigned long *skip_update, rrd_info_t ** pcdp_summary) @@ -1888,7 +1938,7 @@ static int write_to_rras( scratch_idx = CDP_secondary_val, step_subtract = 2) { - unsigned long rra_pos_new; + size_t rra_pos_new; #ifdef DEBUG fprintf(stderr, " -- RRA Preseek %ld\n", rrd_file->pos); #endif @@ -1901,12 +1951,11 @@ static int write_to_rras( + 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 != *rra_current || rra_ptr->cur_row == 0) { + 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; } - *rra_current = rra_pos_new; } #ifdef DEBUG fprintf(stderr, " -- RRA Postseek %ld\n", rrd_file->pos); @@ -1923,9 +1972,11 @@ static int write_to_rras( } if (write_RRA_row - (rrd_file, rrd, rra_idx, rra_current, scratch_idx, + (rrd_file, rrd, rra_idx, scratch_idx, pcdp_summary, rra_time) == -1) return -1; + + rrd_notify_row(rrd_file, rra_idx, rra_pos_new, rra_time); } rra_start += rra_def->row_cnt * ds_cnt * sizeof(rrd_value_t); @@ -1943,7 +1994,6 @@ static int write_RRA_row( rrd_file_t *rrd_file, rrd_t *rrd, unsigned long rra_idx, - unsigned long *rra_current, unsigned short CDP_scratch_idx, rrd_info_t ** pcdp_summary, time_t rra_time) @@ -1964,19 +2014,20 @@ static int write_RRA_row( /* 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)) { rrd_set_error("writing rrd: %s", rrd_strerror(errno)); return -1; } - *rra_current += sizeof(rrd_value_t); } return 0; }