Changeset 1130

Timestamp:

02/13/10 20:20:20 (3 years ago)

Author:

rakshasa

Message:

• Added support for Linux's fallocate and Darwin's fcntl(...,F_PREALLOCATE,...) to preallocate files by default. The 'system.file_allocate' setting will now only be used to indicate you want posix_fallocate called, which may block while it zeros out the file manually.

• Added 'event.download.hash_failed' and 'event.download.hash_final_failed'.

Location:

trunk

Files:

• libtorrent/configure.ac (modified) (1 diff)
• libtorrent/scripts/checks.m4 (modified) (1 diff)
• libtorrent/src/data/socket_file.cc (modified) (4 diffs)
• libtorrent/src/data/socket_file.h (modified) (1 diff)
• libtorrent/src/torrent/data/file.cc (modified) (1 diff)
• rtorrent/scripts/checks.m4 (modified) (4 diffs)
• rtorrent/src/command_network.cc (modified) (1 diff)
• rtorrent/src/core/download_list.cc (modified) (3 diffs)
• rtorrent/src/main.cc (modified) (4 diffs)

trunk/libtorrent/configure.ac

@@ -47 +47 @@
 TORRENT_WITH_KQUEUE
 TORRENT_WITHOUT_EPOLL
+TORRENT_CHECK_FALLOCATE
 TORRENT_WITH_POSIX_FALLOCATE
 TORRENT_WITH_ADDRESS_SPACE

trunk/libtorrent/scripts/checks.m4

@@ -158 +158 @@
 
 
+AC_DEFUN([TORRENT_CHECK_FALLOCATE], [
+  AC_MSG_CHECKING(for fallocate)
+
+  AC_COMPILE_IFELSE(
+    [[#include <fcntl.h>
+      int main() {
+        fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 0);
+        return 0;
+      }
+    ]],
+    [
+      AC_DEFINE(HAVE_FALLOCATE, 1, Linux's fallocate supported.)
+      AC_MSG_RESULT(yes)
+    ], [
+      AC_MSG_RESULT(no)
+    ])
+])
+
+
 AC_DEFUN([TORRENT_CHECK_POSIX_FALLOCATE], [
   AC_MSG_CHECKING(for posix_fallocate)

trunk/libtorrent/src/data/socket_file.cc

@@ -42 +42 @@
 #include <fcntl.h>
 #include <unistd.h>
+#include <rak/error_number.h>
 #include <rak/file_stat.h>
 #include <sys/ioctl.h>
@@ -90 +91 @@
 }
 
-// Reserve the space on disk if a system call is defined. 'length'
-// of zero indicates to the end of the file.
-#if !defined(USE_XFS) && !defined(USE_POSIX_FALLOCATE)
-#define RESERVE_PARAM __UNUSED
-#else
-#define RESERVE_PARAM
-#endif
-
-bool
-SocketFile::reserve(RESERVE_PARAM uint64_t offset, RESERVE_PARAM uint64_t length) {
-#ifdef USE_XFS
-  struct xfs_flock64 flock;
-
-  flock.l_whence = SEEK_SET;
-  flock.l_start = offset;
-  flock.l_len = length;
-
-  if (ioctl(m_fd, XFS_IOC_RESVSP64, &flock) >= 0)
-    return true;
-#endif
-
-#ifdef USE_POSIX_FALLOCATE
-  return !posix_fallocate(m_fd, offset, length);
-#else
-  return true;
-#endif
-}
-
-#undef RESERVE_PARAM
-
 uint64_t
 SocketFile::size() const {
@@ -131 +102 @@
 
 bool
-SocketFile::set_size(uint64_t size) const {
+SocketFile::set_size(uint64_t size, int flags) const {
   if (!is_open())
     throw internal_error("SocketFile::set_size() called on a closed file");
 
+#ifdef HAVE_FALLOCATE
+  if (flags & flag_fallocate && fallocate(m_fd, 0, 0, size) == 0)
+    return true;
+#endif
+
+#ifdef USE_POSIX_FALLOCATE
+  if (flags & flag_fallocate &&
+      flags & flag_fallocate_blocking &&
+      posix_fallocate(m_fd, 0, size) == 0)
+    return true;
+#endif
+
+#ifdef SYS_DARWIN
+  if (flags & flag_fallocate) {
+    fstore_t fstore;
+    fstore.fst_flags = F_ALLOCATECONTIG;
+    fstore.fst_posmode = F_PEOFPOSMODE;
+    fstore.fst_offset = 0;
+    fstore.fst_length = size;
+    fstore.fst_bytesalloc = 0;
+
+    // Hmm... this shouldn't really be something we fail the set_size
+    // on...
+    //
+    // Yet is somehow fails with ENOSPC...
+    if (fcntl(m_fd, F_PREALLOCATE, &fstore) == -1)
+      throw internal_error("hack: fcntl failed" + std::string(strerror(errno)));
+
+    //    fcntl(m_fd, F_PREALLOCATE, &fstore); // Ignore result for now...
+  }
+#endif
+
   if (ftruncate(m_fd, size) == 0)
     return true;
-
+  
   // Use workaround to resize files on vfat. It causes the whole
   // client to block while it is resizing the files, this really
@@ -145 +148 @@
       write(m_fd, &size, 1) == 1)
     return true;
-  
+
   return false;
 }

trunk/libtorrent/src/data/socket_file.h

@@ -59 +59 @@
   static const int o_nonblock             = O_NONBLOCK;
 
+  static const int flag_fallocate          = (1 << 0);
+  static const int flag_fallocate_blocking = (1 << 1);
+
   SocketFile() : m_fd(invalid_fd) {}
   SocketFile(fd_type fd) : m_fd(fd) {}
 
+  bool                is_open() const                                   { return m_fd != invalid_fd; }
+
   bool                open(const std::string& path, int prot, int flags, mode_t mode = 0666);
-
   void                close();
   
-  // Reserve the space on disk if a system call is defined. 'length'
-  // of zero indicates to the end of the file. (ERRR... nope, set
-  // length properly...)
-  bool                reserve(uint64_t offset = 0, uint64_t length = 0);
-
-  bool                is_open() const                                   { return m_fd != invalid_fd; }
-
   uint64_t            size() const;
-  bool                set_size(uint64_t s) const;
+  bool                set_size(uint64_t s, int flags = 0) const;
 
   MemoryChunk         create_chunk(uint64_t offset, uint32_t length, int prot, int flags) const;

trunk/libtorrent/src/torrent/data/file.cc

@@ -169 +169 @@
     return true;
 
-  if (!SocketFile(m_fd).set_size(m_size))
-    return false;
+  // For now make it so that the fallocate flag indicates if we want
+  // to do potentially blocking allocation, while FS supported
+  // non-blocking allocation is done always.
+  int flags = SocketFile::flag_fallocate;
 
   if (m_flags & flag_fallocate)
-    SocketFile(m_fd).reserve(0, m_size);
+    flags |= SocketFile::flag_fallocate_blocking;
 
-  return true;
+  return SocketFile(m_fd).set_size(m_size, flags);
 }
 

trunk/rtorrent/scripts/checks.m4

@@ -62 +62 @@
 ])
 
-
 AC_DEFUN([TORRENT_WITHOUT_EPOLL], [
   AC_ARG_WITH(epoll,
@@ -76 +75 @@
 
 
+AC_DEFUN([TORRENT_CHECK_KQUEUE], [
+  AC_MSG_CHECKING(for kqueue support)
+
+  AC_LINK_IFELSE(
+    [[#include <sys/time.h>  /* Because OpenBSD's sys/event.h fails to compile otherwise. Yeah... */
+      #include <sys/event.h>
+      int main() {
+        int fd = kqueue();
+        return 0;
+      }
+    ]],
+    [
+      AC_DEFINE(USE_KQUEUE, 1, Use kqueue.)
+      AC_MSG_RESULT(yes)
+    ], [
+      AC_MSG_RESULT(no)
+    ])
+])
+
+AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
+  AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
+
+  AC_RUN_IFELSE(
+    [[#include <fcntl.h>
+      #include <stdlib.h>
+      #include <unistd.h>
+      #include <sys/event.h>
+      #include <sys/time.h>
+      int main() {
+        struct kevent ev[2], ev_out[2];
+        struct timespec ts = { 0, 0 };
+        int pfd[2], pty[2], kfd, n;
+        char buffer[9001];
+        if (pipe(pfd) == -1) return 1;
+        if (fcntl(pfd[1], F_SETFL, O_NONBLOCK) == -1) return 2;
+        while ((n = write(pfd[1], buffer, sizeof(buffer))) == sizeof(buffer));
+        if ((pty[0]=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3;
+        if ((pty[1]=grantpt(pty[0])) == -1) return 4;
+        EV_SET(ev+0, pfd[1], EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL);
+        EV_SET(ev+1, pty[1], EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL);
+        if ((kfd = kqueue()) == -1) return 5;
+        if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6;
+        if (ev_out[0].flags & EV_ERROR) return 7;
+        if (ev_out[1].flags & EV_ERROR) return 8;
+        read(pfd[0], buffer, sizeof(buffer));
+        if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9;
+        return 0;
+      }
+    ]],
+    [
+      AC_MSG_RESULT(yes)
+    ], [
+      AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.)
+      AC_MSG_RESULT(no)
+    ])
+])
+
 AC_DEFUN([TORRENT_WITH_KQUEUE], [
   AC_ARG_WITH(kqueue,
@@ -81 +137 @@
     [
         if test "$withval" = "yes"; then
-            AC_DEFINE(USE_KQUEUE, 1, Enable kqueue.)
+          TORRENT_CHECK_KQUEUE
+          TORRENT_CHECK_KQUEUE_SOCKET_ONLY
         fi
     ])
@@ -97 +154 @@
     ], [
       AC_DEFINE(USE_VARIABLE_FDSET, 1, defined when we allow the use of fd_set's of any size)
+    ])
+])
+
+
+AC_DEFUN([TORRENT_CHECK_FALLOCATE], [
+  AC_MSG_CHECKING(for fallocate)
+
+  AC_COMPILE_IFELSE(
+    [[#include <fcntl.h>
+      int main() {
+        fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 0);
+        return 0;
+      }
+    ]],
+    [
+      AC_DEFINE(HAVE_FALLOCATE, 1, Linux's fallocate supported.)
+      AC_MSG_RESULT(yes)
+    ], [
+      AC_MSG_RESULT(no)
     ])
 ])

trunk/rtorrent/src/command_network.cc

@@ -494 +494 @@
   // Not really network stuff:
   ADD_VARIABLE_BOOL  ("handshake_log", false);
-  ADD_VARIABLE_STRING("log.tracker", "");
-}
+  rpc::commands.call("system.method.insert", rpc::create_object_list("log.tracker", "string|const", ""));
+}

trunk/rtorrent/src/core/download_list.cc

@@ -439 +439 @@
     download->set_hash_failed(true);
     
-    rpc::commands.call_catch("event.download.hash_done", rpc::make_target(download), torrent::Object(), "Download event action failed: ");
+    rpc::commands.call_catch("event.download.hash_failed", rpc::make_target(download), torrent::Object(), "Download event action failed: ");
     return;
   }
@@ -485 +485 @@
       download->set_message("Hash check on download completion found bad chunks, consider using \"safe_sync\".");
       control->core()->push_log("Hash check on download completion found bad chunks, consider using \"safe_sync\".");
+      rpc::commands.call_catch("event.download.hash_final_failed", rpc::make_target(download), torrent::Object(), "Download event action failed: ");
     }
     
@@ -506 +507 @@
     throw torrent::internal_error("DownloadList::hash_queue(...) hashing already queued.");
 
-//   close_throw(download);
   // HACK
   if (download->is_open()) {

trunk/rtorrent/src/main.cc

@@ -208 +208 @@
        "system.method.insert = event.download.finished,multi\n"
        "system.method.insert = event.download.hash_done,multi\n"
+       "system.method.insert = event.download.hash_failed,multi\n"
+       "system.method.insert = event.download.hash_final_failed,multi\n"
        "system.method.insert = event.download.hash_removed,multi\n"
        "system.method.insert = event.download.hash_queued,multi\n"
@@ -265 +267 @@
        "view_add = complete\n"
        "view_filter = complete,d.get_complete=\n"
-       "view_filter_on    = complete,event.download.hash_done,event.download.finished\n"
+       "view_filter_on    = complete,event.download.hash_done,event.download.hash_failed,event.download.hash_final_failed,event.download.finished\n"
        "view_sort_new     = complete,less=d.get_state_changed=\n"
        "view_sort_current = complete,less=d.get_state_changed=\n"
@@ -271 +273 @@
        "view_add = incomplete\n"
        "view_filter = incomplete,not=$d.get_complete=\n"
-       "view_filter_on    = incomplete,event.download.hash_done,event.download.finished\n"
+       "view_filter_on    = incomplete,event.download.hash_done,event.download.hash_failed,"
+       "event.download.hash_final_failed,event.download.finished\n"
        "view_sort_new     = incomplete,less=d.get_state_changed=\n"
        "view_sort_current = incomplete,less=d.get_state_changed=\n"
@@ -278 +281 @@
        "view_add = hashing\n"
        "view_filter = hashing,d.get_hashing=\n"
-       "view_filter_on = hashing,event.download.hash_queued,event.download.hash_removed,event.download.hash_done\n"
+       "view_filter_on = hashing,event.download.hash_queued,event.download.hash_removed,"
+       "event.download.hash_done,event.download.hash_failed,event.download.hash_final_failed\n"
 //        "view_sort_new     = hashing,less=d.get_state_changed=\n"
 //        "view_sort_current = hashing,less=d.get_state_changed=\n"