diff options
| author | tfarina <tfarina@chromium.org> | 2015-12-17 15:37:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-17 23:39:44 +0000 |
| commit | 63d2f1dc5f334ec25ad0d0858eecf123aa5b2edf (patch) | |
| tree | 2172da03a72fa585fc4f1f2563c3cb676f8df70a /net/tools/epoll_server | |
| parent | f41d8fdda6808740a7f60ff8af770726038a60f6 (diff) | |
| download | chromium_src-63d2f1dc5f334ec25ad0d0858eecf123aa5b2edf.zip chromium_src-63d2f1dc5f334ec25ad0d0858eecf123aa5b2edf.tar.gz chromium_src-63d2f1dc5f334ec25ad0d0858eecf123aa5b2edf.tar.bz2 | |
epoll_server: get rid of ContainsAlarm() method
This patch get around it by reusing base's ContainsKey() function,
which provides the same functionality. And it seems unlikely EpollServer
needs to expose this implementation detail to clients.
BUG=None
R=eroman@chromium.org
Review URL: https://codereview.chromium.org/1530133007
Cr-Commit-Position: refs/heads/master@{#365939}
Diffstat (limited to 'net/tools/epoll_server')
| -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 |