X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_update.c;h=92147020d5c82a714f179c8cc005c9bb8e934a00;hp=2b4a29300844208026abfca9331bc6222c78cb8a;hb=56d67cdd0c5b2c27c9242a3d5810c7184917f663;hpb=ac630adec930653637199258efd99024d49325c7 diff --git a/src/rrd_update.c b/src/rrd_update.c index 2b4a293..9214702 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.4.0 Copyright by Tobi Oetiker, 1997-2009 * Copyright by Florian Forster, 2008 ***************************************************************************** * rrd_update.c RRD Update Function @@ -282,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) { @@ -295,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) @@ -321,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} @@ -350,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"); @@ -417,64 +427,33 @@ int rrd_update( goto out; } - if ((tmplt != NULL) && (opt_daemon != NULL)) + { /* try to connect to rrdcached */ + int status = rrdc_connect(opt_daemon); + if (status != 0) return status; + } + + if ((tmplt != NULL) && rrdc_is_connected(opt_daemon)) { - rrd_set_error("The caching opt_daemon cannot be used together with " + rrd_set_error("The caching daemon cannot be used together with " "templates yet."); goto out; } - if ((tmplt == NULL) && (opt_daemon == NULL)) + if (! rrdc_is_connected(opt_daemon)) { - char *temp; - - temp = getenv (ENV_RRDCACHED_ADDRESS); - if (temp != NULL) - { - opt_daemon = strdup (temp); - if (opt_daemon == NULL) - { - rrd_set_error("strdup failed."); - goto out; - } - } + rc = rrd_update_r(argv[optind], tmplt, + argc - optind - 1, (const char **) (argv + optind + 1)); } - - if (opt_daemon != NULL) + else /* we are connected */ { - int status; - - status = rrdc_connect (opt_daemon); - if (status != 0) - { - rrd_set_error("Unable to connect to opt_daemon: %s", - (status < 0) - ? "Internal error" - : rrd_strerror (status)); - goto out; - } - - status = rrdc_update (/* file = */ argv[optind], - /* values_num = */ argc - optind - 1, - /* values = */ (void *) (argv + optind + 1)); - if (status != 0) - { - rrd_set_error("Failed sending the values to the opt_daemon: %s", - (status < 0) - ? "Internal error" - : rrd_strerror (status)); - } - else - { - rc = 0; - } - - rrdc_disconnect (); - goto out; - } /* if (opt_daemon != NULL) */ + 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)); + } - rc = rrd_update_r(argv[optind], tmplt, - argc - optind - 1, (const char **) (argv + optind + 1)); out: if (tmplt != NULL) { @@ -539,6 +518,7 @@ int _rrd_update( goto err_out; } + rrd_init(&rrd); if ((rrd_file = rrd_open(filename, &rrd, RRD_READWRITE)) == NULL) { goto err_free; } @@ -637,41 +617,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 @@ -1019,8 +964,19 @@ static int get_time_from_reading( *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); } @@ -1115,12 +1071,12 @@ static int update_pdp_prep( 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'", @@ -1130,16 +1086,16 @@ static int update_pdp_prep( 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'", @@ -1945,7 +1901,7 @@ static int write_to_rras( 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 @@ -1958,7 +1914,7 @@ 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 != 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; @@ -1982,6 +1938,8 @@ static int write_to_rras( (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); @@ -2019,12 +1977,14 @@ 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)) {