[pkg-boost-commits] r14382 - in boost/branches/1.37.0/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2009-03-14 21:24:35 +0000 (Sat, 14 Mar 2009)
New Revision: 14382

Added:
   boost/branches/1.37.0/debian/patches/fix_eventfd_select_interrupter.patch
Modified:
   boost/branches/1.37.0/debian/changelog
   boost/branches/1.37.0/debian/patches/series
Log:
Add fix_eventfd_select_interrupter.patch.

Modified: boost/branches/1.37.0/debian/changelog
===================================================================
--- boost/branches/1.37.0/debian/changelog	2009-02-22 07:28:02 UTC (rev 14381)
+++ boost/branches/1.37.0/debian/changelog	2009-03-14 21:24:35 UTC (rev 14382)
@@ -1,3 +1,10 @@
+boost1.37 (1.37.0-6) unstable; urgency=low
+
+  * patches/fix_eventfd_select_interrupter.patch: New.  Upstream patch
+    r50961.  Closes: #519669.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 14 Mar 2009 16:23:29 -0500
+
 boost1.37 (1.37.0-5) unstable; urgency=low
 
   * README.Debian: 

Added: boost/branches/1.37.0/debian/patches/fix_eventfd_select_interrupter.patch
===================================================================
--- boost/branches/1.37.0/debian/patches/fix_eventfd_select_interrupter.patch	                        (rev 0)
+++ boost/branches/1.37.0/debian/patches/fix_eventfd_select_interrupter.patch	2009-03-14 21:24:35 UTC (rev 14382)
@@ -0,0 +1,103 @@
+Use a pipe if eventfd is not supported at runtime.
+
+Reported upstream as https://svn.boost.org/trac/boost/ticket/2683
+Fixed upstream at https://svn.boost.org/trac/boost/changeset/50961
+
+--- boost_1_37_0.orig/boost/asio/detail/eventfd_select_interrupter.hpp
++++ boost_1_37_0/boost/asio/detail/eventfd_select_interrupter.hpp
+@@ -58,9 +58,9 @@
+   eventfd_select_interrupter()
+   {
+ #if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
+-    read_descriptor_ = syscall(__NR_eventfd, 0);
++    write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0);
+ #else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
+-    read_descriptor_ = ::eventfd(0, 0);
++    write_descriptor_ = read_descriptor_ = ::eventfd(0, 0);
+ #endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
+     if (read_descriptor_ != -1)
+     {
+@@ -68,16 +68,29 @@
+     }
+     else
+     {
+-      boost::system::error_code ec(errno,
+-          boost::asio::error::get_system_category());
+-      boost::system::system_error e(ec, "eventfd_select_interrupter");
+-      boost::throw_exception(e);
++      int pipe_fds[2];
++      if (pipe(pipe_fds) == 0)
++      {
++        read_descriptor_ = pipe_fds[0];
++        ::fcntl(read_descriptor_, F_SETFL, O_NONBLOCK);
++        write_descriptor_ = pipe_fds[1];
++        ::fcntl(write_descriptor_, F_SETFL, O_NONBLOCK);
++      }
++      else
++      {
++        boost::system::error_code ec(errno,
++            boost::asio::error::get_system_category());
++        boost::system::system_error e(ec, "eventfd_select_interrupter");
++        boost::throw_exception(e);
++      }
+     }
+   }
+ 
+   // Destructor.
+   ~eventfd_select_interrupter()
+   {
++    if (write_descriptor_ != -1 && write_descriptor_ != read_descriptor_)
++      ::close(write_descriptor_);
+     if (read_descriptor_ != -1)
+       ::close(read_descriptor_);
+   }
+@@ -86,17 +99,30 @@
+   void interrupt()
+   {
+     uint64_t counter(1UL);
+-    ::write(read_descriptor_, &counter, sizeof(uint64_t));
++    ::write(write_descriptor_, &counter, sizeof(uint64_t));
+   }
+ 
+   // Reset the select interrupt. Returns true if the call was interrupted.
+   bool reset()
+   {
+-    // Only perform one read. The kernel maintains an atomic counter.
+-    uint64_t counter(0);
+-    int bytes_read = ::read(read_descriptor_, &counter, sizeof(uint64_t));
+-    bool was_interrupted = (bytes_read > 0);
+-    return was_interrupted;
++    if (write_descriptor_ == read_descriptor_)
++    {
++      // Only perform one read. The kernel maintains an atomic counter.
++      uint64_t counter(0);
++      int bytes_read = ::read(read_descriptor_, &counter, sizeof(uint64_t));
++      bool was_interrupted = (bytes_read > 0);
++      return was_interrupted;
++    }
++    else
++    {
++      // Clear all data from the pipe.
++      char data[1024];
++      int bytes_read = ::read(read_descriptor_, data, sizeof(data));
++      bool was_interrupted = (bytes_read > 0);
++      while (bytes_read == sizeof(data))
++        bytes_read = ::read(read_descriptor_, data, sizeof(data));
++      return was_interrupted;
++    }
+   }
+ 
+   // Get the read descriptor to be passed to select.
+@@ -111,6 +137,12 @@
+   // 64bit value will be written on the other end of the connection and this
+   // descriptor will become readable.
+   int read_descriptor_;
++
++  // The write end of a connection used to interrupt the select call. A single
++  // 64bit non-zero value may be written to this to wake up the select which is
++  // waiting for the other end to become readable. This descriptor will only
++  // differ from the read descriptor when a pipe is used.
++  int write_descriptor_;
+ };
+ 
+ } // namespace detail

Modified: boost/branches/1.37.0/debian/patches/series
===================================================================
--- boost/branches/1.37.0/debian/patches/series	2009-02-22 07:28:02 UTC (rev 14381)
+++ boost/branches/1.37.0/debian/patches/series	2009-03-14 21:24:35 UTC (rev 14382)
@@ -17,3 +17,4 @@
 system-error-code.patch
 add-disable-long-double.patch
 mpi-python.patch
+fix_eventfd_select_interrupter.patch