X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tune.c;h=89559af7a51f71c17996ee39e377e12386ba59e0;hp=4638199d99f2086eb5da04cec701606ae5bd27d8;hb=2ba0dac41cd82d69b612b5b4526f6e6f85c8abdc;hpb=2593a69e9485cf67c9654a2667f85971275004fe diff --git a/src/rrd_tune.c b/src/rrd_tune.c index 4638199..89559af 100644 --- a/src/rrd_tune.c +++ b/src/rrd_tune.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * change header parameters of an rrd ***************************************************************************** @@ -88,6 +88,8 @@ int rrd_tune( {"beta", required_argument, 0, 'y'}, {"gamma", required_argument, 0, 'z'}, {"gamma-deviation", required_argument, 0, 'v'}, + {"smoothing-window", required_argument, 0, 's'}, + {"smoothing-window-deviation", required_argument, 0, 'S'}, {"aberrant-reset", required_argument, 0, 'b'}, {0, 0, 0, 0} }; @@ -96,6 +98,7 @@ int rrd_tune( opterr = 0; /* initialize getopt */ + rrd_init(&rrd); rrd_file = rrd_open(argv[1], &rrd, RRD_READWRITE); if (rrd_file == NULL) { rrd_free(&rrd); @@ -195,15 +198,17 @@ int rrd_tune( rrd_close(rrd_file); return -1; } - strncpy(rrd.ds_def[ds].dst, dst, DST_SIZE - 1); - rrd.ds_def[ds].dst[DST_SIZE - 1] = '\0'; - - rrd.pdp_prep[ds].last_ds[0] = 'U'; - rrd.pdp_prep[ds].last_ds[1] = 'N'; - rrd.pdp_prep[ds].last_ds[2] = 'K'; - rrd.pdp_prep[ds].last_ds[3] = 'N'; - rrd.pdp_prep[ds].last_ds[4] = '\0'; + /* only reset when something is changed */ + if (strncmp(rrd.ds_def[ds].dst, dst, DST_SIZE - 1) != 0) { + strncpy(rrd.ds_def[ds].dst, dst, DST_SIZE - 1); + rrd.ds_def[ds].dst[DST_SIZE - 1] = '\0'; + rrd.pdp_prep[ds].last_ds[0] = 'U'; + rrd.pdp_prep[ds].last_ds[1] = 'N'; + rrd.pdp_prep[ds].last_ds[2] = 'K'; + rrd.pdp_prep[ds].last_ds[3] = 'N'; + rrd.pdp_prep[ds].last_ds[4] = '\0'; + } break; case 'r': if ((matches = @@ -296,6 +301,23 @@ int rrd_tune( return -1; } break; + case 's': + strcpy(rrd.stat_head->version, RRD_VERSION); /* smoothing_window causes Version 4 */ + if (set_hwarg + (&rrd, CF_SEASONAL, RRA_seasonal_smoothing_window, optarg)) { + rrd_free(&rrd); + return -1; + } + break; + case 'S': + strcpy(rrd.stat_head->version, RRD_VERSION); /* smoothing_window causes Version 4 */ + if (set_hwarg + (&rrd, CF_DEVSEASONAL, RRA_seasonal_smoothing_window, + optarg)) { + rrd_free(&rrd); + return -1; + } + break; case '?': if (optopt != 0) rrd_set_error("unknown option '%c'", optopt);