projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added pointer to florian forsters dtd to the rrd dumpt
[rrdtool.git]
/
src
/
rrd_info.c
diff --git
a/src/rrd_info.c
b/src/rrd_info.c
index
d0d9db5
..
ff3e35b
100644
(file)
--- 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
*****************************************************************************/
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
@@
-99,17
+99,15
@@
info_t *rrd_info_r(
{
unsigned int i, ii = 0;
rrd_t rrd;
{
unsigned int i, ii = 0;
rrd_t rrd;
- info_t *data, *cd;
+ info_t *data
= NULL
, *cd;
infoval info;
rrd_file_t *rrd_file;
enum cf_en current_cf;
enum dst_en current_ds;
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
infoval info;
rrd_file_t *rrd_file;
enum cf_en current_cf;
enum dst_en current_ds;
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
- if (rrd_file == NULL) {
- return (NULL);
- }
- close(rrd_file->fd);
+ if (rrd_file == NULL)
+ goto err_free;
info.u_str = filename;
cd = info_push(NULL, sprintf_alloc("filename"), RD_I_STR, info);
info.u_str = filename;
cd = info_push(NULL, sprintf_alloc("filename"), RD_I_STR, info);
@@
-188,12
+186,17
@@
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_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:
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);
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);
@@
-206,6
+209,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);
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;
break;
case CF_FAILURES:
info.u_val = rrd.rra_def[i].par[RRA_delta_pos].u_val;
@@
-233,6
+243,7
@@
info_t *rrd_info_r(
for (ii = 0; ii < rrd.stat_head->ds_cnt; ii++) {
switch (current_cf) {
case CF_HWPREDICT:
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;
info.u_val =
rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
ii].scratch[CDP_hw_intercept].u_val;
@@
-306,8
+317,9
@@
info_t *rrd_info_r(
}
}
}
}
}
}
- rrd_free(&rrd);
+
rrd_close(rrd_file);
rrd_close(rrd_file);
+ err_free:
+ rrd_free(&rrd);
return (data);
return (data);
-
}
}