2006-02-17 13:35:04 +00:00
|
|
|
/* <!-- copyright */
|
|
|
|
/*
|
2006-09-21 15:31:24 +00:00
|
|
|
* aria2 - The high speed download utility
|
2006-02-17 13:35:04 +00:00
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Tatsuhiro Tsujikawa
|
|
|
|
*
|
|
|
|
* 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
|
2006-09-21 15:31:24 +00:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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.
|
2006-02-17 13:35:04 +00:00
|
|
|
*/
|
|
|
|
/* copyright --> */
|
|
|
|
#include "DownloadEngine.h"
|
2008-05-08 11:18:36 +00:00
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
|
|
|
#include "AsyncNameResolver.h"
|
|
|
|
#endif // ENABLE_ASYNC_DNS
|
2007-10-11 16:58:24 +00:00
|
|
|
#include "StatCalc.h"
|
|
|
|
#include "RequestGroup.h"
|
|
|
|
#include "RequestGroupMan.h"
|
|
|
|
#include "FileAllocationMan.h"
|
|
|
|
#include "CheckIntegrityMan.h"
|
2008-02-08 15:53:45 +00:00
|
|
|
#include "DownloadResult.h"
|
|
|
|
#include "StatCalc.h"
|
2006-04-17 16:17:20 +00:00
|
|
|
#include "LogFactory.h"
|
2008-02-08 15:53:45 +00:00
|
|
|
#include "Logger.h"
|
2006-08-07 16:28:41 +00:00
|
|
|
#include "TimeA2.h"
|
2008-02-08 15:53:45 +00:00
|
|
|
#include "a2time.h"
|
|
|
|
#include "Socket.h"
|
2008-04-22 08:52:47 +00:00
|
|
|
#include "Util.h"
|
2008-05-11 09:36:39 +00:00
|
|
|
#include "a2functional.h"
|
2008-05-31 10:31:07 +00:00
|
|
|
#include "DlAbortEx.h"
|
2008-08-04 17:06:47 +00:00
|
|
|
#include "ServerStatMan.h"
|
2008-09-01 13:46:03 +00:00
|
|
|
#include "CookieStorage.h"
|
2007-10-11 16:58:24 +00:00
|
|
|
#include <signal.h>
|
2008-02-08 15:53:45 +00:00
|
|
|
#include <cstring>
|
|
|
|
#include <algorithm>
|
2008-05-31 10:31:07 +00:00
|
|
|
#include <numeric>
|
|
|
|
#include <cerrno>
|
2008-02-08 15:53:45 +00:00
|
|
|
|
|
|
|
namespace aria2 {
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2007-12-07 13:33:59 +00:00
|
|
|
// 0 ... running
|
|
|
|
// 1 ... stop signal detected
|
|
|
|
// 2 ... stop signal processed by DownloadEngine
|
|
|
|
// 3 ... 2nd stop signal(force shutdown) detected
|
|
|
|
// 4 ... 2nd stop signal processed by DownloadEngine
|
|
|
|
volatile sig_atomic_t globalHaltRequested = 0;
|
2007-10-11 16:58:24 +00:00
|
|
|
|
|
|
|
|
2008-05-31 10:31:07 +00:00
|
|
|
CommandEvent::CommandEvent(Command* command, int events):
|
|
|
|
_command(command), _events(events) {}
|
|
|
|
|
|
|
|
bool CommandEvent::operator==(const CommandEvent& commandEvent) const
|
|
|
|
{
|
|
|
|
return _command == commandEvent._command;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CommandEvent::getEvents() const
|
|
|
|
{
|
|
|
|
return _events;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CommandEvent::addEvents(int events)
|
|
|
|
{
|
|
|
|
_events |= events;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CommandEvent::removeEvents(int events)
|
|
|
|
{
|
|
|
|
_events &= (~events);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CommandEvent::eventsEmpty() const
|
|
|
|
{
|
|
|
|
return _events == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CommandEvent::processEvents(int events)
|
|
|
|
{
|
|
|
|
if((_events&events) ||
|
|
|
|
((SocketEntry::EVENT_ERROR|SocketEntry::EVENT_HUP)&events)) {
|
|
|
|
_command->setStatusActive();
|
|
|
|
}
|
|
|
|
if(SocketEntry::EVENT_READ&events) {
|
|
|
|
_command->readEventReceived();
|
|
|
|
}
|
|
|
|
if(SocketEntry::EVENT_WRITE&events) {
|
|
|
|
_command->writeEventReceived();
|
|
|
|
}
|
|
|
|
if((SocketEntry::EVENT_ERROR|SocketEntry::EVENT_HUP)&events) {
|
|
|
|
_command->errorEventRecieved();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
ADNSEvent::ADNSEvent(const SharedHandle<AsyncNameResolver>& resolver,
|
|
|
|
Command* command,
|
2008-06-16 14:01:45 +00:00
|
|
|
sock_t socket, int events):
|
2008-05-31 10:31:07 +00:00
|
|
|
_resolver(resolver), _command(command), _socket(socket), _events(events) {}
|
|
|
|
|
|
|
|
bool ADNSEvent::operator==(const ADNSEvent& event) const
|
|
|
|
{
|
|
|
|
return _resolver == event._resolver;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ADNSEvent::getEvents() const
|
|
|
|
{
|
|
|
|
return _events;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ADNSEvent::processEvents(int events)
|
|
|
|
{
|
|
|
|
ares_socket_t readfd;
|
|
|
|
ares_socket_t writefd;
|
2008-06-04 16:28:16 +00:00
|
|
|
if(events&(SocketEntry::EVENT_READ|SocketEntry::EVENT_ERROR|SocketEntry::EVENT_HUP)) {
|
2008-05-31 10:31:07 +00:00
|
|
|
readfd = _socket;
|
|
|
|
} else {
|
|
|
|
readfd = ARES_SOCKET_BAD;
|
|
|
|
}
|
2008-06-04 16:28:16 +00:00
|
|
|
if(events&(SocketEntry::EVENT_WRITE|SocketEntry::EVENT_ERROR|SocketEntry::EVENT_HUP)) {
|
2008-05-31 10:31:07 +00:00
|
|
|
writefd = _socket;
|
|
|
|
} else {
|
|
|
|
writefd = ARES_SOCKET_BAD;
|
|
|
|
}
|
|
|
|
_resolver->process(readfd, writefd);
|
|
|
|
_command->setStatusActive();
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL && ENABLE_ASYNC_DNS
|
|
|
|
|
2008-06-16 14:01:45 +00:00
|
|
|
SocketEntry::SocketEntry(sock_t socket):_socket(socket)
|
2008-05-31 10:31:07 +00:00
|
|
|
{
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
memset(&_epEvent, 0, sizeof(struct epoll_event));
|
|
|
|
#endif // HAVE_EPOLL
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SocketEntry::operator==(const SocketEntry& entry) const
|
|
|
|
{
|
|
|
|
return _socket == entry._socket;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SocketEntry::operator<(const SocketEntry& entry) const
|
|
|
|
{
|
|
|
|
return _socket < entry._socket;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SocketEntry::addCommandEvent(Command* command, int events)
|
|
|
|
{
|
|
|
|
CommandEvent cev(command, events);
|
|
|
|
std::deque<CommandEvent>::iterator i = std::find(_commandEvents.begin(),
|
|
|
|
_commandEvents.end(),
|
|
|
|
cev);
|
|
|
|
if(i == _commandEvents.end()) {
|
|
|
|
_commandEvents.push_back(cev);
|
|
|
|
} else {
|
|
|
|
(*i).addEvents(events);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void SocketEntry::removeCommandEvent(Command* command, int events)
|
|
|
|
{
|
|
|
|
CommandEvent cev(command, events);
|
|
|
|
std::deque<CommandEvent>::iterator i = std::find(_commandEvents.begin(),
|
|
|
|
_commandEvents.end(),
|
|
|
|
cev);
|
|
|
|
if(i == _commandEvents.end()) {
|
|
|
|
// not found
|
|
|
|
} else {
|
|
|
|
(*i).removeEvents(events);
|
|
|
|
if((*i).eventsEmpty()) {
|
|
|
|
_commandEvents.erase(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
void SocketEntry::addADNSEvent(const SharedHandle<AsyncNameResolver>& resolver,
|
|
|
|
Command* command, int events)
|
|
|
|
{
|
|
|
|
ADNSEvent aev(resolver, command, _socket, events);
|
|
|
|
std::deque<ADNSEvent>::iterator i = std::find(_adnsEvents.begin(),
|
|
|
|
_adnsEvents.end(),
|
|
|
|
aev);
|
|
|
|
if(i == _adnsEvents.end()) {
|
|
|
|
_adnsEvents.push_back(aev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void SocketEntry::removeADNSEvent(const SharedHandle<AsyncNameResolver>& resolver,
|
|
|
|
Command* command)
|
|
|
|
{
|
|
|
|
ADNSEvent aev(resolver, command, _socket, 0);
|
|
|
|
std::deque<ADNSEvent>::iterator i = std::find(_adnsEvents.begin(),
|
|
|
|
_adnsEvents.end(),
|
|
|
|
aev);
|
|
|
|
if(i == _adnsEvents.end()) {
|
|
|
|
// not found
|
|
|
|
} else {
|
|
|
|
_adnsEvents.erase(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL && ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
void SocketEntry::processEvents(int events)
|
|
|
|
{
|
|
|
|
std::for_each(_commandEvents.begin(), _commandEvents.end(),
|
|
|
|
std::bind2nd(std::mem_fun_ref(&CommandEvent::processEvents),
|
|
|
|
events));
|
|
|
|
|
|
|
|
#if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
std::for_each(_adnsEvents.begin(), _adnsEvents.end(),
|
|
|
|
std::bind2nd(std::mem_fun_ref(&ADNSEvent::processEvents),
|
|
|
|
events));
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL && ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-06-16 14:01:45 +00:00
|
|
|
sock_t SocketEntry::getSocket() const
|
2008-05-31 10:31:07 +00:00
|
|
|
{
|
|
|
|
return _socket;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SocketEntry::eventEmpty() const
|
|
|
|
{
|
|
|
|
|
|
|
|
#if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
return _commandEvents.empty() && _adnsEvents.empty();
|
|
|
|
|
|
|
|
#else // !(HAVE_EPOLL && ENABLE_ASYNC_DNS)
|
|
|
|
|
|
|
|
return _commandEvents.empty();
|
|
|
|
|
|
|
|
#endif // !(HAVE_EPOLL && ENABLE_ASYNC_DNS)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
class AccEvent {
|
|
|
|
public:
|
|
|
|
int operator()(int events, const CommandEvent& commandEvent) const
|
|
|
|
{
|
|
|
|
return events|commandEvent.getEvents();
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
int operator()(int events, const ADNSEvent& adnsEvent) const
|
|
|
|
{
|
|
|
|
return events|adnsEvent.getEvents();
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL && ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
struct epoll_event& SocketEntry::getEpEvent()
|
|
|
|
{
|
|
|
|
_epEvent.data.ptr = this;
|
|
|
|
|
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
_epEvent.events =
|
|
|
|
std::accumulate(_adnsEvents.begin(),
|
|
|
|
_adnsEvents.end(),
|
|
|
|
std::accumulate(_commandEvents.begin(),
|
|
|
|
_commandEvents.end(), 0, AccEvent()),
|
|
|
|
AccEvent());
|
|
|
|
|
|
|
|
#else // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
_epEvent.events =
|
|
|
|
std::accumulate(_commandEvents.begin(), _commandEvents.end(), 0, AccEvent());
|
|
|
|
|
|
|
|
#endif // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
return _epEvent;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else // !HAVE_EPOLL
|
|
|
|
|
|
|
|
int SocketEntry::getEvents()
|
2007-10-11 16:58:24 +00:00
|
|
|
{
|
2008-05-31 10:31:07 +00:00
|
|
|
return
|
|
|
|
std::accumulate(_commandEvents.begin(), _commandEvents.end(), 0, AccEvent());
|
2007-10-11 16:58:24 +00:00
|
|
|
}
|
|
|
|
|
2008-05-31 10:31:07 +00:00
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
|
|
|
|
2007-10-11 16:58:24 +00:00
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
2008-05-31 10:31:07 +00:00
|
|
|
|
2008-05-08 11:18:36 +00:00
|
|
|
AsyncNameResolverEntry::AsyncNameResolverEntry
|
2008-05-31 10:31:07 +00:00
|
|
|
(const SharedHandle<AsyncNameResolver>& nameResolver, Command* command):
|
|
|
|
_nameResolver(nameResolver), _command(command)
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
, _socketsSize(0)
|
|
|
|
#endif // HAVE_EPOLL
|
|
|
|
{}
|
2007-10-11 16:58:24 +00:00
|
|
|
|
2008-05-08 11:18:36 +00:00
|
|
|
bool AsyncNameResolverEntry::operator==(const AsyncNameResolverEntry& entry)
|
2007-10-11 16:58:24 +00:00
|
|
|
{
|
2008-05-31 10:31:07 +00:00
|
|
|
return _nameResolver == entry._nameResolver &&
|
|
|
|
_command == entry._command;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
void AsyncNameResolverEntry::addSocketEvents(DownloadEngine* e)
|
|
|
|
{
|
|
|
|
_socketsSize = 0;
|
|
|
|
int mask = _nameResolver->getsock(_sockets);
|
|
|
|
if(mask == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
size_t i;
|
|
|
|
for(i = 0; i < ARES_GETSOCK_MAXNUM; ++i) {
|
|
|
|
//epoll_event_t* epEventPtr = &_epEvents[_socketsSize];
|
|
|
|
int events = 0;
|
|
|
|
if(ARES_GETSOCK_READABLE(mask, i)) {
|
|
|
|
events |= EPOLLIN;
|
|
|
|
}
|
|
|
|
if(ARES_GETSOCK_WRITABLE(mask, i)) {
|
|
|
|
events |= EPOLLOUT;
|
|
|
|
}
|
|
|
|
if(events == 0) {
|
|
|
|
// assume no further sockets are returned.
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
e->addSocketEvents(_sockets[i], _command, events, _nameResolver);
|
|
|
|
}
|
|
|
|
_socketsSize = i;
|
|
|
|
}
|
|
|
|
|
|
|
|
void AsyncNameResolverEntry::removeSocketEvents(DownloadEngine* e)
|
|
|
|
{
|
|
|
|
for(size_t i = 0; i < _socketsSize; ++i) {
|
|
|
|
e->deleteSocketEvents(_sockets[i], _command, 0, _nameResolver);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#else // !HAVE_EPOLL
|
|
|
|
|
|
|
|
int AsyncNameResolverEntry::getFds(fd_set* rfdsPtr, fd_set* wfdsPtr)
|
|
|
|
{
|
|
|
|
return _nameResolver->getFds(rfdsPtr, wfdsPtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
void AsyncNameResolverEntry::process(fd_set* rfdsPtr, fd_set* wfdsPtr)
|
|
|
|
{
|
|
|
|
_nameResolver->process(rfdsPtr, wfdsPtr);
|
|
|
|
switch(_nameResolver->getStatus()) {
|
|
|
|
case AsyncNameResolver::STATUS_SUCCESS:
|
|
|
|
case AsyncNameResolver::STATUS_ERROR:
|
|
|
|
_command->setStatusActive();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2007-10-11 16:58:24 +00:00
|
|
|
}
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
2007-10-11 16:58:24 +00:00
|
|
|
#endif // ENABLE_ASYNC_DNS
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2007-05-20 13:51:52 +00:00
|
|
|
DownloadEngine::DownloadEngine():logger(LogFactory::getInstance()),
|
2007-10-11 16:58:24 +00:00
|
|
|
_haltRequested(false),
|
2008-09-01 13:46:03 +00:00
|
|
|
_noWait(false),
|
|
|
|
_cookieStorage(new CookieStorage())
|
2008-05-14 16:01:30 +00:00
|
|
|
{
|
2008-05-31 10:31:07 +00:00
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
_epfd = epoll_create(EPOLL_EVENTS_MAX);
|
|
|
|
|
2008-06-17 09:29:43 +00:00
|
|
|
_epEvents = new struct epoll_event[EPOLL_EVENTS_MAX];
|
|
|
|
|
2008-05-31 10:31:07 +00:00
|
|
|
#else // !HAVE_EPOLL
|
|
|
|
|
2008-05-14 16:01:30 +00:00
|
|
|
updateFdSet();
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
2008-05-14 16:01:30 +00:00
|
|
|
}
|
2006-02-17 13:35:04 +00:00
|
|
|
|
|
|
|
DownloadEngine::~DownloadEngine() {
|
2006-08-07 16:05:00 +00:00
|
|
|
cleanQueue();
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
if(_epfd != -1) {
|
|
|
|
int r;
|
|
|
|
while((r = close(_epfd)) == -1 && errno == EINTR);
|
|
|
|
if(r == -1) {
|
|
|
|
logger->error("Error occurred while closing epoll file descriptor %d: %s",
|
|
|
|
_epfd, strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-17 09:29:43 +00:00
|
|
|
delete [] _epEvents;
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#endif // HAVE_EPOLL
|
2006-05-09 15:54:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DownloadEngine::cleanQueue() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::for_each(commands.begin(), commands.end(), Deleter());
|
2006-05-09 15:54:14 +00:00
|
|
|
commands.clear();
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
|
2008-04-20 05:42:15 +00:00
|
|
|
static void executeCommand(std::deque<Command*>& commands,
|
|
|
|
Command::STATUS statusFilter)
|
2007-03-16 14:21:29 +00:00
|
|
|
{
|
2008-03-09 12:24:01 +00:00
|
|
|
size_t max = commands.size();
|
|
|
|
for(size_t i = 0; i < max; i++) {
|
2007-03-16 14:21:29 +00:00
|
|
|
Command* com = commands.front();
|
|
|
|
commands.pop_front();
|
|
|
|
if(com->statusMatch(statusFilter)) {
|
2008-05-09 14:36:06 +00:00
|
|
|
com->transitStatus();
|
2007-03-16 14:21:29 +00:00
|
|
|
if(com->execute()) {
|
|
|
|
delete com;
|
2008-05-31 10:31:07 +00:00
|
|
|
com = 0;
|
2007-03-16 14:21:29 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
commands.push_back(com);
|
|
|
|
}
|
2008-05-31 10:31:07 +00:00
|
|
|
if(com) {
|
|
|
|
com->clearIOEvents();
|
|
|
|
}
|
2007-03-16 14:21:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-17 13:35:04 +00:00
|
|
|
void DownloadEngine::run() {
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
if(_epfd == -1) {
|
|
|
|
throw DlAbortEx("epoll_init() failed.");
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL
|
|
|
|
|
2006-06-12 16:55:08 +00:00
|
|
|
Time cp;
|
2006-08-11 12:29:55 +00:00
|
|
|
cp.setTimeInSec(0);
|
2008-04-23 10:03:52 +00:00
|
|
|
while(!commands.empty() || !_routineCommands.empty()) {
|
2006-06-12 16:55:08 +00:00
|
|
|
if(cp.elapsed(1)) {
|
|
|
|
cp.reset();
|
2008-04-20 05:42:15 +00:00
|
|
|
executeCommand(commands, Command::STATUS_ALL);
|
2006-05-24 15:18:58 +00:00
|
|
|
} else {
|
2008-04-20 05:42:15 +00:00
|
|
|
executeCommand(commands, Command::STATUS_ACTIVE);
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
2008-04-20 05:42:15 +00:00
|
|
|
executeCommand(_routineCommands, Command::STATUS_ALL);
|
2006-03-24 11:59:18 +00:00
|
|
|
afterEachIteration();
|
2007-05-20 13:51:52 +00:00
|
|
|
if(!commands.empty()) {
|
2007-03-16 14:21:29 +00:00
|
|
|
waitData();
|
2006-02-21 12:27:17 +00:00
|
|
|
}
|
2008-04-20 05:42:15 +00:00
|
|
|
_noWait = false;
|
2006-03-02 02:54:49 +00:00
|
|
|
calculateStatistics();
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
2006-03-21 14:12:51 +00:00
|
|
|
onEndOfRun();
|
2006-03-02 02:54:49 +00:00
|
|
|
}
|
|
|
|
|
2006-03-21 14:12:51 +00:00
|
|
|
void DownloadEngine::shortSleep() const {
|
|
|
|
struct timeval tv;
|
|
|
|
tv.tv_sec = 0;
|
|
|
|
tv.tv_usec = 1000;
|
|
|
|
fd_set rfds;
|
|
|
|
FD_ZERO(&rfds);
|
|
|
|
select(0, &rfds, NULL, NULL, &tv);
|
2006-03-02 02:54:49 +00:00
|
|
|
}
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2008-05-31 10:31:07 +00:00
|
|
|
void DownloadEngine::waitData()
|
|
|
|
{
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
// timeout is millisec
|
|
|
|
int timeout = _noWait ? 0 : 1000;
|
|
|
|
|
|
|
|
int res;
|
2008-06-17 09:29:43 +00:00
|
|
|
while((res = epoll_wait(_epfd, _epEvents, EPOLL_EVENTS_MAX, timeout)) == -1 &&
|
2008-05-31 10:31:07 +00:00
|
|
|
errno == EINTR);
|
|
|
|
|
|
|
|
if(res > 0) {
|
|
|
|
for(int i = 0; i < res; ++i) {
|
|
|
|
SocketEntry* p = (SocketEntry*)_epEvents[i].data.ptr;
|
|
|
|
p->processEvents(_epEvents[i].events);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO timeout of name resolver is determined in Command(AbstractCommand,
|
|
|
|
// DHTEntryPoint...Command)
|
|
|
|
|
|
|
|
#else // !HAVE_EPOLL
|
|
|
|
|
2006-02-17 13:35:04 +00:00
|
|
|
fd_set rfds;
|
|
|
|
fd_set wfds;
|
2006-08-07 16:05:00 +00:00
|
|
|
struct timeval tv;
|
|
|
|
|
|
|
|
memcpy(&rfds, &rfdset, sizeof(fd_set));
|
|
|
|
memcpy(&wfds, &wfdset, sizeof(fd_set));
|
|
|
|
|
2008-03-05 10:35:39 +00:00
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
for(std::deque<SharedHandle<AsyncNameResolverEntry> >::iterator itr =
|
|
|
|
nameResolverEntries.begin(); itr != nameResolverEntries.end(); ++itr) {
|
|
|
|
SharedHandle<AsyncNameResolverEntry>& entry = *itr;
|
|
|
|
int fd = entry->getFds(&rfds, &wfds);
|
2008-03-05 10:35:39 +00:00
|
|
|
// TODO force error if fd == 0
|
|
|
|
if(fdmax < fd) {
|
|
|
|
fdmax = fd;
|
|
|
|
}
|
|
|
|
}
|
2008-05-31 10:31:07 +00:00
|
|
|
|
2008-03-05 10:35:39 +00:00
|
|
|
#endif // ENABLE_ASYNC_DNS
|
|
|
|
|
2008-04-20 05:42:15 +00:00
|
|
|
tv.tv_sec = _noWait ? 0 : 1;
|
2006-08-07 16:05:00 +00:00
|
|
|
tv.tv_usec = 0;
|
2008-03-09 12:24:01 +00:00
|
|
|
int retval = select(fdmax+1, &rfds, &wfds, NULL, &tv);
|
2006-05-24 15:18:58 +00:00
|
|
|
if(retval > 0) {
|
2008-05-31 10:31:07 +00:00
|
|
|
for(std::deque<SharedHandle<SocketEntry> >::iterator i =
|
|
|
|
socketEntries.begin(); i != socketEntries.end(); ++i) {
|
|
|
|
int events = 0;
|
|
|
|
if(FD_ISSET((*i)->getSocket(), &rfds)) {
|
|
|
|
events |= SocketEntry::EVENT_READ;
|
2007-01-23 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To add chunk checksum validation:
* src/MetalinkEntry.h
(MetalinkChunkChecksum.h): New include.
(chunkChecksum): New variable.
* src/Request.h
(method): New variable.
(setMethod): New function.
(getMethod): New function.
(METHOD_GET): New static constant.
(METHOD_HEAD): New static constant.
* src/Xml2MetalinkProcessor.h
(getPieceHash): New function.
* src/PieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/FileAllocator.h
(NullFileAllocationMonitor.h): New include.
(FileAllocator): Initialize fileAllocationMonitor with new
NullFileAllocationMonitor().
* src/MultiDiskAdaptor.h
(messageDigest.h): Remove include.
(ctx): Removed.
(hashUpdate): Added ctx.
(MultiDiskAdaptor): Removed ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/UrlRequestInfo.h
(HeadResult): New class.
(digestAlgo): New variable.
(chunkChecksumLength): New variable.
(chunkChecksums): New variable.
(getHeadResult): New function.
(UrlRequestInfo): Added digestAlgo, chunkChecksumLength.
(setDigestAlgo): New function.
(setChunkChecksumLength): New function.
(setChunkChecksums): New function.
* src/DefaultPieceStorage.cc
(DiskAdaptorWriter.h): New include.
(ChunkChecksumValidator.h): New include.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/DefaultBtContext.h
(getPieceHashes): New function.
* src/TorrentRequestInfo.cc
(execute): Try to validate chunk checksum if file already exists
and
.aria2 file doesn't there and user allows aria2 to overwrite it.
* src/messageDigest.h
(~MessageDigestContext): Added digestFree().
* src/MetalinkRequestInfo.cc
(execute): Set digestAlgo, chunkChecksum, chunkChecksums to
reqInfo.
* src/DiskAdaptor.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/DownloadCommand.h
(PeerStat.h): New include.
(maxDownloadSpeedLimit): New variable.
(startupIdleTime): New variable.
(lowestDownloadSpeedLimit): New variable.
(peerStat): New variable.
(setMaxDownloadSpeedLimit): New function.
(setStartupIdleTime): New function.
(setLowestDownloadSPeedLimit): New function.
* src/BtContext.h
(getPieceHashes): New function.
* src/main.cc
(main): Set PREF_REALTIME_CHUNK_CHECKSUM and
PREF_CHECK_INTEGRITY
option to true for testing purpose.
* src/BtPieceMessage.cc
(checkPieceHash): Use messageDigest
* src/DownloadEngine.cc
(SetDescriptor): Removed.
(AccumulateActiveCommand): Removed.
(waitData): Rewritten.
(updateFdSet): Rewritten.
* src/MultiDiskAdaptor.cc
(hashUpdate): Added ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/BitfieldMan.h
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/ByteArrayDiskWriter.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ConsoleDownloadEngine.cc
(calculateStatistics): If nspeed < 0 then set nspeed to 0.
* src/DiskWriter.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ChunkChecksumValidator.h: New class.
* src/DiskAdaptorWriter.h: New class.
* src/prefs.h
(PREF_REALTIME_CHUNK_CHECKSUM): New definition.
(PREF_CHECK_INTEGRITY): New definition.
* src/HttpResponseCommand.cc
(handleDefaultEncoding): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
(handleOtherEncoding):
Added the call to
e->segmentMan->shouldCancelDownloadForSafety().
(createHttpDownloadCommand): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
* src/SegmentMan.h
(getSegmentEntryByIndex): New function.
(getSegmentEntryByCuid): New function.
(getSegmentEntryIteratorByCuid): New function.
(diskWriter): DiskWriter -> DiskWriterHandle
(pieceHashes): New variable.
(chunkHashLength): New variable.
(digestAlgo): New variable.
(FindPeerStat): Removed.
(getPeerStat): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(tryChunkChecksumValidation): New function.
(isChunkChecksumValidationReady): New function.
* src/BitfieldMan.cc
(BitfieldMan): Initialized bitfieldLength, blocks to 0.
(BitfieldMan): Initialized blockLength, totalLength,
bitfieldLength,
blocks to 0.
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/FtpNegotiateCommand.cc
(executeInternal): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
(recvSize): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
* src/AbstractSingleDiskAdaptor.cc
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/AbstractSingleDiskAdaptor.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/Util.h
(indexRange): New function.
* src/MetalinkEntry.cc
(MetalinkEntry): Initialized chunkChecksum to 0.
* src/ShaVisitor.cc
(~ShaVisitor): Removed the call to ctx.digestFree().
* src/SegmentMan.cc
(ChunkChecksumValidator.h): New include.
(SegmentMan): Initialized chunkHashLength to 0. Initialized
digestAlgo
to DIGEST_ALGO_SHA1.
(~SegmentMan): Removed diskWriter.
(FindSegmentEntryByIndex): Removed.
(FindSegmentEntryByCuid): Removed.
(checkoutSegment): Rewritten.
(findSlowerSegmentEntry): Rewritten.
(getSegment): Rewritten.
(updateSegment): Rewritten.
(completeSegment): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(isChunkChecksumValidationReady): New function.
(tryChunkChecksumValidation): New function.
* src/Xml2MetalinkProcessor.cc
(getEntry): Get size and set it to entry.
Get chunk checksum and set it to entry.
(getPieceHash): New function.
* src/Util.cc
(sha1Sum): Removed ctx.digestFree()
(fileChecksum): Removed ctx.digestFree()
(indexRange): New function.
* src/Request.cc
(METHOD_GET): New variable.
(METHOD_HEAD): New variable.
(Request): Added method.
* src/UrlRequestInfo.cc
(FatalException.h): New include.
(message.h): New include.
(operator<<): Added operator<< for class HeadResult.
(getHeadResult): New function.
(execute): Get filename and size in separate download engine.
* src/ChunkChecksumValidator.cc: New class.
* src/DownloadCommand.cc:
(DownloadCommand): Added peerStat.
(executeInternal): Use maxDownloadSpeedLimit member instead of
getting
the value from Option.
The buffer size is now 16KB.
Use peerStat member instead of getting it from SegmentMan.
Use startupIdleTime member instead of gettingit from Option.
Added chunk checksum validation.
* src/AbstractDiskWriter.cc
(AbstractDiskWriter): Removed ctx.
(~AbstractDiskWriter): Removed ctx.digestFree()
(writeDataInternal): Returns the return value of write.
(readDataInternal): Returns the return value of read.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/AbstractDiwkWriter.h
(messageDigest.h): Removed include.
(ctx): Removed.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/DefaultPieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/NullFileAllocationMonitor.h: New class.
2007-01-24 15:55:34 +00:00
|
|
|
}
|
2008-05-31 10:31:07 +00:00
|
|
|
if(FD_ISSET((*i)->getSocket(), &wfds)) {
|
|
|
|
events |= SocketEntry::EVENT_WRITE;
|
|
|
|
}
|
|
|
|
(*i)->processEvents(events);
|
2007-01-23 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To add chunk checksum validation:
* src/MetalinkEntry.h
(MetalinkChunkChecksum.h): New include.
(chunkChecksum): New variable.
* src/Request.h
(method): New variable.
(setMethod): New function.
(getMethod): New function.
(METHOD_GET): New static constant.
(METHOD_HEAD): New static constant.
* src/Xml2MetalinkProcessor.h
(getPieceHash): New function.
* src/PieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/FileAllocator.h
(NullFileAllocationMonitor.h): New include.
(FileAllocator): Initialize fileAllocationMonitor with new
NullFileAllocationMonitor().
* src/MultiDiskAdaptor.h
(messageDigest.h): Remove include.
(ctx): Removed.
(hashUpdate): Added ctx.
(MultiDiskAdaptor): Removed ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/UrlRequestInfo.h
(HeadResult): New class.
(digestAlgo): New variable.
(chunkChecksumLength): New variable.
(chunkChecksums): New variable.
(getHeadResult): New function.
(UrlRequestInfo): Added digestAlgo, chunkChecksumLength.
(setDigestAlgo): New function.
(setChunkChecksumLength): New function.
(setChunkChecksums): New function.
* src/DefaultPieceStorage.cc
(DiskAdaptorWriter.h): New include.
(ChunkChecksumValidator.h): New include.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/DefaultBtContext.h
(getPieceHashes): New function.
* src/TorrentRequestInfo.cc
(execute): Try to validate chunk checksum if file already exists
and
.aria2 file doesn't there and user allows aria2 to overwrite it.
* src/messageDigest.h
(~MessageDigestContext): Added digestFree().
* src/MetalinkRequestInfo.cc
(execute): Set digestAlgo, chunkChecksum, chunkChecksums to
reqInfo.
* src/DiskAdaptor.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/DownloadCommand.h
(PeerStat.h): New include.
(maxDownloadSpeedLimit): New variable.
(startupIdleTime): New variable.
(lowestDownloadSpeedLimit): New variable.
(peerStat): New variable.
(setMaxDownloadSpeedLimit): New function.
(setStartupIdleTime): New function.
(setLowestDownloadSPeedLimit): New function.
* src/BtContext.h
(getPieceHashes): New function.
* src/main.cc
(main): Set PREF_REALTIME_CHUNK_CHECKSUM and
PREF_CHECK_INTEGRITY
option to true for testing purpose.
* src/BtPieceMessage.cc
(checkPieceHash): Use messageDigest
* src/DownloadEngine.cc
(SetDescriptor): Removed.
(AccumulateActiveCommand): Removed.
(waitData): Rewritten.
(updateFdSet): Rewritten.
* src/MultiDiskAdaptor.cc
(hashUpdate): Added ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/BitfieldMan.h
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/ByteArrayDiskWriter.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ConsoleDownloadEngine.cc
(calculateStatistics): If nspeed < 0 then set nspeed to 0.
* src/DiskWriter.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ChunkChecksumValidator.h: New class.
* src/DiskAdaptorWriter.h: New class.
* src/prefs.h
(PREF_REALTIME_CHUNK_CHECKSUM): New definition.
(PREF_CHECK_INTEGRITY): New definition.
* src/HttpResponseCommand.cc
(handleDefaultEncoding): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
(handleOtherEncoding):
Added the call to
e->segmentMan->shouldCancelDownloadForSafety().
(createHttpDownloadCommand): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
* src/SegmentMan.h
(getSegmentEntryByIndex): New function.
(getSegmentEntryByCuid): New function.
(getSegmentEntryIteratorByCuid): New function.
(diskWriter): DiskWriter -> DiskWriterHandle
(pieceHashes): New variable.
(chunkHashLength): New variable.
(digestAlgo): New variable.
(FindPeerStat): Removed.
(getPeerStat): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(tryChunkChecksumValidation): New function.
(isChunkChecksumValidationReady): New function.
* src/BitfieldMan.cc
(BitfieldMan): Initialized bitfieldLength, blocks to 0.
(BitfieldMan): Initialized blockLength, totalLength,
bitfieldLength,
blocks to 0.
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/FtpNegotiateCommand.cc
(executeInternal): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
(recvSize): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
* src/AbstractSingleDiskAdaptor.cc
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/AbstractSingleDiskAdaptor.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/Util.h
(indexRange): New function.
* src/MetalinkEntry.cc
(MetalinkEntry): Initialized chunkChecksum to 0.
* src/ShaVisitor.cc
(~ShaVisitor): Removed the call to ctx.digestFree().
* src/SegmentMan.cc
(ChunkChecksumValidator.h): New include.
(SegmentMan): Initialized chunkHashLength to 0. Initialized
digestAlgo
to DIGEST_ALGO_SHA1.
(~SegmentMan): Removed diskWriter.
(FindSegmentEntryByIndex): Removed.
(FindSegmentEntryByCuid): Removed.
(checkoutSegment): Rewritten.
(findSlowerSegmentEntry): Rewritten.
(getSegment): Rewritten.
(updateSegment): Rewritten.
(completeSegment): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(isChunkChecksumValidationReady): New function.
(tryChunkChecksumValidation): New function.
* src/Xml2MetalinkProcessor.cc
(getEntry): Get size and set it to entry.
Get chunk checksum and set it to entry.
(getPieceHash): New function.
* src/Util.cc
(sha1Sum): Removed ctx.digestFree()
(fileChecksum): Removed ctx.digestFree()
(indexRange): New function.
* src/Request.cc
(METHOD_GET): New variable.
(METHOD_HEAD): New variable.
(Request): Added method.
* src/UrlRequestInfo.cc
(FatalException.h): New include.
(message.h): New include.
(operator<<): Added operator<< for class HeadResult.
(getHeadResult): New function.
(execute): Get filename and size in separate download engine.
* src/ChunkChecksumValidator.cc: New class.
* src/DownloadCommand.cc:
(DownloadCommand): Added peerStat.
(executeInternal): Use maxDownloadSpeedLimit member instead of
getting
the value from Option.
The buffer size is now 16KB.
Use peerStat member instead of getting it from SegmentMan.
Use startupIdleTime member instead of gettingit from Option.
Added chunk checksum validation.
* src/AbstractDiskWriter.cc
(AbstractDiskWriter): Removed ctx.
(~AbstractDiskWriter): Removed ctx.digestFree()
(writeDataInternal): Returns the return value of write.
(readDataInternal): Returns the return value of read.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/AbstractDiwkWriter.h
(messageDigest.h): Removed include.
(ctx): Removed.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/DefaultPieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/NullFileAllocationMonitor.h: New class.
2007-01-24 15:55:34 +00:00
|
|
|
}
|
2008-03-05 10:35:39 +00:00
|
|
|
}
|
2008-05-31 10:31:07 +00:00
|
|
|
|
2006-08-21 13:18:51 +00:00
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
for(std::deque<SharedHandle<AsyncNameResolverEntry> >::iterator i =
|
|
|
|
nameResolverEntries.begin(); i != nameResolverEntries.end(); ++i) {
|
|
|
|
(*i)->process(&rfds, &wfds);
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
2008-05-31 10:31:07 +00:00
|
|
|
|
2008-03-05 10:35:39 +00:00
|
|
|
#endif // ENABLE_ASYNC_DNS
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
|
2008-05-31 10:31:07 +00:00
|
|
|
#ifndef HAVE_EPOLL
|
|
|
|
|
2006-07-28 14:06:47 +00:00
|
|
|
void DownloadEngine::updateFdSet() {
|
|
|
|
fdmax = 0;
|
|
|
|
FD_ZERO(&rfdset);
|
|
|
|
FD_ZERO(&wfdset);
|
2008-05-31 10:31:07 +00:00
|
|
|
for(std::deque<SharedHandle<SocketEntry> >::iterator i =
|
|
|
|
socketEntries.begin(); i != socketEntries.end(); ++i) {
|
2008-06-16 14:01:45 +00:00
|
|
|
sock_t fd = (*i)->getSocket();
|
2008-05-31 10:31:07 +00:00
|
|
|
int events = (*i)->getEvents();
|
|
|
|
if(events&SocketEntry::EVENT_READ) {
|
2007-01-23 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To add chunk checksum validation:
* src/MetalinkEntry.h
(MetalinkChunkChecksum.h): New include.
(chunkChecksum): New variable.
* src/Request.h
(method): New variable.
(setMethod): New function.
(getMethod): New function.
(METHOD_GET): New static constant.
(METHOD_HEAD): New static constant.
* src/Xml2MetalinkProcessor.h
(getPieceHash): New function.
* src/PieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/FileAllocator.h
(NullFileAllocationMonitor.h): New include.
(FileAllocator): Initialize fileAllocationMonitor with new
NullFileAllocationMonitor().
* src/MultiDiskAdaptor.h
(messageDigest.h): Remove include.
(ctx): Removed.
(hashUpdate): Added ctx.
(MultiDiskAdaptor): Removed ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/UrlRequestInfo.h
(HeadResult): New class.
(digestAlgo): New variable.
(chunkChecksumLength): New variable.
(chunkChecksums): New variable.
(getHeadResult): New function.
(UrlRequestInfo): Added digestAlgo, chunkChecksumLength.
(setDigestAlgo): New function.
(setChunkChecksumLength): New function.
(setChunkChecksums): New function.
* src/DefaultPieceStorage.cc
(DiskAdaptorWriter.h): New include.
(ChunkChecksumValidator.h): New include.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/DefaultBtContext.h
(getPieceHashes): New function.
* src/TorrentRequestInfo.cc
(execute): Try to validate chunk checksum if file already exists
and
.aria2 file doesn't there and user allows aria2 to overwrite it.
* src/messageDigest.h
(~MessageDigestContext): Added digestFree().
* src/MetalinkRequestInfo.cc
(execute): Set digestAlgo, chunkChecksum, chunkChecksums to
reqInfo.
* src/DiskAdaptor.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/DownloadCommand.h
(PeerStat.h): New include.
(maxDownloadSpeedLimit): New variable.
(startupIdleTime): New variable.
(lowestDownloadSpeedLimit): New variable.
(peerStat): New variable.
(setMaxDownloadSpeedLimit): New function.
(setStartupIdleTime): New function.
(setLowestDownloadSPeedLimit): New function.
* src/BtContext.h
(getPieceHashes): New function.
* src/main.cc
(main): Set PREF_REALTIME_CHUNK_CHECKSUM and
PREF_CHECK_INTEGRITY
option to true for testing purpose.
* src/BtPieceMessage.cc
(checkPieceHash): Use messageDigest
* src/DownloadEngine.cc
(SetDescriptor): Removed.
(AccumulateActiveCommand): Removed.
(waitData): Rewritten.
(updateFdSet): Rewritten.
* src/MultiDiskAdaptor.cc
(hashUpdate): Added ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/BitfieldMan.h
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/ByteArrayDiskWriter.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ConsoleDownloadEngine.cc
(calculateStatistics): If nspeed < 0 then set nspeed to 0.
* src/DiskWriter.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ChunkChecksumValidator.h: New class.
* src/DiskAdaptorWriter.h: New class.
* src/prefs.h
(PREF_REALTIME_CHUNK_CHECKSUM): New definition.
(PREF_CHECK_INTEGRITY): New definition.
* src/HttpResponseCommand.cc
(handleDefaultEncoding): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
(handleOtherEncoding):
Added the call to
e->segmentMan->shouldCancelDownloadForSafety().
(createHttpDownloadCommand): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
* src/SegmentMan.h
(getSegmentEntryByIndex): New function.
(getSegmentEntryByCuid): New function.
(getSegmentEntryIteratorByCuid): New function.
(diskWriter): DiskWriter -> DiskWriterHandle
(pieceHashes): New variable.
(chunkHashLength): New variable.
(digestAlgo): New variable.
(FindPeerStat): Removed.
(getPeerStat): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(tryChunkChecksumValidation): New function.
(isChunkChecksumValidationReady): New function.
* src/BitfieldMan.cc
(BitfieldMan): Initialized bitfieldLength, blocks to 0.
(BitfieldMan): Initialized blockLength, totalLength,
bitfieldLength,
blocks to 0.
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/FtpNegotiateCommand.cc
(executeInternal): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
(recvSize): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
* src/AbstractSingleDiskAdaptor.cc
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/AbstractSingleDiskAdaptor.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/Util.h
(indexRange): New function.
* src/MetalinkEntry.cc
(MetalinkEntry): Initialized chunkChecksum to 0.
* src/ShaVisitor.cc
(~ShaVisitor): Removed the call to ctx.digestFree().
* src/SegmentMan.cc
(ChunkChecksumValidator.h): New include.
(SegmentMan): Initialized chunkHashLength to 0. Initialized
digestAlgo
to DIGEST_ALGO_SHA1.
(~SegmentMan): Removed diskWriter.
(FindSegmentEntryByIndex): Removed.
(FindSegmentEntryByCuid): Removed.
(checkoutSegment): Rewritten.
(findSlowerSegmentEntry): Rewritten.
(getSegment): Rewritten.
(updateSegment): Rewritten.
(completeSegment): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(isChunkChecksumValidationReady): New function.
(tryChunkChecksumValidation): New function.
* src/Xml2MetalinkProcessor.cc
(getEntry): Get size and set it to entry.
Get chunk checksum and set it to entry.
(getPieceHash): New function.
* src/Util.cc
(sha1Sum): Removed ctx.digestFree()
(fileChecksum): Removed ctx.digestFree()
(indexRange): New function.
* src/Request.cc
(METHOD_GET): New variable.
(METHOD_HEAD): New variable.
(Request): Added method.
* src/UrlRequestInfo.cc
(FatalException.h): New include.
(message.h): New include.
(operator<<): Added operator<< for class HeadResult.
(getHeadResult): New function.
(execute): Get filename and size in separate download engine.
* src/ChunkChecksumValidator.cc: New class.
* src/DownloadCommand.cc:
(DownloadCommand): Added peerStat.
(executeInternal): Use maxDownloadSpeedLimit member instead of
getting
the value from Option.
The buffer size is now 16KB.
Use peerStat member instead of getting it from SegmentMan.
Use startupIdleTime member instead of gettingit from Option.
Added chunk checksum validation.
* src/AbstractDiskWriter.cc
(AbstractDiskWriter): Removed ctx.
(~AbstractDiskWriter): Removed ctx.digestFree()
(writeDataInternal): Returns the return value of write.
(readDataInternal): Returns the return value of read.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/AbstractDiwkWriter.h
(messageDigest.h): Removed include.
(ctx): Removed.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/DefaultPieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/NullFileAllocationMonitor.h: New class.
2007-01-24 15:55:34 +00:00
|
|
|
FD_SET(fd, &rfdset);
|
2008-05-31 10:31:07 +00:00
|
|
|
}
|
|
|
|
if(events&SocketEntry::EVENT_WRITE) {
|
2007-01-23 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To add chunk checksum validation:
* src/MetalinkEntry.h
(MetalinkChunkChecksum.h): New include.
(chunkChecksum): New variable.
* src/Request.h
(method): New variable.
(setMethod): New function.
(getMethod): New function.
(METHOD_GET): New static constant.
(METHOD_HEAD): New static constant.
* src/Xml2MetalinkProcessor.h
(getPieceHash): New function.
* src/PieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/FileAllocator.h
(NullFileAllocationMonitor.h): New include.
(FileAllocator): Initialize fileAllocationMonitor with new
NullFileAllocationMonitor().
* src/MultiDiskAdaptor.h
(messageDigest.h): Remove include.
(ctx): Removed.
(hashUpdate): Added ctx.
(MultiDiskAdaptor): Removed ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/UrlRequestInfo.h
(HeadResult): New class.
(digestAlgo): New variable.
(chunkChecksumLength): New variable.
(chunkChecksums): New variable.
(getHeadResult): New function.
(UrlRequestInfo): Added digestAlgo, chunkChecksumLength.
(setDigestAlgo): New function.
(setChunkChecksumLength): New function.
(setChunkChecksums): New function.
* src/DefaultPieceStorage.cc
(DiskAdaptorWriter.h): New include.
(ChunkChecksumValidator.h): New include.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/DefaultBtContext.h
(getPieceHashes): New function.
* src/TorrentRequestInfo.cc
(execute): Try to validate chunk checksum if file already exists
and
.aria2 file doesn't there and user allows aria2 to overwrite it.
* src/messageDigest.h
(~MessageDigestContext): Added digestFree().
* src/MetalinkRequestInfo.cc
(execute): Set digestAlgo, chunkChecksum, chunkChecksums to
reqInfo.
* src/DiskAdaptor.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/DownloadCommand.h
(PeerStat.h): New include.
(maxDownloadSpeedLimit): New variable.
(startupIdleTime): New variable.
(lowestDownloadSpeedLimit): New variable.
(peerStat): New variable.
(setMaxDownloadSpeedLimit): New function.
(setStartupIdleTime): New function.
(setLowestDownloadSPeedLimit): New function.
* src/BtContext.h
(getPieceHashes): New function.
* src/main.cc
(main): Set PREF_REALTIME_CHUNK_CHECKSUM and
PREF_CHECK_INTEGRITY
option to true for testing purpose.
* src/BtPieceMessage.cc
(checkPieceHash): Use messageDigest
* src/DownloadEngine.cc
(SetDescriptor): Removed.
(AccumulateActiveCommand): Removed.
(waitData): Rewritten.
(updateFdSet): Rewritten.
* src/MultiDiskAdaptor.cc
(hashUpdate): Added ctx.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/BitfieldMan.h
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/ByteArrayDiskWriter.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ConsoleDownloadEngine.cc
(calculateStatistics): If nspeed < 0 then set nspeed to 0.
* src/DiskWriter.h
(messageDigest.h): New include.
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/ChunkChecksumValidator.h: New class.
* src/DiskAdaptorWriter.h: New class.
* src/prefs.h
(PREF_REALTIME_CHUNK_CHECKSUM): New definition.
(PREF_CHECK_INTEGRITY): New definition.
* src/HttpResponseCommand.cc
(handleDefaultEncoding): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
(handleOtherEncoding):
Added the call to
e->segmentMan->shouldCancelDownloadForSafety().
(createHttpDownloadCommand): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
* src/SegmentMan.h
(getSegmentEntryByIndex): New function.
(getSegmentEntryByCuid): New function.
(getSegmentEntryIteratorByCuid): New function.
(diskWriter): DiskWriter -> DiskWriterHandle
(pieceHashes): New variable.
(chunkHashLength): New variable.
(digestAlgo): New variable.
(FindPeerStat): Removed.
(getPeerStat): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(tryChunkChecksumValidation): New function.
(isChunkChecksumValidationReady): New function.
* src/BitfieldMan.cc
(BitfieldMan): Initialized bitfieldLength, blocks to 0.
(BitfieldMan): Initialized blockLength, totalLength,
bitfieldLength,
blocks to 0.
(isBitRangeSet): New function.
(unsetBitRange): New function.
* src/FtpNegotiateCommand.cc
(executeInternal): Set maxDownloadSpeedLimit,
startupIdleTime, lowestDownloadSpeedLimit to command.
(recvSize): Added method "HEAD" handling.
Removed the call to
e->segmentMan->shouldCancelDownloadForSafety().
* src/AbstractSingleDiskAdaptor.cc
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/AbstractSingleDiskAdaptor.h
(sha1Sum): Renamed as messageDigest.
(messageDigest): New function.
* src/Util.h
(indexRange): New function.
* src/MetalinkEntry.cc
(MetalinkEntry): Initialized chunkChecksum to 0.
* src/ShaVisitor.cc
(~ShaVisitor): Removed the call to ctx.digestFree().
* src/SegmentMan.cc
(ChunkChecksumValidator.h): New include.
(SegmentMan): Initialized chunkHashLength to 0. Initialized
digestAlgo
to DIGEST_ALGO_SHA1.
(~SegmentMan): Removed diskWriter.
(FindSegmentEntryByIndex): Removed.
(FindSegmentEntryByCuid): Removed.
(checkoutSegment): Rewritten.
(findSlowerSegmentEntry): Rewritten.
(getSegment): Rewritten.
(updateSegment): Rewritten.
(completeSegment): Rewritten.
(markAllPiecesDone): New function.
(checkIntegrity): New function.
(isChunkChecksumValidationReady): New function.
(tryChunkChecksumValidation): New function.
* src/Xml2MetalinkProcessor.cc
(getEntry): Get size and set it to entry.
Get chunk checksum and set it to entry.
(getPieceHash): New function.
* src/Util.cc
(sha1Sum): Removed ctx.digestFree()
(fileChecksum): Removed ctx.digestFree()
(indexRange): New function.
* src/Request.cc
(METHOD_GET): New variable.
(METHOD_HEAD): New variable.
(Request): Added method.
* src/UrlRequestInfo.cc
(FatalException.h): New include.
(message.h): New include.
(operator<<): Added operator<< for class HeadResult.
(getHeadResult): New function.
(execute): Get filename and size in separate download engine.
* src/ChunkChecksumValidator.cc: New class.
* src/DownloadCommand.cc:
(DownloadCommand): Added peerStat.
(executeInternal): Use maxDownloadSpeedLimit member instead of
getting
the value from Option.
The buffer size is now 16KB.
Use peerStat member instead of getting it from SegmentMan.
Use startupIdleTime member instead of gettingit from Option.
Added chunk checksum validation.
* src/AbstractDiskWriter.cc
(AbstractDiskWriter): Removed ctx.
(~AbstractDiskWriter): Removed ctx.digestFree()
(writeDataInternal): Returns the return value of write.
(readDataInternal): Returns the return value of read.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/AbstractDiwkWriter.h
(messageDigest.h): Removed include.
(ctx): Removed.
(sha1Sum): Renamed as messageDigest
(messageDigest): New function.
* src/DefaultPieceStorage.h
(markAllPiecesDone): New function.
(checkIntegrity): New function.
* src/NullFileAllocationMonitor.h: New class.
2007-01-24 15:55:34 +00:00
|
|
|
FD_SET(fd, &wfdset);
|
|
|
|
}
|
|
|
|
if(fdmax < fd) {
|
|
|
|
fdmax = fd;
|
|
|
|
}
|
|
|
|
}
|
2006-07-28 14:06:47 +00:00
|
|
|
}
|
|
|
|
|
2008-05-31 10:31:07 +00:00
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
2008-06-16 14:01:45 +00:00
|
|
|
bool DownloadEngine::addSocketEvents(sock_t socket, Command* command, int events
|
2008-05-31 10:31:07 +00:00
|
|
|
#if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
|
|
|
|
,const SharedHandle<AsyncNameResolver>& rs
|
|
|
|
#endif // HAVE_EPOLL && ENABLE_ASYNC_DNS
|
|
|
|
)
|
|
|
|
{
|
|
|
|
SharedHandle<SocketEntry> socketEntry(new SocketEntry(socket));
|
|
|
|
std::deque<SharedHandle<SocketEntry> >::iterator i =
|
|
|
|
std::lower_bound(socketEntries.begin(), socketEntries.end(), socketEntry);
|
|
|
|
int r = 0;
|
|
|
|
if(i != socketEntries.end() && (*i) == socketEntry) {
|
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
if(rs.isNull()) {
|
|
|
|
(*i)->addCommandEvent(command, events);
|
|
|
|
} else {
|
|
|
|
(*i)->addADNSEvent(rs, command, events);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
(*i)->addCommandEvent(command, events);
|
|
|
|
|
|
|
|
#endif // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
r = epoll_ctl(_epfd, EPOLL_CTL_MOD, (*i)->getSocket(), &(*i)->getEpEvent());
|
|
|
|
if(r == -1) {
|
|
|
|
// try EPOLL_CTL_ADD: There is a chance that previously socket X is
|
|
|
|
// added to epoll, but it is closed and is not yet removed from
|
|
|
|
// SocketEntries. In this case, EPOLL_CTL_MOD is failed with ENOENT.
|
|
|
|
|
|
|
|
r = epoll_ctl(_epfd, EPOLL_CTL_ADD, (*i)->getSocket(), &(*i)->getEpEvent());
|
|
|
|
}
|
|
|
|
|
|
|
|
#else // !HAVE_EPOLL
|
|
|
|
|
|
|
|
(*i)->addCommandEvent(command, events);
|
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
2006-02-17 13:35:04 +00:00
|
|
|
} else {
|
2008-05-31 10:31:07 +00:00
|
|
|
socketEntries.insert(i, socketEntry);
|
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
if(rs.isNull()) {
|
|
|
|
socketEntry->addCommandEvent(command, events);
|
|
|
|
} else {
|
|
|
|
socketEntry->addADNSEvent(rs, command, events);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
socketEntry->addCommandEvent(command, events);
|
|
|
|
|
|
|
|
#endif // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
r = epoll_ctl(_epfd, EPOLL_CTL_ADD, socketEntry->getSocket(), &socketEntry->getEpEvent());
|
|
|
|
|
|
|
|
#else // !HAVE_EPOLL
|
|
|
|
|
|
|
|
socketEntry->addCommandEvent(command, events);
|
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
|
2008-05-31 10:31:07 +00:00
|
|
|
#ifndef HAVE_EPOLL
|
|
|
|
|
|
|
|
updateFdSet();
|
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
|
|
|
if(r == -1) {
|
|
|
|
logger->debug("Failed to add socket event %d:%s", socket, strerror(errno));
|
2006-02-17 13:35:04 +00:00
|
|
|
return false;
|
2006-07-19 17:07:45 +00:00
|
|
|
} else {
|
|
|
|
return true;
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-16 14:01:45 +00:00
|
|
|
bool DownloadEngine::deleteSocketEvents(sock_t socket, Command* command, int events
|
2008-05-31 10:31:07 +00:00
|
|
|
#if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
|
|
|
|
,const SharedHandle<AsyncNameResolver>& rs
|
|
|
|
#endif // HAVE_EPOLL && ENABLE_ASYNC_DNS
|
|
|
|
)
|
|
|
|
{
|
|
|
|
SharedHandle<SocketEntry> socketEntry(new SocketEntry(socket));
|
|
|
|
std::deque<SharedHandle<SocketEntry> >::iterator i =
|
|
|
|
std::lower_bound(socketEntries.begin(), socketEntries.end(), socketEntry);
|
|
|
|
if(i != socketEntries.end() && (*i) == socketEntry) {
|
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
if(rs.isNull()) {
|
|
|
|
(*i)->removeCommandEvent(command, events);
|
|
|
|
} else {
|
|
|
|
(*i)->removeADNSEvent(rs, command);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
(*i)->removeCommandEvent(command, events);
|
|
|
|
|
|
|
|
#endif // !ENABLE_ASYNC_DNS
|
|
|
|
|
|
|
|
#else // !HAVE_EPOLL
|
|
|
|
|
|
|
|
(*i)->removeCommandEvent(command, events);
|
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
|
|
|
int r = 0;
|
|
|
|
if((*i)->eventEmpty()) {
|
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
r = epoll_ctl(_epfd, EPOLL_CTL_DEL, (*i)->getSocket(), 0);
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL
|
|
|
|
|
|
|
|
socketEntries.erase(i);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
// If socket is closed, then it seems it is automatically removed from
|
|
|
|
// epoll, so following EPOLL_CTL_MOD may fail.
|
|
|
|
r = epoll_ctl(_epfd, EPOLL_CTL_MOD, (*i)->getSocket(), &(*i)->getEpEvent());
|
|
|
|
if(r == -1) {
|
|
|
|
logger->debug("Failed to delete socket event, but may be ignored:%s", strerror(errno));
|
|
|
|
}
|
|
|
|
#endif // HAVE_EPOLL
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef HAVE_EPOLL
|
|
|
|
|
|
|
|
updateFdSet();
|
|
|
|
|
|
|
|
#endif // !HAVE_EPOLL
|
|
|
|
|
|
|
|
if(r == -1) {
|
|
|
|
logger->debug("Failed to delete socket event:%s", strerror(errno));
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
logger->debug("Socket %d is not found in SocketEntries.", socket);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-19 17:07:45 +00:00
|
|
|
bool DownloadEngine::addSocketForReadCheck(const SocketHandle& socket,
|
2008-05-31 10:31:07 +00:00
|
|
|
Command* command)
|
|
|
|
{
|
|
|
|
return addSocketEvents(socket->getSockfd(), command, SocketEntry::EVENT_READ);
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
|
2006-07-19 17:07:45 +00:00
|
|
|
bool DownloadEngine::deleteSocketForReadCheck(const SocketHandle& socket,
|
2008-05-31 10:31:07 +00:00
|
|
|
Command* command)
|
|
|
|
{
|
|
|
|
return deleteSocketEvents(socket->getSockfd(), command, SocketEntry::EVENT_READ);
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
|
2006-07-19 17:07:45 +00:00
|
|
|
bool DownloadEngine::addSocketForWriteCheck(const SocketHandle& socket,
|
2008-05-31 10:31:07 +00:00
|
|
|
Command* command)
|
|
|
|
{
|
|
|
|
return addSocketEvents(socket->getSockfd(), command, SocketEntry::EVENT_WRITE);
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
|
2006-07-19 17:07:45 +00:00
|
|
|
bool DownloadEngine::deleteSocketForWriteCheck(const SocketHandle& socket,
|
2008-05-31 10:31:07 +00:00
|
|
|
Command* command)
|
|
|
|
{
|
|
|
|
return deleteSocketEvents(socket->getSockfd(), command, SocketEntry::EVENT_WRITE);
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
2006-08-11 12:29:55 +00:00
|
|
|
|
2007-10-11 16:58:24 +00:00
|
|
|
void DownloadEngine::calculateStatistics()
|
|
|
|
{
|
|
|
|
if(!_statCalc.isNull()) {
|
|
|
|
_statCalc->calculateStat(_requestGroupMan, _fileAllocationMan, _checkIntegrityMan);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DownloadEngine::onEndOfRun()
|
|
|
|
{
|
2008-08-04 17:06:47 +00:00
|
|
|
_requestGroupMan->updateServerStat();
|
2007-10-11 16:58:24 +00:00
|
|
|
_requestGroupMan->closeFile();
|
|
|
|
_requestGroupMan->save();
|
|
|
|
}
|
|
|
|
|
|
|
|
void DownloadEngine::afterEachIteration()
|
|
|
|
{
|
2007-12-07 13:33:59 +00:00
|
|
|
if(globalHaltRequested == 1) {
|
|
|
|
logger->notice(_("Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."));
|
2008-02-11 05:07:08 +00:00
|
|
|
requestHalt();
|
2007-12-07 13:33:59 +00:00
|
|
|
globalHaltRequested = 2;
|
|
|
|
} else if(globalHaltRequested == 3) {
|
|
|
|
logger->notice(_("Emergency shutdown sequence commencing..."));
|
|
|
|
_requestGroupMan->forceHalt();
|
|
|
|
globalHaltRequested = 4;
|
2007-10-11 16:58:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-11 05:07:08 +00:00
|
|
|
void DownloadEngine::requestHalt()
|
|
|
|
{
|
|
|
|
_haltRequested = true;
|
|
|
|
_requestGroupMan->halt();
|
|
|
|
}
|
|
|
|
|
2007-10-11 16:58:24 +00:00
|
|
|
void DownloadEngine::fillCommand()
|
|
|
|
{
|
2008-05-11 09:36:39 +00:00
|
|
|
std::deque<Command*> commands;
|
|
|
|
_requestGroupMan->getInitialCommands(commands, this);
|
|
|
|
addCommand(commands);
|
2007-10-11 16:58:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DownloadEngine::setStatCalc(const StatCalcHandle& statCalc)
|
|
|
|
{
|
|
|
|
_statCalc = statCalc;
|
|
|
|
}
|
|
|
|
|
2007-11-24 11:32:22 +00:00
|
|
|
void DownloadEngine::addCommand(const Commands& commands)
|
|
|
|
{
|
|
|
|
this->commands.insert(this->commands.end(), commands.begin(), commands.end());
|
|
|
|
}
|
|
|
|
|
2006-08-21 13:18:51 +00:00
|
|
|
#ifdef ENABLE_ASYNC_DNS
|
2008-05-08 11:18:36 +00:00
|
|
|
bool DownloadEngine::addNameResolverCheck
|
2008-05-31 10:31:07 +00:00
|
|
|
(const SharedHandle<AsyncNameResolver>& resolver, Command* command)
|
2008-05-08 11:18:36 +00:00
|
|
|
{
|
2008-05-31 10:31:07 +00:00
|
|
|
SharedHandle<AsyncNameResolverEntry> entry
|
|
|
|
(new AsyncNameResolverEntry(resolver, command));
|
|
|
|
std::deque<SharedHandle<AsyncNameResolverEntry> >::iterator itr =
|
2008-05-08 11:18:36 +00:00
|
|
|
std::find(nameResolverEntries.begin(), nameResolverEntries.end(), entry);
|
2006-08-11 12:29:55 +00:00
|
|
|
if(itr == nameResolverEntries.end()) {
|
|
|
|
nameResolverEntries.push_back(entry);
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
entry->addSocketEvents(this);
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL
|
|
|
|
|
2006-08-11 12:29:55 +00:00
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-05-08 11:18:36 +00:00
|
|
|
bool DownloadEngine::deleteNameResolverCheck
|
2008-05-31 10:31:07 +00:00
|
|
|
(const SharedHandle<AsyncNameResolver>& resolver, Command* command)
|
2008-05-08 11:18:36 +00:00
|
|
|
{
|
2008-05-31 10:31:07 +00:00
|
|
|
SharedHandle<AsyncNameResolverEntry> entry
|
|
|
|
(new AsyncNameResolverEntry(resolver, command));
|
|
|
|
std::deque<SharedHandle<AsyncNameResolverEntry> >::iterator itr =
|
2008-05-08 11:18:36 +00:00
|
|
|
std::find(nameResolverEntries.begin(), nameResolverEntries.end(), entry);
|
2006-08-11 12:29:55 +00:00
|
|
|
if(itr == nameResolverEntries.end()) {
|
|
|
|
return false;
|
|
|
|
} else {
|
2008-05-31 10:31:07 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_EPOLL
|
|
|
|
|
|
|
|
(*itr)->removeSocketEvents(this);
|
|
|
|
|
|
|
|
#endif // HAVE_EPOLL
|
|
|
|
|
2006-08-11 12:29:55 +00:00
|
|
|
nameResolverEntries.erase(itr);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2006-08-21 13:18:51 +00:00
|
|
|
#endif // ENABLE_ASYNC_DNS
|
2008-02-08 15:53:45 +00:00
|
|
|
|
2008-04-20 05:42:15 +00:00
|
|
|
void DownloadEngine::setNoWait(bool b)
|
|
|
|
{
|
|
|
|
_noWait = b;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DownloadEngine::addRoutineCommand(Command* command)
|
|
|
|
{
|
|
|
|
_routineCommands.push_back(command);
|
|
|
|
}
|
|
|
|
|
2008-09-01 13:46:03 +00:00
|
|
|
SharedHandle<CookieStorage> DownloadEngine::getCookieStorage() const
|
|
|
|
{
|
|
|
|
return _cookieStorage;
|
|
|
|
}
|
|
|
|
|
2008-04-22 08:52:47 +00:00
|
|
|
void DownloadEngine::poolSocket(const std::string& ipaddr, uint16_t port,
|
2008-05-08 13:18:25 +00:00
|
|
|
const SharedHandle<SocketCore>& sock,
|
|
|
|
time_t timeout)
|
2008-04-22 08:52:47 +00:00
|
|
|
{
|
|
|
|
std::string addr = ipaddr+":"+Util::uitos(port);
|
|
|
|
logger->info("Pool socket for %s", addr.c_str());
|
2008-05-08 13:18:25 +00:00
|
|
|
|
|
|
|
SocketPoolEntry e(sock, timeout);
|
|
|
|
std::multimap<std::string, SocketPoolEntry>::value_type p(addr, e);
|
|
|
|
_socketPool.insert(p);
|
2008-04-22 08:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SharedHandle<SocketCore>
|
|
|
|
DownloadEngine::popPooledSocket(const std::string& ipaddr, uint16_t port)
|
|
|
|
{
|
2008-05-08 13:18:25 +00:00
|
|
|
SharedHandle<SocketCore> s;
|
2008-04-22 08:52:47 +00:00
|
|
|
std::string addr = ipaddr+":"+Util::uitos(port);
|
2008-05-08 13:18:25 +00:00
|
|
|
|
|
|
|
std::multimap<std::string, SocketPoolEntry>::iterator first = _socketPool.find(addr);
|
|
|
|
|
|
|
|
for(std::multimap<std::string, SocketPoolEntry>::iterator i = first;
|
|
|
|
i != _socketPool.end() && (*i).first == addr; ++i) {
|
|
|
|
const SocketPoolEntry& e = (*i).second;
|
|
|
|
if(!e.isTimeout()) {
|
|
|
|
logger->info("Reuse socket for %s", addr.c_str());
|
|
|
|
s = e.getSocket();
|
|
|
|
_socketPool.erase(first, ++i);
|
|
|
|
break;
|
|
|
|
}
|
2008-04-22 08:52:47 +00:00
|
|
|
}
|
2008-05-08 13:18:25 +00:00
|
|
|
return s;
|
2008-04-22 08:52:47 +00:00
|
|
|
}
|
|
|
|
|
2008-05-08 11:18:36 +00:00
|
|
|
SharedHandle<SocketCore>
|
|
|
|
DownloadEngine::popPooledSocket
|
|
|
|
(const std::deque<std::string>& ipaddrs, uint16_t port)
|
|
|
|
{
|
|
|
|
for(std::deque<std::string>::const_iterator i = ipaddrs.begin();
|
|
|
|
i != ipaddrs.end(); ++i) {
|
|
|
|
SharedHandle<SocketCore> s = popPooledSocket(*i, port);
|
|
|
|
if(!s.isNull()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return SharedHandle<SocketCore>();
|
|
|
|
}
|
|
|
|
|
2008-05-08 13:18:25 +00:00
|
|
|
DownloadEngine::SocketPoolEntry::SocketPoolEntry
|
|
|
|
(const SharedHandle<SocketCore>& socket,
|
|
|
|
time_t timeout):
|
|
|
|
_socket(socket),
|
|
|
|
_timeout(timeout) {}
|
|
|
|
|
|
|
|
DownloadEngine::SocketPoolEntry::~SocketPoolEntry() {}
|
|
|
|
|
|
|
|
bool DownloadEngine::SocketPoolEntry::isTimeout() const
|
|
|
|
{
|
|
|
|
return _registeredTime.elapsed(_timeout);
|
|
|
|
}
|
|
|
|
|
|
|
|
SharedHandle<SocketCore> DownloadEngine::SocketPoolEntry::getSocket() const
|
|
|
|
{
|
|
|
|
return _socket;
|
|
|
|
}
|
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
} // namespace aria2
|