projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only include utime.h when necessary
[rrdtool.git]
/
src
/
rrd_fetch.c
diff --git
a/src/rrd_fetch.c
b/src/rrd_fetch.c
index
6ff81b5
..
23be6e0
100644
(file)
--- a/
src/rrd_fetch.c
+++ b/
src/rrd_fetch.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.3
rc8
Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3
.2
Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
@@
-53,9
+53,10
@@
*****************************************************************************/
#include "rrd_tool.h"
*****************************************************************************/
#include "rrd_tool.h"
+#include "rrd_client.h"
#include "rrd_is_thread_safe.h"
#include "rrd_is_thread_safe.h"
-/*
#define DEBUG
*/
+/*
#define DEBUG
*/
int rrd_fetch(
int argc,
int rrd_fetch(
int argc,
@@
-72,6
+73,8
@@
int rrd_fetch(
long step_tmp = 1;
time_t start_tmp = 0, end_tmp = 0;
const char *cf;
long step_tmp = 1;
time_t start_tmp = 0, end_tmp = 0;
const char *cf;
+ char *opt_daemon = NULL;
+ int status;
rrd_time_value_t start_tv, end_tv;
char *parsetime_error = NULL;
rrd_time_value_t start_tv, end_tv;
char *parsetime_error = NULL;
@@
-79,6
+82,7
@@
int rrd_fetch(
{"resolution", required_argument, 0, 'r'},
{"start", required_argument, 0, 's'},
{"end", required_argument, 0, 'e'},
{"resolution", required_argument, 0, 'r'},
{"start", required_argument, 0, 's'},
{"end", required_argument, 0, 'e'},
+ {"daemon", required_argument, 0, 'd'},
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
@@
-93,7
+97,7
@@
int rrd_fetch(
int option_index = 0;
int opt;
int option_index = 0;
int opt;
- opt = getopt_long(argc, argv, "r:s:e:", long_options, &option_index);
+ opt = getopt_long(argc, argv, "r:s:e:
d:
", long_options, &option_index);
if (opt == EOF)
break;
if (opt == EOF)
break;
@@
-114,6
+118,18
@@
int rrd_fetch(
case 'r':
step_tmp = atol(optarg);
break;
case 'r':
step_tmp = atol(optarg);
break;
+
+ case 'd':
+ if (opt_daemon != NULL)
+ free (opt_daemon);
+ opt_daemon = strdup (optarg);
+ if (opt_daemon == NULL)
+ {
+ rrd_set_error ("strdup failed.");
+ return (-1);
+ }
+ break;
+
case '?':
rrd_set_error("unknown option '-%c'", optopt);
return (-1);
case '?':
rrd_set_error("unknown option '-%c'", optopt);
return (-1);
@@
-151,10
+167,15
@@
int rrd_fetch(
return -1;
}
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];
cf = argv[optind + 1];
- if (rrd_fetch_r(argv[optind], cf, start, end, step, ds_cnt, ds_namv, data)
- != 0)
+ status = rrd_fetch_r(argv[optind], cf, start, end, step,
+ ds_cnt, ds_namv, data);
+ if (status != 0)
return (-1);
return (0);
}
return (-1);
return (0);
}
@@
-179,7
+200,7
@@
int rrd_fetch_r(
return (rrd_fetch_fn
(filename, cf_idx, start, end, step, ds_cnt, ds_namv, data));
return (rrd_fetch_fn
(filename, cf_idx, start, end, step, ds_cnt, ds_namv, data));
-}
+}
/* int rrd_fetch_r */
int rrd_fetch_fn(
const char *filename, /* name of the rrd */
int rrd_fetch_fn(
const char *filename, /* name of the rrd */
@@
-214,6
+235,16
@@
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)
goto err_free;
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
if (rrd_file == NULL)
goto err_free;
@@
-227,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;
}
@@
-327,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;
}
@@
-352,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 - *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;
@@
-433,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);