Ticket #222: omindex-noatime.patch

omindex.cc

@@ -132 +132 @@
 file_to_string(const string &file)
 {
     string out;
-    if (!load_file(file, out)) throw ReadError();
+    if (!load_file(file, out, NOCACHE|NOATIME)) throw ReadError();
     return out;
 }
 

md5wrap.cc

@@ -1 +1 @@
 /* md5wrap.cc: wrapper functions to allow easy use of MD5 from C++.
  *
- * Copyright (C) 2006 Olly Betts
+ * Copyright (C) 2006,2007 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42 +42 @@
 # endif
 #endif
 
+#ifndef O_NOATIME
+# define O_NOATIME 0
+#endif
+
 #include "md5.h"
 #include "md5wrap.h"
 
@@ -51 +55 @@
 md5_file(const string &file_name, string &md5)
 {
     mode_t mode = O_RDONLY;
-    mode |= O_STREAMING;
+    mode |= O_STREAMING|O_NOATIME;
 
     int fd = open(file_name.c_str(), mode);
+    if (fd < 0 && (mode & O_NOATIME)) {
+        mode &= ~O_NOATIME;
+        fd = open(file_name.c_str(), mode);
+    }
     if (fd < 0) return false;
 
 #ifdef HAVE_POSIX_FADVISE

scriptindex.cc

@@ -505 +505 @@
                         break;
                     case Action::LOAD: {
                         bool truncated = false;
-                        if (!load_file(value, i->get_num_arg(), true,
+                        if (!load_file(value, i->get_num_arg(), NOCACHE|NOATIME,
                                        value, truncated)) {
                             cerr << "Couldn't load file '" << value << "': "
                                  << strerror(errno) << endl;

loadfile.cc

@@ -1 +1 @@
 /* loadfile.cc: load a file into a std::string.
  *
- * Copyright (C) 2006 Olly Betts
+ * Copyright (C) 2006,2007 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26 +26 @@
 # endif
 #endif
 
+#include "loadfile.h"
+
 #include <algorithm>
 #include <string>
 
@@ -39 +41 @@
 # ifdef __linux__
 // This is the value used by rml's O_STREAMING patch for 2.4.
 #  define O_STREAMING   04000000
-# else
-// Define as 0 otherwise, so we don't need ifdefs in the code.
-#  define O_STREAMING   0
 # endif
 #endif
 
-#include "loadfile.h"
-
 using namespace std;
 
 bool
-load_file(const string &file_name, size_t max_to_read,
-          bool try_not_to_cache,
+load_file(const string &file_name, size_t max_to_read, int flags,
           string &output, bool &truncated)
 {
+    (void)flags; // Avoid possible "unused" warning.
     mode_t mode = O_RDONLY;
-    if (try_not_to_cache) mode |= O_STREAMING;
+#ifdef O_STREAMING
+    if (flags & NOCACHE) mode |= O_STREAMING;
+#endif
+#ifdef O_NOATIME
+    if (flags & NOATIME) mode |= O_NOATIME;
+#endif
 
     int fd = open(file_name.c_str(), mode);
+#ifdef O_NOATIME
+    if (fd < 0 && (mode & O_NOATIME)) {
+        mode &= ~O_NOATIME;
+        fd = open(file_name.c_str(), mode);
+    }
+#endif
     if (fd < 0) return false;
 
 #ifdef HAVE_POSIX_FADVISE
-    if (try_not_to_cache)
+    if (flags & NOCACHE)
         posix_fadvise(fd, 0, 0, POSIX_FADV_NOREUSE); // or POSIX_FADV_SEQUENTIAL
 #endif
 
@@ -97 +105 @@
     }
 
 #ifdef HAVE_POSIX_FADVISE
-    if (try_not_to_cache)
+    if (flags & NOCACHE)
         posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
 #endif
 

loadfile.h

@@ -1 +1 @@
 /* loadfile.h: load a file into a std::string.
  *
- * Copyright (C) 2006 Olly Betts
+ * Copyright (C) 2006,2007 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22 +22 @@
 
 #include <string>
 
-extern bool load_file(const std::string &file_name, size_t max_to_read,
-                      bool try_not_to_cache,
-                      std::string &output, bool &truncated);
+enum { NOCACHE = 0x1, NOATIME = 0x2 };
+
+bool load_file(const std::string &file_name, size_t max_to_read, int flags,
+               std::string &output, bool &truncated);
 
 inline bool
-load_file(const std::string &file_name, std::string &output,
-          bool try_not_to_cache = false)
+load_file(const std::string &file_name, std::string &output, int flags = 0)
 {
     bool dummy;
-    return load_file(file_name, 0, try_not_to_cache, output, dummy);
+    return load_file(file_name, 0, flags, output, dummy);
 }
 
 #endif // OMEGA_INCLUDED_LOADFILE_H