diff --git a/scripts/checks.m4 b/scripts/checks.m4 index a09b4a94..48646f90 100644 --- a/scripts/checks.m4 +++ b/scripts/checks.m4 @@ -139,6 +139,17 @@ AC_DEFUN([TORRENT_WITHOUT_EPOLL], [ ]) +AC_DEFUN([TORRENT_WITH_KQUEUE], [ + AC_ARG_WITH(kqueue, + [ --with-kqueue enable kqueue. [[default=no]]], + [ + if test "$withval" = "yes"; then + AC_DEFINE(USE_KQUEUE, 1, Enable kqueue.) + fi + ]) +]) + + AC_DEFUN([TORRENT_WITHOUT_VARIABLE_FDSET], [ AC_ARG_WITH(variable-fdset, diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 7eedc08b..a1a48d43 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -24,6 +24,8 @@ libsub_core_a_SOURCES = \ poll_manager.h \ poll_manager_epoll.cc \ poll_manager_epoll.h \ + poll_manager_kqueue.cc \ + poll_manager_kqueue.h \ poll_manager_select.cc \ poll_manager_select.h \ scheduler.cc \ diff --git a/src/core/manager.cc b/src/core/manager.cc index f58f2c79..f627eb27 100644 --- a/src/core/manager.cc +++ b/src/core/manager.cc @@ -65,6 +65,7 @@ #include "http_queue.h" #include "manager.h" #include "poll_manager_epoll.h" +#include "poll_manager_kqueue.h" #include "poll_manager_select.h" #include "view.h" @@ -153,8 +154,13 @@ void Manager::initialize_first() { if ((m_pollManager = PollManagerEPoll::create(sysconf(_SC_OPEN_MAX))) != NULL) m_logImportant.push_front("Using 'epoll' based polling."); + + else if ((m_pollManager = PollManagerKQueue::create(sysconf(_SC_OPEN_MAX))) != NULL) + m_logImportant.push_front("Using 'kqueue' based polling."); + else if ((m_pollManager = PollManagerSelect::create(sysconf(_SC_OPEN_MAX))) != NULL) m_logImportant.push_front("Using 'select' based polling."); + else throw std::runtime_error("Could not create any PollManager."); diff --git a/src/core/poll_manager_kqueue.cc b/src/core/poll_manager_kqueue.cc new file mode 100644 index 00000000..2baa2c07 --- /dev/null +++ b/src/core/poll_manager_kqueue.cc @@ -0,0 +1,116 @@ +// rTorrent - BitTorrent client +// Copyright (C) 2005-2006, Jari Sundell +// +// 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 +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// In addition, as a special exception, the copyright holders give +// permission to link the code of portions of this program with the +// OpenSSL library under certain conditions as described in each +// individual source file, and distribute linked combinations +// including the two. +// +// You must obey the GNU General Public License in all respects for +// all of the code used other than OpenSSL. If you modify file(s) +// with this exception, you may extend this exception to your version +// of the file(s), but you are not obligated to do so. If you do not +// wish to do so, delete this exception statement from your version. +// If you delete this exception statement from all source files in the +// program, then also delete it here. +// +// Contact: Jari Sundell +// +// Skomakerveien 33 +// 3185 Skoppum, NORWAY + +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include + +#include "poll_manager_kqueue.h" + +namespace core { + +PollManagerKQueue* +PollManagerKQueue::create(int maxOpenSockets) { + torrent::PollKQueue* p = torrent::PollKQueue::create(maxOpenSockets); + + if (p == NULL) + return NULL; + else + return new PollManagerKQueue(p); +} + +PollManagerKQueue::~PollManagerKQueue() { +} + +void +PollManagerKQueue::poll(rak::timer timeout) { + // Add 1ms to ensure we don't idle loop due to the lack of + // resolution. + torrent::perform(); + timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000; + + if (m_httpStack.is_busy()) { + // When we're using libcurl we need to use select, but as this is + // inefficient we try avoiding it whenever possible. +#if defined USE_VARIABLE_FDSET + std::memset(m_readSet, 0, m_setSize); + std::memset(m_writeSet, 0, m_setSize); + std::memset(m_errorSet, 0, m_setSize); +#else + FD_ZERO(m_readSet); + FD_ZERO(m_writeSet); + FD_ZERO(m_errorSet); +#endif + FD_SET(static_cast(m_poll)->file_descriptor(), m_readSet); + + unsigned int maxFd = std::max((unsigned int)static_cast(m_poll)->file_descriptor(), + m_httpStack.fdset(m_readSet, m_writeSet, m_errorSet)); + + timeval t = timeout.tval(); + + if (select(maxFd + 1, m_readSet, m_writeSet, m_errorSet, &t) == -1) + return check_error(); + + m_httpStack.perform(); + + if (!FD_ISSET(static_cast(m_poll)->file_descriptor(), m_readSet)) { + // Need to call perform here so that scheduled task get done + // even if there's no socket events outside of the http stuff. + torrent::perform(); + return; + } + + // Clear the timeout since we've already used it in the select call. + timeout = rak::timer(); + } + + // Yes, below is how much code really *should* have been in this + // function. ;) + + if (static_cast(m_poll)->poll((timeout.usec() + 999) / 1000) == -1) + return check_error(); + + torrent::perform(); + static_cast(m_poll)->perform(); +} + +} diff --git a/src/core/poll_manager_kqueue.h b/src/core/poll_manager_kqueue.h new file mode 100644 index 00000000..14cdaa06 --- /dev/null +++ b/src/core/poll_manager_kqueue.h @@ -0,0 +1,63 @@ +// rTorrent - BitTorrent client +// Copyright (C) 2005-2006, Jari Sundell +// +// 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 +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// In addition, as a special exception, the copyright holders give +// permission to link the code of portions of this program with the +// OpenSSL library under certain conditions as described in each +// individual source file, and distribute linked combinations +// including the two. +// +// You must obey the GNU General Public License in all respects for +// all of the code used other than OpenSSL. If you modify file(s) +// with this exception, you may extend this exception to your version +// of the file(s), but you are not obligated to do so. If you do not +// wish to do so, delete this exception statement from your version. +// If you delete this exception statement from all source files in the +// program, then also delete it here. +// +// Contact: Jari Sundell +// +// Skomakerveien 33 +// 3185 Skoppum, NORWAY + +#ifndef RTORRENT_CORE_POLL_MANAGER_KQUEUE_H +#define RTORRENT_CORE_POLL_MANAGER_KQUEUE_H + +#include "poll_manager.h" + +namespace torrent { + class PollKQueue; +} + +namespace core { + +class PollManagerKQueue : public PollManager { +public: + static PollManagerKQueue* create(int maxOpenSockets); + ~PollManagerKQueue(); + + torrent::Poll* get_torrent_poll(); + + void poll(rak::timer timeout); + +private: + PollManagerKQueue(torrent::Poll* p) : PollManager(p) {} +}; + +} + +#endif