From fadae458b4eba6719432bf7e3f7680d7f1fae7c0 Mon Sep 17 00:00:00 2001 From: oetiker Date: Mon, 17 Aug 2009 21:31:02 +0000 Subject: [PATCH] Added a call back interface to rrd_dump to be able to call the function from c. See librrd.pod for documentation. -- Benny Baumann BenBE geshi.org git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1893 a5681a0c-68f1-0310-ab6d-d61299d08faa --- CONTRIBUTORS | 1 + doc/librrd.pod | 37 ++++ src/librrd.sym.in.in | 1 + src/rrd.h | 10 ++ src/rrd_dump.c | 466 ++++++++++++++++++++++++++++----------------------- 5 files changed, 305 insertions(+), 210 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index dd5f72a..04378fb 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -9,6 +9,7 @@ Alex van den Bogaerdt (rrd_resize.c and more) Amos Shapira Andreas Kroomaa Andrew Turner (LAST consolidator) +Benny Baumann 64bit stuff, --alt-autoscale-max Bernhard Fischer MMAP rewrite Bill Fenner diff --git a/doc/librrd.pod b/doc/librrd.pod index 52cf18e..04a295d 100644 --- a/doc/librrd.pod +++ b/doc/librrd.pod @@ -58,4 +58,41 @@ source pointer will be NULL and the count will be zero. rrd_free_ptrs(&arr, &arr_size); /* here, arr == NULL && arr_size == 0 */ +=item B + +In some situations it is necessary to get the output of C without +writing it to a file or the standard output. In such cases an application +can ask B to call an user-defined function each time there +is output to be stored somewhere. This can be used, to e.g. directly feed +an XML parser with the dumped output or transfer the resulting string +in memory. + +The arguments for B are the same as for B +except that the output filename parameter is replaced by the user-defined +callback function and an additional parameter for the callback function +that is passed untouched, i.e. to store information about the callback state +needed for the user-defined callback to function properly. + +Recent versions of B internally use this callback mechanism +to write their output to the file provided by the user. + + size_t rrd_dump_opt_cb_fileout( + const void *data, + size_t len, + void *user) + { + return fwrite(data, 1, len, (FILE *)user); + } + +The associated call for B looks like + + res = rrd_dump_cb_r(filename, opt_header, + rrd_dump_opt_cb_fileout, (void *)out_file); + +where the last parameter specifies the file handle B +should write to. There's no specific condition for the callback to detect +when it is called for the first time, nor for the last time. If you require +this for initialization and cleanup you should do those tasks before and +after calling B respectively. + =back diff --git a/src/librrd.sym.in.in b/src/librrd.sym.in.in index 71ac3fb..18b5e72 100644 --- a/src/librrd.sym.in.in +++ b/src/librrd.sym.in.in @@ -7,6 +7,7 @@ rrd_create_r rrd_dontneed rrd_dump rrd_dump_r +rrd_dump_cb_r rrd_fetch rrd_fetch_r rrd_flushcached diff --git a/src/rrd.h b/src/rrd.h index 412e20a..a5d3129 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -130,6 +130,10 @@ extern "C" { struct rrd_info_t *next; } rrd_info_t; + typedef size_t (* rrd_output_callback_t)( + const void *, + size_t, + void *); /* main function blocks */ int rrd_create( @@ -252,6 +256,12 @@ extern "C" { const char *filename, int rraindex); + int rrd_dump_cb_r( + const char *filename, + int opt_header, + rrd_output_callback_t cb, + void *user); + /* Transplanted from rrd_parsetime.h */ typedef enum { ABSOLUTE_TIME, diff --git a/src/rrd_dump.c b/src/rrd_dump.c index 504e583..a206230 100644 --- a/src/rrd_dump.c +++ b/src/rrd_dump.c @@ -49,15 +49,22 @@ #include #endif - #if !(defined(NETWARE) || defined(WIN32)) extern char *tzname[2]; #endif -static int rrd_dump_opt_r( +//Local prototypes +size_t rrd_dump_opt_cb_fileout( + const void *data, + size_t len, + void *user); + + +int rrd_dump_cb_r( const char *filename, - char *outname, - int opt_header) + int opt_header, + rrd_output_callback_t cb, + void *user) { unsigned int i, ii, ix, iii = 0; time_t now; @@ -65,107 +72,130 @@ static int rrd_dump_opt_r( rrd_value_t my_cdp; off_t rra_base, rra_start, rra_next; rrd_file_t *rrd_file; - FILE *out_file; rrd_t rrd; rrd_value_t value; struct tm tm; char *old_locale = ""; +//These two macros are local defines to clean up visible code from its redndancy +//and make it easier to read. +#define CB_PUTS(str) \ + cb((str), strlen((str)), user) +#define CB_FMTS(...) do { \ + char buffer[256]; \ + snprintf (buffer, sizeof(buffer), __VA_ARGS__); \ + CB_PUTS (buffer); \ + } while (0) +//These macros are to be undefined at the end of this function + + //Check if we got a (valid) callback method + if (!cb) { + return (-1); + } + rrd_init(&rrd); + rrd_file = rrd_open(filename, &rrd, RRD_READONLY | RRD_READAHEAD); if (rrd_file == NULL) { rrd_free(&rrd); return (-1); } - out_file = NULL; - if (outname) { - if (!(out_file = fopen(outname, "w"))) { - return (-1); - } - } else { - out_file = stdout; - } #ifdef HAVE_SETLOCALE old_locale = setlocale(LC_NUMERIC, "C"); #endif if (opt_header == 1) { - fputs("\n", out_file); - fputs - ("\n", - out_file); - fputs("\n", out_file); - fputs("\n", out_file); + CB_PUTS("\n"); + CB_PUTS("\n"); + CB_PUTS("\n"); + CB_PUTS("\n"); } else if (opt_header == 2) { - fputs("\n", out_file); - fputs("\n", out_file); - fputs("\n", out_file); + CB_PUTS("\n"); + CB_PUTS("\n"); + CB_PUTS("\n"); } else { - fputs("\n", out_file); - fputs("\n", out_file); + CB_PUTS("\n"); + CB_PUTS("\n"); } if (atoi(rrd.stat_head->version) <= 3) { - fprintf(out_file, "\t%s\n", RRD_VERSION3); + CB_FMTS("\t%s\n", RRD_VERSION3); } else { - fprintf(out_file, "\t%s\n", RRD_VERSION); + CB_FMTS("\t%s\n", RRD_VERSION); } - fprintf(out_file, "\t%lu \n", - rrd.stat_head->pdp_step); + + CB_FMTS("\t%lu \n", + rrd.stat_head->pdp_step); + #ifdef HAVE_STRFTIME localtime_r(&rrd.live_head->last_up, &tm); - strftime(somestring, 200, "%Y-%m-%d %H:%M:%S %Z", &tm); + strftime(somestring, 255, "%Y-%m-%d %H:%M:%S %Z", &tm); #else # error "Need strftime" #endif - fprintf(out_file, "\t%lld \n\n", - (long long) rrd.live_head->last_up, somestring); + CB_FMTS("\t%lld \n\n", + (long long) rrd.live_head->last_up, somestring); for (i = 0; i < rrd.stat_head->ds_cnt; i++) { - 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); + CB_PUTS("\t\n"); + + CB_FMTS("\t\t %s \n", rrd.ds_def[i].ds_nam); + + CB_FMTS("\t\t %s \n", rrd.ds_def[i].dst); + if (dst_conv(rrd.ds_def[i].dst) != DST_CDEF) { - fprintf(out_file, - "\t\t%lu\n", + CB_FMTS("\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)) { - fprintf(out_file, "\t\tNaN\n"); + CB_PUTS("\t\tNaN\n"); } else { - fprintf(out_file, "\t\t%0.10e\n", - rrd.ds_def[i].par[DS_min_val].u_val); + CB_FMTS("\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)) { - fprintf(out_file, "\t\tNaN\n"); + CB_PUTS("\t\tNaN\n"); } else { - fprintf(out_file, "\t\t%0.10e\n", - rrd.ds_def[i].par[DS_max_val].u_val); + CB_FMTS("\t\t%0.10e\n", + rrd.ds_def[i].par[DS_max_val].u_val); } } else { /* DST_CDEF */ char *str = NULL; rpn_compact2str((rpn_cdefds_t *) &(rrd.ds_def[i].par[DS_cdef]), - rrd.ds_def, &str); - fprintf(out_file, "\t\t%s\n", str); + rrd.ds_def, &str); + + //Splitting into 3 writes to avoid allocating memory + //This is better compared to snprintf as str may be of arbitrary size + CB_PUTS("\t\t "); + CB_PUTS(str); + CB_PUTS(" \n"); + free(str); } - fprintf(out_file, "\n\t\t\n"); - fprintf(out_file, "\t\t%s\n", - rrd.pdp_prep[i].last_ds); + + CB_PUTS("\n\t\t\n"); + CB_FMTS("\t\t%s\n", + rrd.pdp_prep[i].last_ds); + if (isnan(rrd.pdp_prep[i].scratch[PDP_val].u_val)) { - fprintf(out_file, "\t\tNaN\n"); + CB_PUTS("\t\tNaN\n"); } else { - fprintf(out_file, "\t\t%0.10e\n", - rrd.pdp_prep[i].scratch[PDP_val].u_val); + CB_FMTS("\t\t%0.10e\n", + rrd.pdp_prep[i].scratch[PDP_val].u_val); } - fprintf(out_file, "\t\t%lu\n", - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt); - fprintf(out_file, "\t\n\n"); + CB_FMTS("\t\t %lu \n", + rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt); + + CB_PUTS("\t\n\n"); } - fputs("\n", out_file); + CB_PUTS("\t\n"); rra_base = rrd_file->header_len; rra_next = rra_base; @@ -177,202 +207,181 @@ static int rrd_dump_opt_r( rra_start = rra_next; rra_next += (rrd.stat_head->ds_cnt * rrd.rra_def[i].row_cnt * sizeof(rrd_value_t)); - 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); + + CB_PUTS("\t\n"); + + CB_FMTS("\t\t%s\n", rrd.rra_def[i].cf_nam); + + CB_FMTS("\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 */ - fprintf(out_file, "\t\t\n"); + CB_PUTS("\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", - rrd.rra_def[i].par[RRA_hw_beta].u_val); - fprintf(out_file, - "\t\t%lu\n", - rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); + CB_FMTS("\t\t%0.10e\n", + rrd.rra_def[i].par[RRA_hw_alpha].u_val); + + CB_FMTS("\t\t%0.10e\n", + rrd.rra_def[i].par[RRA_hw_beta].u_val); + + CB_FMTS("\t\t%lu\n", + rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); break; case CF_SEASONAL: case CF_DEVSEASONAL: - fprintf(out_file, - "\t\t%0.10e\n", - rrd.rra_def[i].par[RRA_seasonal_gamma].u_val); - fprintf(out_file, - "\t\t%lu\n", - rrd.rra_def[i].par[RRA_seasonal_smooth_idx].u_cnt); + CB_FMTS("\t\t%0.10e\n", + rrd.rra_def[i].par[RRA_seasonal_gamma].u_val); + + CB_FMTS("\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); + CB_FMTS("\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); + + CB_FMTS("\t\t%lu\n", + rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); break; case CF_FAILURES: - fprintf(out_file, "\t\t%0.10e\n", - rrd.rra_def[i].par[RRA_delta_pos].u_val); - fprintf(out_file, "\t\t%0.10e\n", - rrd.rra_def[i].par[RRA_delta_neg].u_val); - fprintf(out_file, "\t\t%lu\n", - rrd.rra_def[i].par[RRA_window_len].u_cnt); - fprintf(out_file, - "\t\t%lu\n", - rrd.rra_def[i].par[RRA_failure_threshold].u_cnt); + CB_FMTS("\t\t%0.10e\n", + rrd.rra_def[i].par[RRA_delta_pos].u_val); + + CB_FMTS("\t\t%0.10e\n", + rrd.rra_def[i].par[RRA_delta_neg].u_val); + + CB_FMTS("\t\t%lu\n", + rrd.rra_def[i].par[RRA_window_len].u_cnt); + + CB_FMTS("\t\t%lu\n", + rrd.rra_def[i].par[RRA_failure_threshold].u_cnt); + /* fall thru */ case CF_DEVPREDICT: - fprintf(out_file, - "\t\t%lu\n", - rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); + CB_FMTS("\t\t%lu\n", + rrd.rra_def[i].par[RRA_dependent_rra_idx].u_cnt); break; case CF_AVERAGE: case CF_MAXIMUM: case CF_MINIMUM: case CF_LAST: default: - fprintf(out_file, "\t\t%0.10e\n", - rrd.rra_def[i].par[RRA_cdp_xff_val].u_val); + CB_FMTS("\t\t%0.10e\n", + rrd.rra_def[i].par[RRA_cdp_xff_val].u_val); break; } - fprintf(out_file, "\t\t\n"); - fprintf(out_file, "\t\t\n"); + + CB_PUTS("\t\t\n"); + CB_PUTS("\t\t\n"); + for (ii = 0; ii < rrd.stat_head->ds_cnt; ii++) { unsigned long ivalue; - fprintf(out_file, "\t\t\t\n"); + CB_PUTS("\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 * so strictly speaking they could be omitted. * However, they can be useful for diagnostic purposes, so are included here. */ - value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt - + ii].scratch[CDP_primary_val].u_val; + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_primary_val].u_val; if (isnan(value)) { - fprintf(out_file, - "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, - "\t\t\t%0.10e\n", - value); + CB_FMTS("\t\t\t%0.10e\n", value); } - value = - rrd.cdp_prep[i * rrd.stat_head->ds_cnt + - ii].scratch[CDP_secondary_val].u_val; + + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_secondary_val].u_val; if (isnan(value)) { - fprintf(out_file, - "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, - "\t\t\t%0.10e\n", - value); + CB_FMTS("\t\t\t%0.10e\n", value); } + 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; if (isnan(value)) { - fprintf(out_file, "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, - "\t\t\t%0.10e\n", value); + CB_FMTS("\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; + + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_hw_last_intercept].u_val; if (isnan(value)) { - fprintf(out_file, - "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, - "\t\t\t%0.10e\n", - value); + CB_FMTS("\t\t\t%0.10e\n", value); } - value = - rrd.cdp_prep[i * rrd.stat_head->ds_cnt + - ii].scratch[CDP_hw_slope].u_val; + + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_hw_slope].u_val; if (isnan(value)) { - fprintf(out_file, "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, "\t\t\t%0.10e\n", - value); + CB_FMTS("\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; + + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_hw_last_slope].u_val; if (isnan(value)) { - fprintf(out_file, - "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, - "\t\t\t%0.10e\n", - value); + CB_FMTS("\t\t\t%0.10e\n", value); } - ivalue = - rrd.cdp_prep[i * rrd.stat_head->ds_cnt + - ii].scratch[CDP_null_count].u_cnt; - 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; - fprintf(out_file, - "\t\t\t%lu\n", - ivalue); + + ivalue = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_null_count].u_cnt; + CB_FMTS("\t\t\t%lu\n", ivalue); + + ivalue = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_last_null_count].u_cnt; + CB_FMTS("\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; + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_hw_seasonal].u_val; if (isnan(value)) { - fprintf(out_file, "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, "\t\t\t%0.10e\n", - value); + CB_FMTS("\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; + + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_hw_last_seasonal].u_val; if (isnan(value)) { - fprintf(out_file, - "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, - "\t\t\t%0.10e\n", - value); + CB_FMTS("\t\t\t%0.10e\n", value); } - ivalue = - rrd.cdp_prep[i * rrd.stat_head->ds_cnt + - ii].scratch[CDP_init_seasonal].u_cnt; - fprintf(out_file, "\t\t\t%lu\n", - ivalue); + + ivalue = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_init_seasonal].u_cnt; + CB_FMTS("\t\t\t%lu\n", ivalue); break; case CF_DEVPREDICT: break; case CF_FAILURES: { unsigned short vidx; - char *violations_array = (char *) ((void *) - rrd.cdp_prep[i * - rrd. - stat_head-> - ds_cnt + - ii]. - scratch); - fprintf(out_file, "\t\t\t "); + char *violations_array = (char *) ((void *) + rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch); + CB_PUTS("\t\t\t"); for (vidx = 0; - vidx < rrd.rra_def[i].par[RRA_window_len].u_cnt; - ++vidx) { - fprintf(out_file, "%d", violations_array[vidx]); + vidx < rrd.rra_def[i].par[RRA_window_len].u_cnt; + ++vidx) { + CB_FMTS("%d", violations_array[vidx]); } - fprintf(out_file, " \n"); + CB_PUTS("\n"); } break; case CF_AVERAGE: @@ -380,26 +389,23 @@ static int rrd_dump_opt_r( case CF_MINIMUM: case CF_LAST: default: - value = - rrd.cdp_prep[i * rrd.stat_head->ds_cnt + - ii].scratch[CDP_val].u_val; + value = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_val].u_val; if (isnan(value)) { - fprintf(out_file, "\t\t\tNaN\n"); + CB_PUTS("\t\t\tNaN\n"); } else { - fprintf(out_file, "\t\t\t%0.10e\n", - value); + CB_FMTS("\t\t\t%0.10e\n", value); } - 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); + + CB_FMTS("\t\t\t%lu\n", + rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii]. + scratch[CDP_unkn_pdp_cnt].u_cnt); break; } - fprintf(out_file, "\t\t\t\n"); + CB_PUTS("\t\t\t\n"); } - fprintf(out_file, "\t\t\n"); + CB_PUTS("\t\t\n"); - fprintf(out_file, "\t\t\n"); + CB_PUTS("\t\t\n"); rrd_seek(rrd_file, (rra_start + (rrd.rra_ptr[i].cur_row + 1) * rrd.stat_head->ds_cnt * sizeof(rrd_value_t)), SEEK_SET); @@ -419,34 +425,74 @@ static int rrd_dump_opt_r( timer++; #if HAVE_STRFTIME localtime_r(&now, &tm); - strftime(somestring, 200, "%Y-%m-%d %H:%M:%S %Z", &tm); + strftime(somestring, 255, "%Y-%m-%d %H:%M:%S %Z", &tm); #else # error "Need strftime" #endif - fprintf(out_file, "\t\t\t ", somestring, - (long long) now); + CB_FMTS("\t\t\t ", somestring, (long long) now); for (iii = 0; iii < rrd.stat_head->ds_cnt; iii++) { rrd_read(rrd_file, &my_cdp, sizeof(rrd_value_t) * 1); if (isnan(my_cdp)) { - fprintf(out_file, "NaN"); + CB_PUTS("NaN"); } else { - fprintf(out_file, "%0.10e", my_cdp); - }; + CB_FMTS("%0.10e", my_cdp); + } } - fprintf(out_file, "\n"); + CB_PUTS("\n"); } - fprintf(out_file, "\t\t\n\t\n"); - + CB_PUTS("\t\t\n\t\n"); } - fprintf(out_file, "\n"); + + CB_PUTS("\n"); + rrd_free(&rrd); - if (out_file != stdout) { - fclose(out_file); - } + #ifdef HAVE_SETLOCALE setlocale(LC_NUMERIC, old_locale); #endif + return rrd_close(rrd_file); + +//Undefining the previously defined shortcuts +//See start of this function +#undef CB_PUTS +#undef CB_FMTS +//End of macro undefining + +} + +size_t rrd_dump_opt_cb_fileout( + const void *data, + size_t len, + void *user) +{ + return fwrite(data, 1, len, (FILE *)user); +} + +int rrd_dump_opt_r( + const char *filename, + char *outname, + int opt_noheader) +{ + FILE *out_file; + int res; + + out_file = NULL; + if (outname) { + if (!(out_file = fopen(outname, "w"))) { + return (-1); + } + } else { + out_file = stdout; + } + + res = rrd_dump_cb_r(filename, opt_noheader, rrd_dump_opt_cb_fileout, (void *)out_file); + + if (out_file != stdout) { + fclose(out_file); + } + + return res; } /* backward compatibility with 1.2.x */ -- 2.11.0