X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_info.c;h=3c0ee0e832e9a0410986b58e1190776169eb2f13;hb=2f9c0721d1f7e9eceae3d04e197d0e4a46eeb3b1;hp=fe65acac9062a0625edf680db6509a2ffe1b042d;hpb=dd86fdf1b4d99437b9aa19934e02230c090cc1d5;p=rrdtool.git diff --git a/src/rrd_info.c b/src/rrd_info.c index fe65aca..3c0ee0e 100644 --- a/src/rrd_info.c +++ b/src/rrd_info.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_info Get Information about the configuration of an RRD *****************************************************************************/ @@ -186,12 +186,16 @@ info_t *rrd_info_r( info.u_cnt = rrd.rra_def[i].row_cnt; cd = info_push(cd, sprintf_alloc("rra[%d].rows", i), RD_I_CNT, info); + info.u_cnt=rrd.rra_ptr[i].cur_row; + cd=info_push(cd,sprintf_alloc("rra[%d].cur_row",i), RD_I_CNT, info); + info.u_cnt = rrd.rra_def[i].pdp_cnt; cd = info_push(cd, sprintf_alloc("rra[%d].pdp_per_row", i), RD_I_CNT, info); switch (current_cf) { case CF_HWPREDICT: + case CF_MHWPREDICT: info.u_val = rrd.rra_def[i].par[RRA_hw_alpha].u_val; cd = info_push(cd, sprintf_alloc("rra[%d].alpha", i), RD_I_VAL, info); @@ -204,6 +208,13 @@ info_t *rrd_info_r( info.u_val = rrd.rra_def[i].par[RRA_seasonal_gamma].u_val; cd = info_push(cd, sprintf_alloc("rra[%d].gamma", i), RD_I_VAL, info); + if (atoi(rrd.stat_head->version) >= 4) { + info.u_val = + rrd.rra_def[i].par[RRA_seasonal_smoothing_window].u_val; + cd = info_push(cd, + sprintf_alloc("rra[%d].smoothing_window", i), + RD_I_VAL, info); + } break; case CF_FAILURES: info.u_val = rrd.rra_def[i].par[RRA_delta_pos].u_val; @@ -231,6 +242,7 @@ info_t *rrd_info_r( for (ii = 0; ii < rrd.stat_head->ds_cnt; ii++) { switch (current_cf) { case CF_HWPREDICT: + case CF_MHWPREDICT: info.u_val = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_hw_intercept].u_val;