From: oetiker Date: Sat, 14 Jan 2006 09:10:16 +0000 (+0000) Subject: add perlbindings and optional export filename to rrd_dump -- Nicola Worthington nicol... X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=556f0365aa699c7dd4b6b08437f7c667abdf3c42;p=rrdtool.git add perlbindings and optional export filename to rrd_dump -- Nicola Worthington nicolaw arwen.tfb.net git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@742 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 71566c6..79c79ba 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -66,3 +66,5 @@ hendrik visage Philippe Simonet (Windows Binaries) Alexander Lucke (lucke with dns-net.de) of DNS:NET Internet Services (www.dns-net.de) http://rrdtool.org +Hedley Simons +Nicola Worthington diff --git a/bindings/perl-shared/RRDs.pm b/bindings/perl-shared/RRDs.pm index 1e11644..77aafe7 100644 --- a/bindings/perl-shared/RRDs.pm +++ b/bindings/perl-shared/RRDs.pm @@ -31,6 +31,8 @@ RRDs - Access RRDtool as a shared module RRDs::fetch ... RRDs::tune ... RRDs::times(start, end) + RRDs::dump ... + RRDs::restore ... =head1 DESCRIPTION diff --git a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c index 6a5250c..e9cff80 100644 --- a/bindings/tcl/tclrrd.c +++ b/bindings/tcl/tclrrd.c @@ -195,7 +195,7 @@ Rrd_Dump(ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char *argv return TCL_ERROR; } - rrd_dump_r(argv[1]); + rrd_dump_r(argv[1], NULL); /* NOTE: rrd_dump() writes to stdout. No interaction with TCL. */ diff --git a/doc/rrddump.pod b/doc/rrddump.pod index d38aef5..aa2a7e7 100644 --- a/doc/rrddump.pod +++ b/doc/rrddump.pod @@ -6,13 +6,18 @@ rrddump - dump the contents of an RRD to XML format B B I E I +or + +B B I I + =head1 DESCRIPTION -The B function prints the contents of an B in human -readable (?) XML format. This format can be read by rrdrestore. -Together they allow you to transfer your files from one computer architecture -to another as well to manipulate the contents of an B file in a -somewhat more convenient manner. +The B function writes the contents of an B in human +readable (?) XML format to a file or to stdout. This format can +be read by rrdrestore. Together they allow you to transfer your +files from one computer architecture to another as well to +manipulate the contents of an B file in a somewhat more +convenient manner. @@ -22,6 +27,11 @@ somewhat more convenient manner. The name of the B you want to dump. +=item I + +The (optional) filename that you want to write the XML output to. +If not specified, the XML will be printed to stdout. + =back =head1 EXAMPLES diff --git a/src/rrd.h b/src/rrd.h index fc17a65..069ca2a 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -85,7 +85,7 @@ int rrd_create_r(char *filename, specifications get used!!! */ int rrd_update_r(char *filename, char *_template, int argc, char **argv); -int rrd_dump_r(char *filename); +int rrd_dump_r(char *filename, char *outname); time_t rrd_last_r(const char *filename); time_t rrd_first_r(const char *filename, int rraindex); diff --git a/src/rrd_dump.c b/src/rrd_dump.c index dfc776b..6569743 100644 --- a/src/rrd_dump.c +++ b/src/rrd_dump.c @@ -41,7 +41,6 @@ * checkin * *****************************************************************************/ - #include "rrd_tool.h" #include "rrd_rpncalc.h" @@ -59,13 +58,20 @@ rrd_dump(int argc, char **argv) return -1; } - rc = rrd_dump_r(argv[1]); - + if (argc == 3) + { + rc = rrd_dump_r(argv[1], argv[2]); + } + else + { + rc = rrd_dump_r(argv[1], NULL); + } + return rc; } int -rrd_dump_r(char *filename) +rrd_dump_r(char *filename, char *outname) { unsigned int i,ii,ix,iii=0; time_t now; @@ -73,6 +79,7 @@ rrd_dump_r(char *filename) rrd_value_t my_cdp; long rra_base, rra_start, rra_next; FILE *in_file; + FILE *out_file; rrd_t rrd; rrd_value_t value; struct tm tm; @@ -81,10 +88,23 @@ rrd_dump_r(char *filename) return(-1); } - puts(""); - puts(""); - printf("\t %s \n",RRD_VERSION); - printf("\t %lu \n",rrd.stat_head->pdp_step); + out_file = NULL; + if (outname) + { + if (!(out_file = fopen(outname, "w"))) + { + return (-1); + } + } + else + { + out_file = stdout; + } + + fputs("", out_file); + fputs("", out_file); + fprintf(out_file, "\t %s \n",RRD_VERSION); + fprintf(out_file, "\t %lu \n",rrd.stat_head->pdp_step); #if HAVE_STRFTIME localtime_r(&rrd.live_head->last_up, &tm); strftime(somestring,200,"%Y-%m-%d %H:%M:%S %Z", @@ -92,44 +112,44 @@ rrd_dump_r(char *filename) #else # error "Need strftime" #endif - printf("\t %ld \n\n", + fprintf(out_file, "\t %ld \n\n", rrd.live_head->last_up,somestring); for(i=0;ids_cnt;i++){ - printf("\t\n"); - printf("\t\t %s \n",rrd.ds_def[i].ds_nam); - printf("\t\t %s \n",rrd.ds_def[i].dst); + fprintf(out_file, "\t\n"); + fprintf(out_file, "\t\t %s \n",rrd.ds_def[i].ds_nam); + fprintf(out_file, "\t\t %s \n",rrd.ds_def[i].dst); if (dst_conv(rrd.ds_def[i].dst) != DST_CDEF) { - printf("\t\t %lu \n",rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt); + fprintf(out_file, "\t\t %lu \n",rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt); if (isnan(rrd.ds_def[i].par[DS_min_val].u_val)){ - printf("\t\t NaN \n"); + fprintf(out_file, "\t\t NaN \n"); } else { - printf("\t\t %0.10e \n",rrd.ds_def[i].par[DS_min_val].u_val); + fprintf(out_file, "\t\t %0.10e \n",rrd.ds_def[i].par[DS_min_val].u_val); } if (isnan(rrd.ds_def[i].par[DS_max_val].u_val)){ - printf("\t\t NaN \n"); + fprintf(out_file, "\t\t NaN \n"); } else { - printf("\t\t %0.10e \n",rrd.ds_def[i].par[DS_max_val].u_val); + fprintf(out_file, "\t\t %0.10e \n",rrd.ds_def[i].par[DS_max_val].u_val); } } else { /* DST_CDEF */ char *str; rpn_compact2str((rpn_cdefds_t *) &(rrd.ds_def[i].par[DS_cdef]),rrd.ds_def,&str); - printf("\t\t %s \n", str); + fprintf(out_file, "\t\t %s \n", str); free(str); } - printf("\n\t\t\n"); - printf("\t\t %s \n",rrd.pdp_prep[i].last_ds); + fprintf(out_file, "\n\t\t\n"); + fprintf(out_file, "\t\t %s \n",rrd.pdp_prep[i].last_ds); if (isnan(rrd.pdp_prep[i].scratch[PDP_val].u_val)){ - printf("\t\t NaN \n"); + fprintf(out_file, "\t\t NaN \n"); } else { - printf("\t\t %0.10e \n",rrd.pdp_prep[i].scratch[PDP_val].u_val); + fprintf(out_file, "\t\t %0.10e \n",rrd.pdp_prep[i].scratch[PDP_val].u_val); } - printf("\t\t %lu \n", + fprintf(out_file, "\t\t %lu \n", rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt); - printf("\t\n\n"); + fprintf(out_file, "\t\n\n"); } - puts(""); + fputs("", out_file); rra_base=ftell(in_file); rra_next = rra_base; @@ -141,43 +161,43 @@ rrd_dump_r(char *filename) rra_next += ( rrd.stat_head->ds_cnt * rrd.rra_def[i].row_cnt * sizeof(rrd_value_t)); - printf("\t\n"); - printf("\t\t %s \n",rrd.rra_def[i].cf_nam); - printf("\t\t %lu \n\n", + fprintf(out_file, "\t\n"); + fprintf(out_file, "\t\t %s \n",rrd.rra_def[i].cf_nam); + fprintf(out_file, "\t\t %lu \n\n", rrd.rra_def[i].pdp_cnt, rrd.rra_def[i].pdp_cnt *rrd.stat_head->pdp_step); /* support for RRA parameters */ - printf("\t\t\n"); + fprintf(out_file, "\t\t\n"); switch(cf_conv(rrd.rra_def[i].cf_nam)) { case CF_HWPREDICT: - printf("\t\t %0.10e \n", + fprintf(out_file, "\t\t %0.10e \n", rrd.rra_def[i].par[RRA_hw_alpha].u_val); - printf("\t\t %0.10e \n", + fprintf(out_file, "\t\t %0.10e \n", rrd.rra_def[i].par[RRA_hw_beta].u_val); - printf("\t\t %lu \n", + fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); break; case CF_SEASONAL: case CF_DEVSEASONAL: - printf("\t\t %0.10e \n", + fprintf(out_file, "\t\t %0.10e \n", rrd.rra_def[i].par[RRA_seasonal_gamma].u_val); - printf("\t\t %lu \n", + fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_seasonal_smooth_idx].u_cnt); - printf("\t\t %lu \n", + fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); break; case CF_FAILURES: - printf("\t\t %0.10e \n", + fprintf(out_file, "\t\t %0.10e \n", rrd.rra_def[i].par[RRA_delta_pos].u_val); - printf("\t\t %0.10e \n", + fprintf(out_file, "\t\t %0.10e \n", rrd.rra_def[i].par[RRA_delta_neg].u_val); - printf("\t\t %lu \n", + fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_window_len].u_cnt); - printf("\t\t %lu \n", + fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_failure_threshold].u_cnt); /* fall thru */ case CF_DEVPREDICT: - printf("\t\t %lu \n", + fprintf(out_file, "\t\t %lu \n", rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); break; case CF_AVERAGE: @@ -185,14 +205,14 @@ rrd_dump_r(char *filename) case CF_MINIMUM: case CF_LAST: default: - printf("\t\t %0.10e \n", rrd.rra_def[i].par[RRA_cdp_xff_val].u_val); + fprintf(out_file, "\t\t %0.10e \n", rrd.rra_def[i].par[RRA_cdp_xff_val].u_val); break; } - printf("\t\t\n"); - printf("\t\t\n"); + fprintf(out_file, "\t\t\n"); + fprintf(out_file, "\t\t\n"); for(ii=0;iids_cnt;ii++){ unsigned long ivalue; - printf("\t\t\t\n"); + fprintf(out_file, "\t\t\t\n"); /* support for exporting all CDP parameters */ /* parameters common to all CFs */ /* primary_val and secondary_val do not need to be saved between updates @@ -201,63 +221,63 @@ rrd_dump_r(char *filename) value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt +ii].scratch[CDP_primary_val].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_secondary_val].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } switch(cf_conv(rrd.rra_def[i].cf_nam)) { case CF_HWPREDICT: value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_intercept].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_last_intercept].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_slope].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_last_slope].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } ivalue = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_null_count].u_cnt; - printf("\t\t\t %lu \n", ivalue); + fprintf(out_file, "\t\t\t %lu \n", ivalue); ivalue = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_last_null_count].u_cnt; - printf("\t\t\t %lu \n", ivalue); + fprintf(out_file, "\t\t\t %lu \n", ivalue); break; case CF_SEASONAL: case CF_DEVSEASONAL: value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_seasonal].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_hw_last_seasonal].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } ivalue = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_init_seasonal].u_cnt; - printf("\t\t\t %lu \n", ivalue); + fprintf(out_file, "\t\t\t %lu \n", ivalue); break; case CF_DEVPREDICT: break; @@ -266,12 +286,12 @@ rrd_dump_r(char *filename) unsigned short vidx; char *violations_array = (char *) ((void*) rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch); - printf("\t\t\t "); + fprintf(out_file, "\t\t\t "); for (vidx = 0; vidx < rrd.rra_def[i].par[RRA_window_len].u_cnt; ++vidx) { - printf("%d",violations_array[vidx]); + fprintf(out_file, "%d",violations_array[vidx]); } - printf(" \n"); + fprintf(out_file, " \n"); } break; case CF_AVERAGE: @@ -281,19 +301,19 @@ rrd_dump_r(char *filename) default: value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_val].u_val; if (isnan(value)) { - printf("\t\t\t NaN \n"); + fprintf(out_file, "\t\t\t NaN \n"); } else { - printf("\t\t\t %0.10e \n", value); + fprintf(out_file, "\t\t\t %0.10e \n", value); } - printf("\t\t\t %lu \n", + fprintf(out_file, "\t\t\t %lu \n", rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_unkn_pdp_cnt].u_cnt); break; } - printf("\t\t\t\n"); + fprintf(out_file, "\t\t\t\n"); } - printf("\t\t\n"); + fprintf(out_file, "\t\t\n"); - printf("\t\t\n"); + fprintf(out_file, "\t\t\n"); fseek(in_file,(rra_start +(rrd.rra_ptr[i].cur_row+1) * rrd.stat_head->ds_cnt @@ -318,23 +338,27 @@ rrd_dump_r(char *filename) #else # error "Need strftime" #endif - printf("\t\t\t ",somestring,(int)now); + fprintf(out_file, "\t\t\t ",somestring,(int)now); for(iii=0;iiids_cnt;iii++){ fread(&my_cdp,sizeof(rrd_value_t),1,in_file); if (isnan(my_cdp)){ - printf(" NaN "); + fprintf(out_file, " NaN "); } else { - printf(" %0.10e ",my_cdp); + fprintf(out_file, " %0.10e ",my_cdp); }; } - printf("\n"); + fprintf(out_file, "\n"); } - printf("\t\t\n\t\n"); + fprintf(out_file, "\t\t\n\t\n"); } - printf("\n"); + fprintf(out_file, "\n"); rrd_free(&rrd); fclose(in_file); + if (out_file != stdout) + { + fclose(out_file); + } return(0); }