X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=47b41669fd25a390bbc2385b5e91663f6c1231de;hb=45fdf99cbd645b2b9731f6186a8713f093ab1946;hp=563e76b3c05973509630084b7b812dddf0f7034c;hpb=ac630adec930653637199258efd99024d49325c7;p=rrdtool.git diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c index 563e76b..47b4166 100644 --- a/src/rrd_fetch.c +++ b/src/rrd_fetch.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 ***************************************************************************** * rrd_fetch.c read date from an rrd to use for further processing ***************************************************************************** @@ -56,7 +56,7 @@ #include "rrd_client.h" #include "rrd_is_thread_safe.h" -/*#define DEBUG*/ +/* #define DEBUG */ int rrd_fetch( int argc, @@ -163,50 +163,21 @@ int rrd_fetch( *step = step_tmp; if (optind + 1 >= argc) { - rrd_set_error("not enough arguments"); + rrd_set_error("Usage: rrdtool %s [options]", argv[0]); return -1; } - if (opt_daemon == NULL) - { - char *temp; - - temp = getenv (ENV_RRDCACHED_ADDRESS); - if (temp != NULL) - { - opt_daemon = strdup (temp); - if (opt_daemon == NULL) - { - rrd_set_error("strdup failed."); - return (-1); - } - } - } - - if (opt_daemon != NULL) - { - status = rrdc_connect (opt_daemon); - if (status != 0) - { - rrd_set_error ("rrdc_connect failed with status %i.", status); - return (-1); - } - - status = rrdc_flush (argv[optind]); - if (status != 0) - { - rrd_set_error ("rrdc_flush (%s) failed with status %i.", - argv[optind], status); - return (-1); - } + cf = argv[optind + 1]; - rrdc_disconnect (); - } /* if (opt_daemon) */ + rrdc_connect (opt_daemon); + if (rrdc_is_connected (opt_daemon)) + status = rrdc_fetch (argv[optind], cf, start, end, step, + ds_cnt, ds_namv, data); - cf = argv[optind + 1]; + else + status = rrd_fetch_r(argv[optind], cf, start, end, step, + ds_cnt, ds_namv, data); - status = rrd_fetch_r(argv[optind], cf, start, end, step, - ds_cnt, ds_namv, data); if (status != 0) return (-1); return (0); @@ -253,7 +224,7 @@ int rrd_fetch_fn( long best_full_step_diff = 0, best_part_step_diff = 0, tmp_step_diff = 0, tmp_match = 0, best_match = 0; long full_match, rra_base; - long start_offset, end_offset; + off_t start_offset, end_offset; int first_full = 1; int first_part = 1; rrd_t rrd; @@ -267,6 +238,14 @@ int rrd_fetch_fn( *start, *end, *step); #endif +#ifdef HAVE_LIBDBI + /* handle libdbi datasources */ + if (strncmp("sql//",filename,5)==0) { + return rrd_fetch_fn_libdbi(filename,cf_idx,start,end,step,ds_cnt,ds_namv,data); + } +#endif + + rrd_init(&rrd); rrd_file = rrd_open(filename, &rrd, RRD_READONLY); if (rrd_file == NULL) goto err_free; @@ -280,7 +259,7 @@ int rrd_fetch_fn( } for (i = 0; (unsigned long) i < rrd.stat_head->ds_cnt; i++) { - if ((((*ds_namv)[i]) = malloc(sizeof(char) * DS_NAM_SIZE)) == NULL) { + if ((((*ds_namv)[i]) = (char*)malloc(sizeof(char) * DS_NAM_SIZE)) == NULL) { rrd_set_error("malloc fetch ds_namv entry"); goto err_free_ds_namv; } @@ -291,7 +270,34 @@ int rrd_fetch_fn( /* find the rra which best matches the requirements */ for (i = 0; (unsigned) i < rrd.stat_head->rra_cnt; i++) { - if (cf_conv(rrd.rra_def[i].cf_nam) == cf_idx) { + enum cf_en rratype=cf_conv(rrd.rra_def[i].cf_nam); + /* handle this RRA */ + if ( + /* if we found a direct match */ + (rratype == cf_idx) + || + /*if we found a DS with interval 1 + and CF (requested,available) are MIN,MAX,AVERAGE,LAST + */ + ( + /* only if we are on interval 1 */ + (rrd.rra_def[i].pdp_cnt==1) + && ( + /* and requested CF is MIN,MAX,AVERAGE,LAST */ + (cf_idx == CF_MINIMUM) + ||(cf_idx == CF_MAXIMUM) + ||(cf_idx == CF_AVERAGE) + ||(cf_idx == CF_LAST) + ) + && ( + /* and found CF is MIN,MAX,AVERAGE,LAST */ + (rratype == CF_MINIMUM) + ||(rratype == CF_MAXIMUM) + ||(rratype == CF_AVERAGE) + ||(rratype == CF_LAST) + ) + ) + ){ cal_end = (rrd.live_head->last_up - (rrd.live_head->last_up % (rrd.rra_def[i].pdp_cnt @@ -380,7 +386,7 @@ int rrd_fetch_fn( ** database is the one with time stamp (t+s) which means t to t+s. */ *ds_cnt = rrd.stat_head->ds_cnt; - if (((*data) = malloc(*ds_cnt * rows * sizeof(rrd_value_t))) == NULL) { + if (((*data) = (rrd_value_t*)malloc(*ds_cnt * rows * sizeof(rrd_value_t))) == NULL) { rrd_set_error("malloc fetch data area"); goto err_free_all_ds_namv; } @@ -405,24 +411,27 @@ int rrd_fetch_fn( "rra_start %lu, rra_end %lu, start_off %li, end_off %li\n", rra_start_time, rra_end_time, start_offset, end_offset); #endif - - /* fill the gap at the start if needs be */ - - if (start_offset <= 0) - rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1; - else - rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1 + start_offset; - - if (rrd_seek(rrd_file, (rra_base + (rra_pointer * (*ds_cnt) + /* only seek if the start time is before the end time */ + if (*start <= rra_end_time && *end >= rra_start_time - (off_t)*step ){ + if (start_offset <= 0) + rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1; + else + rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1 + start_offset; + + rra_pointer = rra_pointer % (signed) rrd.rra_def[chosen_rra].row_cnt; + + if (rrd_seek(rrd_file, (rra_base + (rra_pointer * (*ds_cnt) * sizeof(rrd_value_t))), SEEK_SET) != 0) { - rrd_set_error("seek error in RRA"); - goto err_free_data; - } + rrd_set_error("seek error in RRA"); + goto err_free_data; + } #ifdef DEBUG - fprintf(stderr, "First Seek: rra_base %lu rra_pointer %lu\n", - rra_base, rra_pointer); + fprintf(stderr, "First Seek: rra_base %lu rra_pointer %lu\n", + rra_base, rra_pointer); #endif + } + /* step trough the array */ for (i = start_offset; @@ -486,6 +495,7 @@ int rrd_fetch_fn( } rrd_close(rrd_file); + rrd_free(&rrd); return (0); err_free_data: free(*data);