Removed an incorrect TODO. Review: https://reviews.apache.org/r/15044
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/88640146 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/88640146 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/88640146 Branch: refs/heads/master Commit: 88640146a630a3d31ea3b4e5d92c15299f68eead Parents: 063376d Author: Benjamin Mahler <bmah...@twitter.com> Authored: Fri Oct 25 11:48:34 2013 -0700 Committer: Benjamin Mahler <bmah...@twitter.com> Committed: Tue Nov 5 14:19:26 2013 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/src/process.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/88640146/3rdparty/libprocess/src/process.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp index 8102636..9952dd1 100644 --- a/3rdparty/libprocess/src/process.cpp +++ b/3rdparty/libprocess/src/process.cpp @@ -2983,7 +2983,7 @@ Timer Timer::create( const Duration& duration, const lambda::function<void(void)>& thunk) { - static uint64_t id = 1; // Start at 1 since Timer() instances start with 0. + static uint64_t id = 1; // Start at 1 since Timer() instances use id 0. // Assumes Clock::now() does Clock::now(__process__). Timeout timeout = Timeout::in(duration); @@ -3020,8 +3020,6 @@ bool Timer::cancel(const Timer& timer) // Check if the timeout is still pending, and if so, erase it. In // addition, erase an empty list if we just removed the last // timeout. - // TODO(benh): If two timers are created with the same timeout, - // this will erase *both*. Fix this! Time time = timer.timeout().time(); if (timeouts->count(time) > 0) { canceled = true;
