X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=4ea2eb1debcdd11f4ba8fdb712ef2c79c31b22cb;hb=5c3b824e73337ebc150268f929246991b68d44f3;hp=a995fec28b9575e6a55561c9133c173710abdd0b;hpb=657d850f957a2dd703e3aab2d7cde4b0f9711c15;p=rrdtool.git diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c index a995fec..4ea2eb1 100644 --- a/src/rrd_fetch.c +++ b/src/rrd_fetch.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_fetch.c read date from an rrd to use for further processing ***************************************************************************** @@ -69,29 +69,27 @@ int rrd_fetch( char ***ds_namv, /* names of data sources */ rrd_value_t **data) { /* two dimensional array containing the data */ - - long step_tmp = 1; time_t start_tmp = 0, end_tmp = 0; const char *cf; - struct rrd_time_value start_tv, end_tv; + rrd_time_value_t start_tv, end_tv; char *parsetime_error = NULL; + struct option long_options[] = { + {"resolution", required_argument, 0, 'r'}, + {"start", required_argument, 0, 's'}, + {"end", required_argument, 0, 'e'}, + {0, 0, 0, 0} + }; optind = 0; opterr = 0; /* initialize getopt */ /* init start and end time */ - parsetime("end-24h", &start_tv); - parsetime("now", &end_tv); + rrd_parsetime("end-24h", &start_tv); + rrd_parsetime("now", &end_tv); while (1) { - static struct option long_options[] = { - {"resolution", required_argument, 0, 'r'}, - {"start", required_argument, 0, 's'}, - {"end", required_argument, 0, 'e'}, - {0, 0, 0, 0} - }; int option_index = 0; int opt; @@ -102,13 +100,13 @@ int rrd_fetch( switch (opt) { case 's': - if ((parsetime_error = parsetime(optarg, &start_tv))) { + if ((parsetime_error = rrd_parsetime(optarg, &start_tv))) { rrd_set_error("start time: %s", parsetime_error); return -1; } break; case 'e': - if ((parsetime_error = parsetime(optarg, &end_tv))) { + if ((parsetime_error = rrd_parsetime(optarg, &end_tv))) { rrd_set_error("end time: %s", parsetime_error); return -1; } @@ -123,7 +121,7 @@ int rrd_fetch( } - if (proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) { + if (rrd_proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) { return -1; } @@ -156,7 +154,7 @@ int rrd_fetch( cf = argv[optind + 1]; if (rrd_fetch_r(argv[optind], cf, start, end, step, ds_cnt, ds_namv, data) - == -1) + != 0) return (-1); return (0); } @@ -210,10 +208,6 @@ int rrd_fetch_fn( rrd_value_t *data_ptr; unsigned long rows; -#ifdef HAVE_POSIX_FADVISE - long rrd_head_size; -#endif - #ifdef DEBUG fprintf(stderr, "Entered rrd_fetch_fn() searching for the best match\n"); fprintf(stderr, "Looking for: start %10lu end %10lu step %5lu\n", @@ -222,28 +216,20 @@ int rrd_fetch_fn( rrd_file = rrd_open(filename, &rrd, RRD_READONLY); if (rrd_file == NULL) - return (-1); + goto err_free; -#ifdef HAVE_POSIX_FADVISE - rrd_head_size = rrd_file->header_len; -#endif /* when was the really last update of this file ? */ if (((*ds_namv) = (char **) malloc(rrd.stat_head->ds_cnt * sizeof(char *))) == NULL) { rrd_set_error("malloc fetch ds_namv array"); - rrd_free(&rrd); - close(rrd_file->fd); - return (-1); + goto err_close; } for (i = 0; (unsigned long) i < rrd.stat_head->ds_cnt; i++) { if ((((*ds_namv)[i]) = malloc(sizeof(char) * DS_NAM_SIZE)) == NULL) { rrd_set_error("malloc fetch ds_namv entry"); - rrd_free(&rrd); - free(*ds_namv); - close(rrd_file->fd); - return (-1); + goto err_free_ds_namv; } strncpy((*ds_namv)[i], rrd.ds_def[i].ds_nam, DS_NAM_SIZE - 1); (*ds_namv)[i][DS_NAM_SIZE - 1] = '\0'; @@ -274,16 +260,14 @@ int rrd_fetch_fn( tmp_step_diff = labs(*step - (rrd.stat_head->pdp_step * rrd.rra_def[i].pdp_cnt)); /* best full match */ - if (cal_end >= *end && cal_start <= *start) { + if (cal_start <= *start) { if (first_full || (tmp_step_diff < best_full_step_diff)) { first_full = 0; best_full_step_diff = tmp_step_diff; best_full_rra = i; #ifdef DEBUG fprintf(stderr, "best full match so far\n"); -#endif } else { -#ifdef DEBUG fprintf(stderr, "full match, not best\n"); #endif } @@ -293,8 +277,6 @@ int rrd_fetch_fn( tmp_match = full_match; if (cal_start > *start) tmp_match -= (cal_start - *start); - if (cal_end < *end) - tmp_match -= (*end - cal_end); if (first_part || (best_match < tmp_match) || (best_match == tmp_match && @@ -323,9 +305,7 @@ int rrd_fetch_fn( else { rrd_set_error ("the RRD does not contain an RRA matching the chosen CF"); - rrd_free(&rrd); - close(rrd_file->fd); - return (-1); + goto err_free_all_ds_namv; } /* set the wish parameters to their real values */ @@ -349,12 +329,7 @@ int rrd_fetch_fn( *ds_cnt = rrd.stat_head->ds_cnt; if (((*data) = malloc(*ds_cnt * rows * sizeof(rrd_value_t))) == NULL) { rrd_set_error("malloc fetch data area"); - for (i = 0; (unsigned long) i < *ds_cnt; i++) - free((*ds_namv)[i]); - free(*ds_namv); - rrd_free(&rrd); - close(rrd_file->fd); - return (-1); + goto err_free_all_ds_namv; } data_ptr = (*data); @@ -385,20 +360,11 @@ int rrd_fetch_fn( else rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1 + start_offset; - if (rrd_seek(rrd_file, (rra_base - + (rra_pointer - * *ds_cnt - * sizeof(rrd_value_t))), SEEK_SET) != 0) { + 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"); - for (i = 0; (unsigned) i < *ds_cnt; i++) - free((*ds_namv)[i]); - free(*ds_namv); - rrd_free(&rrd); - free(*data); - *data = NULL; - close(rrd_file->fd); - return (-1); - + goto err_free_data; } #ifdef DEBUG fprintf(stderr, "First Seek: rra_base %lu rra_pointer %lu\n", @@ -423,7 +389,7 @@ int rrd_fetch_fn( /* past the valid data area */ else if (i >= (signed) rrd.rra_def[chosen_rra].row_cnt) { #ifdef DEBUG - fprintf(stderr, "post fetch %li -- ", i); + fprintf(stderr, "past fetch %li -- ", i); #endif for (ii = 0; (unsigned) ii < *ds_cnt; ii++) { *(data_ptr++) = DNAN; @@ -436,19 +402,11 @@ int rrd_fetch_fn( * be wrapped*/ if (rra_pointer >= (signed) rrd.rra_def[chosen_rra].row_cnt) { rra_pointer -= rrd.rra_def[chosen_rra].row_cnt; - if (rrd_seek(rrd_file, (rra_base + rra_pointer - * *ds_cnt + if (rrd_seek(rrd_file, (rra_base + rra_pointer * (*ds_cnt) * sizeof(rrd_value_t)), SEEK_SET) != 0) { rrd_set_error("wrap seek in RRA did fail"); - for (ii = 0; (unsigned) ii < *ds_cnt; ii++) - free((*ds_namv)[ii]); - free(*ds_namv); - rrd_free(&rrd); - free(*data); - *data = NULL; - close(rrd_file->fd); - return (-1); + goto err_free_data; } #ifdef DEBUG fprintf(stderr, "wrap seek ...\n"); @@ -456,31 +414,10 @@ int rrd_fetch_fn( } if (rrd_read(rrd_file, data_ptr, sizeof(rrd_value_t) * (*ds_cnt)) - != (ssize_t) (sizeof(rrd_value_t) * (*ds_cnt) * - rrd.stat_head->ds_cnt)) { + != (ssize_t) (sizeof(rrd_value_t) * (*ds_cnt))) { rrd_set_error("fetching cdp from rra"); - for (ii = 0; (unsigned) ii < *ds_cnt; ii++) - free((*ds_namv)[ii]); - free(*ds_namv); - rrd_free(&rrd); - free(*data); - *data = NULL; - close(rrd_file->fd); - return (-1); + goto err_free_data; } -#ifdef HAVE_POSIX_FADVISE - /* don't pollute the buffer cache with data read from the file. We do this while reading to - keep damage minimal */ - if (0 != - posix_fadvise(rrd_file->fd, rrd_head_size, 0, - POSIX_FADV_DONTNEED)) { - rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s", - filename, rrd_strerror(errno)); - close(rrd_file->fd); - return (-1); - } -#endif - #ifdef DEBUG fprintf(stderr, "post fetch %li -- ", i); for (ii = 0; ii < *ds_cnt; ii++) @@ -494,17 +431,20 @@ int rrd_fetch_fn( #endif } - rrd_free(&rrd); -#ifdef HAVE_POSIX_FADVISE - /* and just to be sure we drop everything except the header at the end */ - if (0 != - posix_fadvise(rrd_file->fd, rrd_head_size, 0, POSIX_FADV_DONTNEED)) { - rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s", filename, - rrd_strerror(errno)); - close(rrd_file->fd); - return (-1); - } -#endif - close(rrd_file->fd); + + rrd_close(rrd_file); return (0); + err_free_data: + free(*data); + *data = NULL; + err_free_all_ds_namv: + for (i = 0; (unsigned long) i < rrd.stat_head->ds_cnt; ++i) + free((*ds_namv)[i]); + err_free_ds_namv: + free(*ds_namv); + err_close: + rrd_close(rrd_file); + err_free: + rrd_free(&rrd); + return (-1); }