diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 152018fa3d10a0f2fea244b5b57d9996b772e7d8..bbb5314f3f87182a96b6f0c732bebff2c3211f12 100644 (file)
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
/*****************************************************************************
- * 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
*****************************************************************************
*step = step_tmp;
if (optind + 1 >= argc) {
- rrd_set_error("not enough arguments");
+ rrd_set_error("Usage: rrdtool %s <file> <CF> [options]", argv[0]);
return -1;
}
- status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
- if (opt_daemon) free (opt_daemon);
- if (status) return (-1);
-
cf = argv[optind + 1];
- status = rrd_fetch_r(argv[optind], cf, start, end, step,
- ds_cnt, ds_namv, data);
+ rrdc_connect (opt_daemon);
+ if (rrdc_is_connected (opt_daemon))
+ status = rrdc_fetch (argv[optind], cf, start, end, step,
+ ds_cnt, ds_namv, data);
+
+ else
+ status = rrd_fetch_r(argv[optind], cf, start, end, step,
+ ds_cnt, ds_namv, data);
+
if (status != 0)
return (-1);
return (0);
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;
#ifdef HAVE_LIBDBI
/* handle libdbi datasources */
- if (strncmp("sql",filename,3)==0) {
- if (filename[3]==filename[4]) {
+ if (strncmp("sql//",filename,5)==0) {
return rrd_fetch_fn_libdbi(filename,cf_idx,start,end,step,ds_cnt,ds_namv,data);
- }
}
#endif
rra_start_time, rra_end_time, start_offset, end_offset);
#endif
/* only seek if the start time is before the end time */
- if (*start <= rra_end_time && *end >= rra_start_time - *step ){
+ 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_close(rrd_file);
+ rrd_free(&rrd);
return (0);
err_free_data:
free(*data);