github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Renamed member variables.
	* src/DownloadEngine.cc
	* src/DownloadEngine.h
pull/1/head
Tatsuhiro Tsujikawa 2010-06-12 09:09:10 +00:00
parent e1d0911020
commit 6d8d84e0f4
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables.
* src/DownloadEngine.cc
* src/DownloadEngine.h
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables. Renamed member variables.

19
src/DownloadEngine.cc
View File

@ -91,7 +91,7 @@ volatile sig_atomic_t globalHaltRequested = 0;
DownloadEngine::DownloadEngine(const SharedHandle<EventPoll>& eventPoll): DownloadEngine::DownloadEngine(const SharedHandle<EventPoll>& eventPoll):
_eventPoll(eventPoll), _eventPoll(eventPoll),
logger(LogFactory::getInstance()), _logger(LogFactory::getInstance()),
_haltRequested(false), _haltRequested(false),
_noWait(false), _noWait(false),
_refreshInterval(DEFAULT_REFRESH_INTERVAL), _refreshInterval(DEFAULT_REFRESH_INTERVAL),
@ -219,13 +219,14 @@ void DownloadEngine::afterEachIteration()
{ {
_requestGroupMan->calculateStat(); _requestGroupMan->calculateStat();
if(global::globalHaltRequested == 1) { if(global::globalHaltRequested == 1) {
logger->notice(_("Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown.")); _logger->notice(_("Shutdown sequence commencing..."
" Press Ctrl-C again for emergency shutdown."));
requestHalt(); requestHalt();
global::globalHaltRequested = 2; global::globalHaltRequested = 2;
setNoWait(true); setNoWait(true);
setRefreshInterval(0); setRefreshInterval(0);
} else if(global::globalHaltRequested == 3) { } else if(global::globalHaltRequested == 3) {
logger->notice(_("Emergency shutdown sequence commencing...")); _logger->notice(_("Emergency shutdown sequence commencing..."));
requestForceHalt(); requestForceHalt();
global::globalHaltRequested = 4; global::globalHaltRequested = 4;
setNoWait(true); setNoWait(true);
@ -277,14 +278,14 @@ void DownloadEngine::addRoutineCommand(Command* command)
void DownloadEngine::poolSocket(const std::string& key, void DownloadEngine::poolSocket(const std::string& key,
const SocketPoolEntry& entry) const SocketPoolEntry& entry)
{ {
logger->info("Pool socket for %s", key.c_str()); _logger->info("Pool socket for %s", key.c_str());
std::multimap<std::string, SocketPoolEntry>::value_type p(key, entry); std::multimap<std::string, SocketPoolEntry>::value_type p(key, entry);
_socketPool.insert(p); _socketPool.insert(p);
if(_lastSocketPoolScan.difference(global::wallclock) >= 60) { if(_lastSocketPoolScan.difference(global::wallclock) >= 60) {
std::multimap<std::string, SocketPoolEntry> newPool; std::multimap<std::string, SocketPoolEntry> newPool;
if(logger->debug()) { if(_logger->debug()) {
logger->debug("Scaning SocketPool and erasing timed out entry."); _logger->debug("Scaning SocketPool and erasing timed out entry.");
} }
_lastSocketPoolScan = global::wallclock; _lastSocketPoolScan = global::wallclock;
for(std::multimap<std::string, SocketPoolEntry>::iterator i = for(std::multimap<std::string, SocketPoolEntry>::iterator i =
@ -293,8 +294,8 @@ void DownloadEngine::poolSocket(const std::string& key,
newPool.insert(*i); newPool.insert(*i);
} }
} }
if(logger->debug()) { if(_logger->debug()) {
logger->debug _logger->debug
("%lu entries removed.", ("%lu entries removed.",
static_cast<unsigned long>(_socketPool.size()-newPool.size())); static_cast<unsigned long>(_socketPool.size()-newPool.size()));
} }
@ -399,7 +400,7 @@ DownloadEngine::findSocketPoolEntry(const std::string& key)
range.first, eoi = range.second; i != eoi; ++i) { range.first, eoi = range.second; i != eoi; ++i) {
const SocketPoolEntry& e = (*i).second; const SocketPoolEntry& e = (*i).second;
if(!e.isTimeout()) { if(!e.isTimeout()) {
logger->info("Found socket for %s", key.c_str()); _logger->info("Found socket for %s", key.c_str());
return i; return i;
} }
} }

2
src/DownloadEngine.h
View File

@ -78,7 +78,7 @@ private:
SharedHandle<EventPoll> _eventPoll; SharedHandle<EventPoll> _eventPoll;
Logger* logger; Logger* _logger;
SharedHandle<StatCalc> _statCalc; SharedHandle<StatCalc> _statCalc;