X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_info.c;h=a4e28622ef437d5a714c059e72b3aa8947bea22c;hp=4778218d2ac7a31ece62650e958cc7221ea0e127;hb=964a85b0ad6ce0954d2a83d54393ae094e41970f;hpb=a5eb18ad8c70e530a2e28ed435a0f52da0f5bee0 diff --git a/src/rrd_info.c b/src/rrd_info.c index 4778218..a4e2862 100644 --- a/src/rrd_info.c +++ b/src/rrd_info.c @@ -1,11 +1,12 @@ /***************************************************************************** - * RRDtool 1.3rc8 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_info Get Information about the configuration of an RRD *****************************************************************************/ #include "rrd_tool.h" #include "rrd_rpncalc.h" +#include "rrd_client.h" #include /* proto */ @@ -20,10 +21,18 @@ char *sprintf_alloc( char *fmt, ...) { - int maxlen = 1024 + strlen(fmt); char *str = NULL; va_list argp; - str = malloc(sizeof(char) * (maxlen + 1)); +#ifdef HAVE_VASPRINTF + va_start( argp, fmt ); + if (vasprintf( &str, fmt, argp ) == -1){ + va_end(argp); + rrd_set_error ("vasprintf failed."); + return(NULL); + } +#else + int maxlen = 1024 + strlen(fmt); + str = (char*)malloc(sizeof(char) * (maxlen + 1)); if (str != NULL) { va_start(argp, fmt); #ifdef HAVE_VSNPRINTF @@ -32,6 +41,7 @@ char *sprintf_alloc( vsprintf(str, fmt, argp); #endif } +#endif /* HAVE_VASPRINTF */ va_end(argp); return str; } @@ -39,15 +49,12 @@ char *sprintf_alloc( /* the function formerly known as push was renamed to info_push and later * rrd_info_push because it is now used outside the scope of this file */ rrd_info_t - *rrd_info_push( - rrd_info_t *info, - char *key, - rrd_info_type_t type, - rrd_infoval_t value) + * rrd_info_push(rrd_info_t * info, + char *key, rrd_info_type_t type, rrd_infoval_t value) { rrd_info_t *next; - next = malloc(sizeof(*next)); + next = (rrd_info_t*)malloc(sizeof(*next)); next->next = (rrd_info_t *) 0; if (info) info->next = next; @@ -64,13 +71,13 @@ rrd_info_t next->value.u_int = value.u_int; break; case RD_I_STR: - next->value.u_str = malloc(sizeof(char) * (strlen(value.u_str) + 1)); + next->value.u_str = (char*)malloc(sizeof(char) * (strlen(value.u_str) + 1)); strcpy(next->value.u_str, value.u_str); break; case RD_I_BLO: next->value.u_blo.size = value.u_blo.size; next->value.u_blo.ptr = - malloc(sizeof(unsigned char) * value.u_blo.size); + (unsigned char *)malloc(sizeof(unsigned char) * value.u_blo.size); memcpy(next->value.u_blo.ptr, value.u_blo.ptr, value.u_blo.size); break; } @@ -83,30 +90,72 @@ rrd_info_t *rrd_info( char **argv) { rrd_info_t *info; + char *opt_daemon = NULL; + int status; - if (argc < 2) { - rrd_set_error("please specify an rrd"); - return NULL; - } + optind = 0; + opterr = 0; /* initialize getopt */ - info = rrd_info_r(argv[1]); + while (42) { + int opt; + int option_index = 0; + static struct option long_options[] = { + {"daemon", required_argument, 0, 'd'}, + {0, 0, 0, 0} + }; - return (info); -} + opt = getopt_long(argc, argv, "d:", long_options, &option_index); + if (opt == EOF) + break; + switch (opt) { + case 'd': + if (opt_daemon != NULL) + free (opt_daemon); + opt_daemon = strdup (optarg); + if (opt_daemon == NULL) + { + rrd_set_error ("strdup failed."); + return (NULL); + } + break; + + default: + rrd_set_error ("Usage: rrdtool %s [--daemon ] ", + argv[0]); + return (NULL); + break; + } + } /* while (42) */ + + if ((argc - optind) != 1) { + rrd_set_error ("Usage: rrdtool %s [--daemon ] ", + argv[0]); + return (NULL); + } + + status = rrdc_flush_if_daemon(opt_daemon, argv[optind]); + if (opt_daemon) free (opt_daemon); + if (status) return (NULL); + + info = rrd_info_r(argv[optind]); + + return (info); +} /* rrd_info_t *rrd_info */ rrd_info_t *rrd_info_r( char *filename) { unsigned int i, ii = 0; rrd_t rrd; - rrd_info_t *data = NULL, *cd; + rrd_info_t *data = NULL, *cd; rrd_infoval_t info; rrd_file_t *rrd_file; enum cf_en current_cf; enum dst_en current_ds; + rrd_init(&rrd); rrd_file = rrd_open(filename, &rrd, RRD_READONLY); if (rrd_file == NULL) goto err_free; @@ -124,12 +173,20 @@ rrd_info_t *rrd_info_r( info.u_cnt = rrd.live_head->last_up; cd = rrd_info_push(cd, sprintf_alloc("last_update"), RD_I_CNT, info); + info.u_cnt = rrd_get_header_size(&rrd); + cd = rrd_info_push(cd, sprintf_alloc("header_size"), RD_I_CNT, info); + for (i = 0; i < rrd.stat_head->ds_cnt; i++) { + info.u_cnt=i; + cd= rrd_info_push(cd,sprintf_alloc("ds[%s].index", + rrd.ds_def[i].ds_nam), + RD_I_CNT, info); + info.u_str = rrd.ds_def[i].dst; cd = rrd_info_push(cd, sprintf_alloc("ds[%s].type", - rrd.ds_def[i].ds_nam), - RD_I_STR, info); + rrd.ds_def[i].ds_nam), + RD_I_STR, info); current_ds = dst_conv(rrd.ds_def[i].dst); switch (current_ds) { @@ -141,105 +198,114 @@ rrd_info_t *rrd_info_r( rrd.ds_def, &buffer); info.u_str = buffer; cd = rrd_info_push(cd, - sprintf_alloc("ds[%s].cdef", rrd.ds_def[i].ds_nam), - RD_I_STR, info); + sprintf_alloc("ds[%s].cdef", + rrd.ds_def[i].ds_nam), RD_I_STR, + info); free(buffer); } break; default: info.u_cnt = rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt; cd = rrd_info_push(cd, - sprintf_alloc("ds[%s].minimal_heartbeat", - rrd.ds_def[i].ds_nam), RD_I_CNT, - info); + sprintf_alloc("ds[%s].minimal_heartbeat", + rrd.ds_def[i].ds_nam), RD_I_CNT, + info); info.u_val = rrd.ds_def[i].par[DS_min_val].u_val; cd = rrd_info_push(cd, - sprintf_alloc("ds[%s].min", rrd.ds_def[i].ds_nam), - RD_I_VAL, info); + sprintf_alloc("ds[%s].min", + rrd.ds_def[i].ds_nam), RD_I_VAL, + info); info.u_val = rrd.ds_def[i].par[DS_max_val].u_val; cd = rrd_info_push(cd, - sprintf_alloc("ds[%s].max", rrd.ds_def[i].ds_nam), - RD_I_VAL, info); + sprintf_alloc("ds[%s].max", + rrd.ds_def[i].ds_nam), RD_I_VAL, + info); break; } info.u_str = rrd.pdp_prep[i].last_ds; cd = rrd_info_push(cd, - sprintf_alloc("ds[%s].last_ds", rrd.ds_def[i].ds_nam), - RD_I_STR, info); + sprintf_alloc("ds[%s].last_ds", + rrd.ds_def[i].ds_nam), RD_I_STR, + info); info.u_val = rrd.pdp_prep[i].scratch[PDP_val].u_val; cd = rrd_info_push(cd, - sprintf_alloc("ds[%s].value", rrd.ds_def[i].ds_nam), - RD_I_VAL, info); + sprintf_alloc("ds[%s].value", + rrd.ds_def[i].ds_nam), RD_I_VAL, + info); info.u_cnt = rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt; cd = rrd_info_push(cd, - sprintf_alloc("ds[%s].unknown_sec", - rrd.ds_def[i].ds_nam), RD_I_CNT, info); + sprintf_alloc("ds[%s].unknown_sec", + rrd.ds_def[i].ds_nam), RD_I_CNT, + info); } for (i = 0; i < rrd.stat_head->rra_cnt; i++) { info.u_str = rrd.rra_def[i].cf_nam; - cd = rrd_info_push(cd, sprintf_alloc("rra[%d].cf", i), RD_I_STR, info); + cd = rrd_info_push(cd, sprintf_alloc("rra[%d].cf", i), RD_I_STR, + info); current_cf = cf_conv(rrd.rra_def[i].cf_nam); info.u_cnt = rrd.rra_def[i].row_cnt; - cd = rrd_info_push(cd, sprintf_alloc("rra[%d].rows", i), RD_I_CNT, info); + cd = rrd_info_push(cd, sprintf_alloc("rra[%d].rows", i), RD_I_CNT, + info); info.u_cnt = rrd.rra_ptr[i].cur_row; cd = rrd_info_push(cd, sprintf_alloc("rra[%d].cur_row", i), RD_I_CNT, - info); + info); info.u_cnt = rrd.rra_def[i].pdp_cnt; - cd = rrd_info_push(cd, sprintf_alloc("rra[%d].pdp_per_row", i), RD_I_CNT, - info); + cd = rrd_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 = rrd_info_push(cd, sprintf_alloc("rra[%d].alpha", i), RD_I_VAL, - info); + cd = rrd_info_push(cd, sprintf_alloc("rra[%d].alpha", i), + RD_I_VAL, info); info.u_val = rrd.rra_def[i].par[RRA_hw_beta].u_val; cd = rrd_info_push(cd, sprintf_alloc("rra[%d].beta", i), RD_I_VAL, - info); + info); break; case CF_SEASONAL: case CF_DEVSEASONAL: info.u_val = rrd.rra_def[i].par[RRA_seasonal_gamma].u_val; - cd = rrd_info_push(cd, sprintf_alloc("rra[%d].gamma", i), RD_I_VAL, - info); + cd = rrd_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 = rrd_info_push(cd, - sprintf_alloc("rra[%d].smoothing_window", i), - RD_I_VAL, info); + 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; cd = rrd_info_push(cd, sprintf_alloc("rra[%d].delta_pos", i), - RD_I_VAL, info); + RD_I_VAL, info); info.u_val = rrd.rra_def[i].par[RRA_delta_neg].u_val; cd = rrd_info_push(cd, sprintf_alloc("rra[%d].delta_neg", i), - RD_I_VAL, info); + RD_I_VAL, info); info.u_cnt = rrd.rra_def[i].par[RRA_failure_threshold].u_cnt; - cd = rrd_info_push(cd, sprintf_alloc("rra[%d].failure_threshold", i), - RD_I_CNT, info); + cd = rrd_info_push(cd, + sprintf_alloc("rra[%d].failure_threshold", i), + RD_I_CNT, info); info.u_cnt = rrd.rra_def[i].par[RRA_window_len].u_cnt; cd = rrd_info_push(cd, sprintf_alloc("rra[%d].window_length", i), - RD_I_CNT, info); + RD_I_CNT, info); break; case CF_DEVPREDICT: break; default: info.u_val = rrd.rra_def[i].par[RRA_cdp_xff_val].u_val; cd = rrd_info_push(cd, sprintf_alloc("rra[%d].xff", i), RD_I_VAL, - info); + info); break; } @@ -251,36 +317,40 @@ rrd_info_t *rrd_info_r( rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_hw_intercept].u_val; cd = rrd_info_push(cd, - sprintf_alloc("rra[%d].cdp_prep[%d].intercept", - i, ii), RD_I_VAL, info); + sprintf_alloc + ("rra[%d].cdp_prep[%d].intercept", i, ii), + RD_I_VAL, info); info.u_val = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_hw_slope].u_val; cd = rrd_info_push(cd, - sprintf_alloc("rra[%d].cdp_prep[%d].slope", i, - ii), RD_I_VAL, info); + sprintf_alloc("rra[%d].cdp_prep[%d].slope", + i, ii), RD_I_VAL, info); info.u_cnt = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_null_count].u_cnt; cd = rrd_info_push(cd, - sprintf_alloc("rra[%d].cdp_prep[%d].NaN_count", - i, ii), RD_I_CNT, info); + sprintf_alloc + ("rra[%d].cdp_prep[%d].NaN_count", i, ii), + RD_I_CNT, info); break; case CF_SEASONAL: info.u_val = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_hw_seasonal].u_val; cd = rrd_info_push(cd, - sprintf_alloc("rra[%d].cdp_prep[%d].seasonal", - i, ii), RD_I_VAL, info); + sprintf_alloc + ("rra[%d].cdp_prep[%d].seasonal", i, ii), + RD_I_VAL, info); break; case CF_DEVSEASONAL: info.u_val = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_seasonal_deviation].u_val; cd = rrd_info_push(cd, - sprintf_alloc("rra[%d].cdp_prep[%d].deviation", - i, ii), RD_I_VAL, info); + sprintf_alloc + ("rra[%d].cdp_prep[%d].deviation", i, ii), + RD_I_VAL, info); break; case CF_DEVPREDICT: break; @@ -298,8 +368,9 @@ rrd_info_t *rrd_info_r( history[j] = '\0'; info.u_str = history; cd = rrd_info_push(cd, - sprintf_alloc("rra[%d].cdp_prep[%d].history", - i, ii), RD_I_STR, info); + sprintf_alloc + ("rra[%d].cdp_prep[%d].history", i, ii), + RD_I_STR, info); } break; default: @@ -307,15 +378,15 @@ rrd_info_t *rrd_info_r( rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_val].u_val; cd = rrd_info_push(cd, - sprintf_alloc("rra[%d].cdp_prep[%d].value", i, - ii), RD_I_VAL, info); + sprintf_alloc("rra[%d].cdp_prep[%d].value", + i, ii), RD_I_VAL, info); info.u_cnt = rrd.cdp_prep[i * rrd.stat_head->ds_cnt + ii].scratch[CDP_unkn_pdp_cnt].u_cnt; cd = rrd_info_push(cd, - sprintf_alloc - ("rra[%d].cdp_prep[%d].unknown_datapoints", i, - ii), RD_I_CNT, info); + sprintf_alloc + ("rra[%d].cdp_prep[%d].unknown_datapoints", + i, ii), RD_I_CNT, info); break; } } @@ -329,7 +400,7 @@ rrd_info_t *rrd_info_r( void rrd_info_print( - rrd_info_t *data) + rrd_info_t * data) { while (data) { printf("%s = ", data->key); @@ -360,7 +431,7 @@ void rrd_info_print( } void rrd_info_free( - rrd_info_t *data) + rrd_info_t * data) { rrd_info_t *save;