diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-20 08:21:36 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-20 08:21:36 +0000 |
| commit | 580098eb4929a3bdbf424af18da361259ef2efe5 (patch) | |
| tree | c6ff77fa55fcbdcdd0ca21ec2105db14a8c050d3 /src/SelectEventPoll.cc | |
| parent | 3940da75624b194cdd5036f9fe330fcecc725964 (diff) | |
2010-11-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Rewritten Logger interface. Logger now writes source file name and
line number in log file.
Diffstat (limited to 'src/SelectEventPoll.cc')
| -rw-r--r-- | src/SelectEventPoll.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/SelectEventPoll.cc b/src/SelectEventPoll.cc index 4297b55e..b541631d 100644 --- a/src/SelectEventPoll.cc +++ b/src/SelectEventPoll.cc @@ -45,6 +45,7 @@ #include "LogFactory.h" #include "Logger.h" #include "a2functional.h" +#include "fmt.h" namespace aria2 { @@ -149,7 +150,7 @@ void SelectEventPoll::AsyncNameResolverEntry::process #endif // ENABLE_ASYNC_DNS -SelectEventPoll::SelectEventPoll():logger_(LogFactory::getInstance()) +SelectEventPoll::SelectEventPoll() { #ifdef __MINGW32__ dummySocket_ = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -226,11 +227,11 @@ void SelectEventPoll::poll(const struct timeval& tv) #ifdef __MINGW32__ namespace { -void checkFdCountMingw(const fd_set& fdset, Logger* logger) +void checkFdCountMingw(const fd_set& fdset) { if(fdset.fd_count >= FD_SETSIZE) { - logger->warn("The number of file descriptor exceeded FD_SETSIZE. " - "Download may slow down or fail."); + A2_LOG_WARN("The number of file descriptor exceeded FD_SETSIZE. " + "Download may slow down or fail."); } } } // namespace @@ -250,21 +251,21 @@ void SelectEventPoll::updateFdSet() sock_t fd = (*i)->getSocket(); #ifndef __MINGW32__ if(fd < 0 || FD_SETSIZE <= fd) { - logger_->warn("Detected file descriptor >= FD_SETSIZE or < 0. " - "Download may slow down or fail."); + A2_LOG_WARN("Detected file descriptor >= FD_SETSIZE or < 0. " + "Download may slow down or fail."); continue; } #endif // !__MINGW32__ int events = (*i)->getEvents(); if(events&EventPoll::EVENT_READ) { #ifdef __MINGW32__ - checkFdCountMingw(rfdset_, logger_); + checkFdCountMingw(rfdset_); #endif // __MINGW32__ FD_SET(fd, &rfdset_); } if(events&EventPoll::EVENT_WRITE) { #ifdef __MINGW32__ - checkFdCountMingw(wfdset_, logger_); + checkFdCountMingw(wfdset_); #endif // __MINGW32__ FD_SET(fd, &wfdset_); } @@ -306,9 +307,7 @@ bool SelectEventPoll::deleteEvents(sock_t socket, Command* command, updateFdSet(); return true; } else { - if(logger_->debug()) { - logger_->debug("Socket %d is not found in SocketEntries.", socket); - } + A2_LOG_DEBUG(fmt("Socket %d is not found in SocketEntries.", socket)); return false; } } |