projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rrd_client: Improved error handling / reporting.
[rrdtool.git]
/
src
/
rrd_fetch.c
diff --git
a/src/rrd_fetch.c
b/src/rrd_fetch.c
index
d821dfa
..
b60ea15
100644
(file)
--- a/
src/rrd_fetch.c
+++ b/
src/rrd_fetch.c
@@
-56,7
+56,7
@@
#include "rrd_client.h"
#include "rrd_is_thread_safe.h"
#include "rrd_client.h"
#include "rrd_is_thread_safe.h"
-/*
#define DEBUG
*/
+/*
#define DEBUG
*/
int rrd_fetch(
int argc,
int rrd_fetch(
int argc,
@@
-163,7
+163,7
@@
int rrd_fetch(
*step = step_tmp;
if (optind + 1 >= argc) {
*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;
}
return -1;
}
@@
-221,7
+221,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 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;
int first_full = 1;
int first_part = 1;
rrd_t rrd;
@@
-235,6
+235,15
@@
int rrd_fetch_fn(
*start, *end, *step);
#endif
*start, *end, *step);
#endif
+#ifdef HAVE_LIBDBI
+ /* handle libdbi datasources */
+ if (strncmp("sql",filename,3)==0) {
+ if (filename[3]==filename[4]) {
+ 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)
rrd_init(&rrd);
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
if (rrd_file == NULL)
@@
-249,7
+258,7
@@
int rrd_fetch_fn(
}
for (i = 0; (unsigned long) i < rrd.stat_head->ds_cnt; i++) {
}
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;
}
rrd_set_error("malloc fetch ds_namv entry");
goto err_free_ds_namv;
}
@@
-349,7
+358,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;
** 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;
}
rrd_set_error("malloc fetch data area");
goto err_free_all_ds_namv;
}
@@
-374,24
+383,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
"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) {
* 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
#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
#endif
+ }
+
/* step trough the array */
for (i = start_offset;
/* step trough the array */
for (i = start_offset;
@@
-455,6
+467,7
@@
int rrd_fetch_fn(
}
rrd_close(rrd_file);
}
rrd_close(rrd_file);
+ rrd_free(&rrd);
return (0);
err_free_data:
free(*data);
return (0);
err_free_data:
free(*data);