don't bother with don't need when there is neither madvise not fadvise calls

[rrdtool.git] / src / rrd_open.c

diff --git a/src/rrd_open.c b/src/rrd_open.c
index e1685d2..e92ae5d 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -34,10 +34,11 @@
 #endif
 
 /* get the address of the start of this page */
+#if defined USE_MADVISE || defined HAVE_POSIX_FADVISE 
 #ifndef PAGE_START
 #define PAGE_START(addr) ((addr)&(~(_page_size-1)))
 #endif
-
+#endif
 
 /* Open a database file, return its header and an open filehandle,
  * positioned to the first cdp in the first rra.
@@ -226,13 +227,13 @@ rrd_file_t *rrd_open(
             rrd_set_error("live_head_t malloc");
             goto out_close;
         }
-
 #if defined USE_MADVISE
         /* the live_head will be needed soonish, so hint accordingly */
-        madvise(data + PAGE_START(offset),
-                sizeof(time_t), MADV_WILLNEED);
-#endif        
-        __rrd_read(rrd->legacy_last_up,time_t,1);
+        madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED);
+#endif
+        __rrd_read(rrd->legacy_last_up, time_t,
+                   1);
+
         rrd->live_head->last_up = *rrd->legacy_last_up;
         rrd->live_head->last_up_usec = 0;
     } else {
@@ -316,6 +317,7 @@ void rrd_dontneed(
     rrd_file_t *rrd_file,
     rrd_t *rrd)
 {
+#if defined USE_MADVISE || defined HAVE_POSIX_FADVISE
     unsigned long dontneed_start;
     unsigned long rra_start;
     unsigned long active_block;
@@ -369,8 +371,13 @@ void rrd_dontneed(
 #if defined DEBUG && DEBUG > 1
     mincore_print(rrd_file, "after");
 #endif
+#endif /* without madvise and posix_fadvise ist does not make much sense todo anything */
 }
 
+
+
+
+
 int rrd_close(
     rrd_file_t *rrd_file)
 {
@@ -528,8 +535,8 @@ void rrd_init(
 void rrd_free(
     rrd_t *rrd)
 {
-    if (rrd->legacy_last_up){ /* this gets set for version < 3 only */
-        free(rrd->live_head);  
+    if (rrd->legacy_last_up) {  /* this gets set for version < 3 only */
+        free(rrd->live_head);
     }
 }
 #else