X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=917e982703cf0966bfd860d1771fba66b01ae8a9;hb=6bed7fb478dc5f4004c869630ba0ce8d8abfec98;hp=618f3d3036a4561eda0c833ac3cbee89c02b5f3e;hpb=7f30ee2ae089520606cbb7e38fab9981618771f5;p=rrdtool.git

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 618f3d3..917e982 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.3rc4  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_fetch.c  read date from an rrd to use for further processing
  *****************************************************************************
@@ -69,14 +69,18 @@ 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;
     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 */
@@ -86,12 +90,6 @@ int rrd_fetch(
     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;
 
@@ -262,7 +260,7 @@ 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;
@@ -279,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 &&
@@ -422,18 +418,6 @@ int rrd_fetch_fn(
                 rrd_set_error("fetching cdp from rra");
                 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_file->header_len, 0,
-                              POSIX_FADV_DONTNEED)) {
-                rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",
-                              filename, rrd_strerror(errno));
-                goto err_close;/*XXX: should use err_free_all_ds_namv */
-            }
-#endif
-
 #ifdef DEBUG
             fprintf(stderr, "post fetch %li -- ", i);
             for (ii = 0; ii < *ds_cnt; ii++)
@@ -447,29 +431,20 @@ int rrd_fetch_fn(
 #endif
 
     }
-#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_file->header_len, 0,
-                      POSIX_FADV_DONTNEED)) {
-        rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s", filename,
-                      rrd_strerror(errno));
-        goto err_free; /*XXX: should use err_free_all_ds_namv */
-    }
-#endif
+
     rrd_close(rrd_file);
     return (0);
-err_free_data:
+  err_free_data:
     free(*data);
     *data = NULL;
-err_free_all_ds_namv:
-    for (i = 0; (unsigned long)i < rrd.stat_head->ds_cnt; ++i)
+  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:
+  err_free_ds_namv:
     free(*ds_namv);
-err_close:
+  err_close:
     rrd_close(rrd_file);
-err_free:
+  err_free:
     rrd_free(&rrd);
     return (-1);
 }