projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure properties are shown via graph_v even in --graph-only mode
[rrdtool.git]
/
src
/
rrd_dump.c
diff --git
a/src/rrd_dump.c
b/src/rrd_dump.c
index
d839bf6
..
08fa87c
100644
(file)
--- 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
*****************************************************************************
*****************************************************************************
* rrd_dump Display a RRD
*****************************************************************************
@@
-83,7
+83,7
@@
int rrd_dump_r(
rrd_value_t value;
struct tm tm;
rrd_value_t value;
struct tm tm;
- rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
+ rrd_file = rrd_open(filename, &rrd, RRD_READONLY
| RRD_READAHEAD
);
if (rrd_file == NULL) {
rrd_free(&rrd);
return (-1);
if (rrd_file == NULL) {
rrd_free(&rrd);
return (-1);
@@
-98,9
+98,17
@@
int rrd_dump_r(
out_file = stdout;
}
out_file = stdout;
}
+ fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>", out_file);
+ fputs
+ ("<!DOCTYPE rrd SYSTEM \"http://oss.oetiker.ch/rrdtool/rrdtool.dtd\">",
+ out_file);
fputs("<!-- Round Robin Database Dump -->", out_file);
fputs("<rrd>", out_file);
fputs("<!-- Round Robin Database Dump -->", out_file);
fputs("<rrd>", out_file);
- fprintf(out_file, "\t<version> %s </version>\n", RRD_VERSION);
+ if (atoi(rrd.stat_head->version) <= 3) {
+ fprintf(out_file, "\t<version> %s </version>\n", RRD_VERSION3);
+ } else {
+ fprintf(out_file, "\t<version> %s </version>\n", RRD_VERSION);
+ }
fprintf(out_file, "\t<step> %lu </step> <!-- Seconds -->\n",
rrd.stat_head->pdp_step);
#if HAVE_STRFTIME
fprintf(out_file, "\t<step> %lu </step> <!-- Seconds -->\n",
rrd.stat_head->pdp_step);
#if HAVE_STRFTIME
@@
-109,8
+117,8
@@
int rrd_dump_r(
#else
# error "Need strftime"
#endif
#else
# error "Need strftime"
#endif
- fprintf(out_file, "\t<lastupdate> %l
d
</lastupdate> <!-- %s -->\n\n",
- rrd.live_head->last_up, somestring);
+ fprintf(out_file, "\t<lastupdate> %l
u
</lastupdate> <!-- %s -->\n\n",
+
(unsigned long)
rrd.live_head->last_up, somestring);
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
fprintf(out_file, "\t<ds>\n");
fprintf(out_file, "\t\t<name> %s </name>\n", rrd.ds_def[i].ds_nam);
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
fprintf(out_file, "\t<ds>\n");
fprintf(out_file, "\t\t<name> %s </name>\n", rrd.ds_def[i].ds_nam);
@@
-134,7
+142,7
@@
int rrd_dump_r(
} else { /* DST_CDEF */
char *str = NULL;
} else { /* DST_CDEF */
char *str = NULL;
- rpn_compact2str((rpn_cdefds_t *) &
(rrd.ds_def[i].par[DS_cdef]),
+ rpn_compact2str((rpn_cdefds_t *) &(rrd.ds_def[i].par[DS_cdef]),
rrd.ds_def, &str);
fprintf(out_file, "\t\t<cdef> %s </cdef>\n", str);
free(str);
rrd.ds_def, &str);
fprintf(out_file, "\t\t<cdef> %s </cdef>\n", str);
free(str);
@@
-176,6
+184,7
@@
int rrd_dump_r(
fprintf(out_file, "\t\t<params>\n");
switch (cf_conv(rrd.rra_def[i].cf_nam)) {
case CF_HWPREDICT:
fprintf(out_file, "\t\t<params>\n");
switch (cf_conv(rrd.rra_def[i].cf_nam)) {
case CF_HWPREDICT:
+ case CF_MHWPREDICT:
fprintf(out_file, "\t\t<hw_alpha> %0.10e </hw_alpha>\n",
rrd.rra_def[i].par[RRA_hw_alpha].u_val);
fprintf(out_file, "\t\t<hw_beta> %0.10e </hw_beta>\n",
fprintf(out_file, "\t\t<hw_alpha> %0.10e </hw_alpha>\n",
rrd.rra_def[i].par[RRA_hw_alpha].u_val);
fprintf(out_file, "\t\t<hw_beta> %0.10e </hw_beta>\n",
@@
-192,6
+201,12
@@
int rrd_dump_r(
fprintf(out_file,
"\t\t<seasonal_smooth_idx> %lu </seasonal_smooth_idx>\n",
rrd.rra_def[i].par[RRA_seasonal_smooth_idx].u_cnt);
fprintf(out_file,
"\t\t<seasonal_smooth_idx> %lu </seasonal_smooth_idx>\n",
rrd.rra_def[i].par[RRA_seasonal_smooth_idx].u_cnt);
+ if (atoi(rrd.stat_head->version) >= 4) {
+ fprintf(out_file,
+ "\t\t<smoothing_window> %0.10e </smoothing_window>\n",
+ rrd.rra_def[i].par[RRA_seasonal_smoothing_window].
+ u_val);
+ }
fprintf(out_file,
"\t\t<dependent_rra_idx> %lu </dependent_rra_idx>\n",
rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt);
fprintf(out_file,
"\t\t<dependent_rra_idx> %lu </dependent_rra_idx>\n",
rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt);
@@
-255,6
+270,7
@@
int rrd_dump_r(
}
switch (cf_conv(rrd.rra_def[i].cf_nam)) {
case CF_HWPREDICT:
}
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;
value =
rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
ii].scratch[CDP_hw_intercept].u_val;
@@
-421,9
+437,8
@@
int rrd_dump_r(
}
fprintf(out_file, "</rrd>\n");
rrd_free(&rrd);
}
fprintf(out_file, "</rrd>\n");
rrd_free(&rrd);
- close(rrd_file->fd);
if (out_file != stdout) {
fclose(out_file);
}
if (out_file != stdout) {
fclose(out_file);
}
- return
(0
);
+ return
rrd_close(rrd_file
);
}
}