X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_dump.c;h=baf560c721342854342ddc724fe096e66895daed;hb=40cc8b00296079815f08c2ff55f134efae83ea69;hp=316814d349c7f62f4832594815375e7e6e2ebecd;hpb=7f30ee2ae089520606cbb7e38fab9981618771f5;p=rrdtool.git diff --git a/src/rrd_dump.c b/src/rrd_dump.c index 316814d..baf560c 100644 --- a/src/rrd_dump.c +++ b/src/rrd_dump.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_dump Display a RRD ***************************************************************************** @@ -100,7 +100,11 @@ int rrd_dump_r( fputs("", out_file); fputs("", out_file); - fprintf(out_file, "\t %s \n", RRD_VERSION); + if (atoi(rrd.stat_head->version) <= 3) { + fprintf(out_file, "\t %s \n", RRD_VERSION3); + } else { + fprintf(out_file, "\t %s \n", RRD_VERSION); + } fprintf(out_file, "\t %lu \n", rrd.stat_head->pdp_step); #if HAVE_STRFTIME @@ -176,6 +180,7 @@ int rrd_dump_r( fprintf(out_file, "\t\t\n"); switch (cf_conv(rrd.rra_def[i].cf_nam)) { case CF_HWPREDICT: + case CF_MHWPREDICT: fprintf(out_file, "\t\t %0.10e \n", rrd.rra_def[i].par[RRA_hw_alpha].u_val); fprintf(out_file, "\t\t %0.10e \n", @@ -192,6 +197,12 @@ int rrd_dump_r( fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_seasonal_smooth_idx].u_cnt); + if (atoi(rrd.stat_head->version) >= 4) { + fprintf(out_file, + "\t\t %0.10e \n", + rrd.rra_def[i].par[RRA_seasonal_smoothing_window]. + u_val); + } fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); @@ -255,6 +266,7 @@ int rrd_dump_r( } switch (cf_conv(rrd.rra_def[i].cf_nam)) { case CF_HWPREDICT: + case CF_MHWPREDICT: value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_hw_intercept].u_val;