X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_create.c;h=6d7cb18e977af78a55a2afc55069d5923e1084d8;hp=3d064ff191eb040be321f5492f31d20f3514e83f;hb=0cc0426da39afd7d41a8f3848c85543586642ca2;hpb=2593a69e9485cf67c9654a2667f85971275004fe diff --git a/src/rrd_create.c b/src/rrd_create.c index 3d064ff..6d7cb18 100644 --- a/src/rrd_create.c +++ b/src/rrd_create.c @@ -1,9 +1,11 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3rc9 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_create.c creates new rrds *****************************************************************************/ +#include +#include #include #include "rrd_tool.h" @@ -22,6 +24,8 @@ void parseGENERIC_DS( const char *def, rrd_t *rrd, int ds_idx); +long int rra_random_row( + rra_def_t *); int rrd_create( int argc, @@ -36,7 +40,7 @@ int rrd_create( int opt; time_t last_up = time(NULL) - 10; unsigned long pdp_step = 300; - struct rrd_time_value last_up_tv; + rrd_time_value_t last_up_tv; char *parsetime_error = NULL; long long_tmp; int rc; @@ -52,7 +56,7 @@ int rrd_create( switch (opt) { case 'b': - if ((parsetime_error = parsetime(optarg, &last_up_tv))) { + if ((parsetime_error = rrd_parsetime(optarg, &last_up_tv))) { rrd_set_error("start time: %s", parsetime_error); return (-1); } @@ -121,14 +125,15 @@ int rrd_create_r( /* static header */ if ((rrd.stat_head = calloc(1, sizeof(stat_head_t))) == NULL) { rrd_set_error("allocating rrd.stat_head"); - rrd_free(&rrd); + free(rrd.stat_head); return (-1); } /* live header */ if ((rrd.live_head = calloc(1, sizeof(live_head_t))) == NULL) { rrd_set_error("allocating rrd.live_head"); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return (-1); } @@ -161,7 +166,8 @@ int rrd_create_r( old_size + sizeof(ds_def_t))) == NULL) { rrd_set_error("allocating rrd.ds_def"); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return (-1); } memset(&rrd.ds_def[rrd.stat_head->ds_cnt], 0, sizeof(ds_def_t)); @@ -193,7 +199,8 @@ int rrd_create_r( rrd_set_error("invalid DS format"); } if (rrd_test_error()) { - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return -1; } @@ -216,7 +223,8 @@ int rrd_create_r( } if (rrd_test_error()) { - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return -1; } rrd.stat_head->ds_cnt++; @@ -224,12 +232,14 @@ int rrd_create_r( char *argvcopy; char *tokptr; size_t old_size = sizeof(rra_def_t) * (rrd.stat_head->rra_cnt); + int row_cnt; if ((rrd.rra_def = rrd_realloc(rrd.rra_def, old_size + sizeof(rra_def_t))) == NULL) { rrd_set_error("allocating rrd.rra_def"); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return (-1); } memset(&rrd.rra_def[rrd.stat_head->rra_cnt], 0, @@ -264,6 +274,8 @@ int rrd_create_r( /* initialize some parameters */ rrd.rra_def[rrd.stat_head->rra_cnt]. par[RRA_seasonal_gamma].u_val = 0.1; + rrd.rra_def[rrd.stat_head->rra_cnt]. + par[RRA_seasonal_smoothing_window].u_val = 0.05; /* fall through */ case CF_DEVPREDICT: rrd.rra_def[rrd.stat_head->rra_cnt]. @@ -301,8 +313,10 @@ int rrd_create_r( case CF_SEASONAL: case CF_DEVPREDICT: case CF_FAILURES: - rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = - atoi(token); + row_cnt = atoi(token); + rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt; + if (row_cnt <= 0) + rrd_set_error("Invalid row count: %i", row_cnt); break; default: rrd.rra_def[rrd.stat_head->rra_cnt]. @@ -405,8 +419,10 @@ int rrd_create_r( ("Unexpected extra argument for consolidation function DEVPREDICT"); break; default: - rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = - atoi(token); + row_cnt = atoi(token); + rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt; + if (row_cnt <= 0) + rrd_set_error("Invalid row count: %i", row_cnt); break; } break; @@ -420,6 +436,29 @@ int rrd_create_r( par[RRA_dependent_rra_idx].u_cnt = atoi(token) - 1; break; + case CF_DEVSEASONAL: + case CF_SEASONAL: + /* optional smoothing window */ + if (sscanf(token, "smoothing-window=%lf", + &(rrd.rra_def[rrd.stat_head->rra_cnt]. + par[RRA_seasonal_smoothing_window]. + u_val))) { + strcpy(rrd.stat_head->version, RRD_VERSION); /* smoothing-window causes Version 4 */ + if (rrd.rra_def[rrd.stat_head->rra_cnt]. + par[RRA_seasonal_smoothing_window].u_val < 0.0 + || rrd.rra_def[rrd.stat_head->rra_cnt]. + par[RRA_seasonal_smoothing_window].u_val > + 1.0) { + rrd_set_error + ("Invalid smoothing-window %f: must be between 0 and 1", + rrd.rra_def[rrd.stat_head->rra_cnt]. + par[RRA_seasonal_smoothing_window]. + u_val); + } + } else { + rrd_set_error("Invalid option %s", token); + } + break; case CF_HWPREDICT: case CF_MHWPREDICT: /* length of the associated CF_SEASONAL and CF_DEVSEASONAL arrays. */ @@ -455,7 +494,8 @@ int rrd_create_r( if (rrd_test_error()) { /* all errors are unrecoverable */ free(argvcopy); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return (-1); } token = strtok_r(NULL, ":", &tokptr); @@ -482,14 +522,16 @@ int rrd_create_r( if (create_hw_contingent_rras(&rrd, period, hashed_name) == -1) { rrd_set_error("creating contingent RRA"); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return -1; } } rrd.stat_head->rra_cnt++; } else { rrd_set_error("can't parse argument '%s'", argv[i]); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return -1; } } @@ -497,13 +539,15 @@ int rrd_create_r( if (rrd.stat_head->rra_cnt < 1) { rrd_set_error("you must define at least one Round Robin Archive"); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return (-1); } if (rrd.stat_head->ds_cnt < 1) { rrd_set_error("you must define at least one Data Source"); - rrd_free(&rrd); + free(rrd.stat_head); + free(rrd.live_head); return (-1); } return rrd_create_fn(filename, &rrd); @@ -636,11 +680,15 @@ int rrd_create_fn( int unkn_cnt; rrd_file_t *rrd_file_dn; rrd_t rrd_dn; + unsigned flags = O_WRONLY | O_CREAT | O_TRUNC; +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) + flags |= O_BINARY; +#endif - if ((rrd_file = - open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == NULL) { + if ((rrd_file = open(file_name, flags, 0666)) < 0) { rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno)); - rrd_free(rrd); + free(rrd->stat_head); + free(rrd->live_head); return (-1); } @@ -655,12 +703,13 @@ int rrd_create_fn( if ((rrd->pdp_prep = calloc(1, sizeof(pdp_prep_t))) == NULL) { rrd_set_error("allocating pdp_prep"); - rrd_free(rrd); + free(rrd->stat_head); + free(rrd->live_head); close(rrd_file); return (-1); } - strcpy(rrd->pdp_prep->last_ds, "UNKN"); + strcpy(rrd->pdp_prep->last_ds, "U"); rrd->pdp_prep->scratch[PDP_val].u_val = 0.0; rrd->pdp_prep->scratch[PDP_unkn_sec_cnt].u_cnt = @@ -671,7 +720,8 @@ int rrd_create_fn( if ((rrd->cdp_prep = calloc(1, sizeof(cdp_prep_t))) == NULL) { rrd_set_error("allocating cdp_prep"); - rrd_free(rrd); + free(rrd->stat_head); + free(rrd->live_head); close(rrd_file); return (-1); } @@ -718,7 +768,8 @@ int rrd_create_fn( if ((rrd->rra_ptr = calloc(1, sizeof(rra_ptr_t))) == NULL) { rrd_set_error("allocating rra_ptr"); - rrd_free(rrd); + free(rrd->stat_head); + free(rrd->live_head); close(rrd_file); return (-1); } @@ -728,14 +779,15 @@ int rrd_create_fn( * would occur for cur_row = 1 because rrd_update increments * the pointer a priori. */ for (i = 0; i < rrd->stat_head->rra_cnt; i++) { - rrd->rra_ptr->cur_row = rrd->rra_def[i].row_cnt - 1; + rrd->rra_ptr->cur_row = rra_random_row(&rrd->rra_def[i]); write(rrd_file, rrd->rra_ptr, sizeof(rra_ptr_t)); } /* write the empty data area */ if ((unknown = (rrd_value_t *) malloc(512 * sizeof(rrd_value_t))) == NULL) { rrd_set_error("allocating unknown"); - rrd_free(rrd); + free(rrd->stat_head); + free(rrd->live_head); close(rrd_file); return (-1); } @@ -753,7 +805,8 @@ int rrd_create_fn( } free(unknown); fdatasync(rrd_file); - rrd_free(rrd); + free(rrd->stat_head); + free(rrd->live_head); if (close(rrd_file) == -1) { rrd_set_error("creating rrd: %s", rrd_strerror(errno)); return -1; @@ -761,6 +814,20 @@ int rrd_create_fn( /* flush all we don't need out of the cache */ rrd_file_dn = rrd_open(file_name, &rrd_dn, RRD_READONLY); rrd_dontneed(rrd_file_dn, &rrd_dn); + rrd_free(&rrd_dn); rrd_close(rrd_file_dn); return (0); } + +static int rand_init = 0; + +long int rra_random_row( + rra_def_t *rra) +{ + if (!rand_init) { + srandom((unsigned int) time(NULL) + (unsigned int) getpid()); + rand_init++; + } + + return random() % rra->row_cnt; +}