diff options
| -rw-r--r-- | net/tools/epoll_server/epoll_server.cc | 4 | ||||
| -rw-r--r-- | net/tools/epoll_server/epoll_server.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/net/tools/epoll_server/epoll_server.cc b/net/tools/epoll_server/epoll_server.cc index 78511c2..1933b99 100644 --- a/net/tools/epoll_server/epoll_server.cc +++ b/net/tools/epoll_server/epoll_server.cc @@ -9,10 +9,10 @@ #include <errno.h> // for errno and strerror_r #include <algorithm> #include <utility> -#include <vector> #include "base/auto_reset.h" #include "base/logging.h" +#include "base/stl_util.h" #include "base/time/time.h" // Design notes: An efficient implementation of ready list has the following @@ -442,7 +442,7 @@ void EpollServer::VerifyReadyList() const { void EpollServer::RegisterAlarm(int64 timeout_time_in_us, AlarmCB* ac) { CHECK(ac); - if (ContainsAlarm(ac)) { + if (ContainsKey(all_alarms_, ac)) { LOG(FATAL) << "Alarm already exists " << ac; } VLOG(4) << "RegisteringAlarm at : " << timeout_time_in_us; diff --git a/net/tools/epoll_server/epoll_server.h b/net/tools/epoll_server/epoll_server.h index b241861..4293362 100644 --- a/net/tools/epoll_server/epoll_server.h +++ b/net/tools/epoll_server/epoll_server.h @@ -8,9 +8,7 @@ #include <fcntl.h> #include <sys/queue.h> #include <map> -#include <set> #include <string> -#include <utility> #include <vector> // #define EPOLL_SERVER_EVENT_TRACING 1 @@ -475,10 +473,6 @@ class EpollServer { // Returns true when the EpollServer() is being destroyed. bool in_shutdown() const { return in_shutdown_; } - bool ContainsAlarm(EpollAlarmCallbackInterface* alarm) const { - return all_alarms_.find(alarm) != all_alarms_.end(); - } - // Summary: // A function for implementing the ready list. It invokes OnEvent for each // of the fd in the ready list, and takes care of adding them back to the |