Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Side by Side Diff: base/message_loop/message_pump_default.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop/message_pump_default.h" 5 #include "base/message_loop/message_pump_default.h"
6 6
7 #include <algorithm>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
9 11
10 #if defined(OS_MACOSX) 12 #if defined(OS_MACOSX)
11 #include "base/mac/scoped_nsautorelease_pool.h" 13 #include "base/mac/scoped_nsautorelease_pool.h"
12 #endif 14 #endif
13 15
14 namespace base { 16 namespace base {
15 17
16 MessagePumpDefault::MessagePumpDefault() 18 MessagePumpDefault::MessagePumpDefault()
(...skipping 28 matching lines...) Expand all
45 break; 47 break;
46 48
47 if (did_work) 49 if (did_work)
48 continue; 50 continue;
49 51
50 ThreadRestrictions::ScopedAllowWait allow_wait; 52 ThreadRestrictions::ScopedAllowWait allow_wait;
51 if (delayed_work_time_.is_null()) { 53 if (delayed_work_time_.is_null()) {
52 event_.Wait(); 54 event_.Wait();
53 } else { 55 } else {
54 TimeDelta delay = delayed_work_time_ - TimeTicks::Now(); 56 TimeDelta delay = delayed_work_time_ - TimeTicks::Now();
57 #if defined(OS_WIN)
58 // If the delay is greater than zero and under 1 ms we need to round up to
59 // 1 ms or else we will end up spinning until it counts down to zero
60 // because sub-ms waits aren't supported on Windows.
61 if (delay > TimeDelta())
62 delay = std::max(delay, TimeDelta::FromMilliseconds(1));
63 #endif
55 if (delay > TimeDelta()) { 64 if (delay > TimeDelta()) {
56 event_.TimedWait(delay); 65 event_.TimedWait(delay);
57 } else { 66 } else {
58 // It looks like delayed_work_time_ indicates a time in the past, so we 67 // It looks like delayed_work_time_ indicates a time in the past, so we
59 // need to call DoDelayedWork now. 68 // need to call DoDelayedWork now.
60 delayed_work_time_ = TimeTicks(); 69 delayed_work_time_ = TimeTicks();
61 } 70 }
62 } 71 }
63 // Since event_ is auto-reset, we don't need to do anything special here 72 // Since event_ is auto-reset, we don't need to do anything special here
64 // other than service each delegate method. 73 // other than service each delegate method.
(...skipping 14 matching lines...) Expand all
79 88
80 void MessagePumpDefault::ScheduleDelayedWork( 89 void MessagePumpDefault::ScheduleDelayedWork(
81 const TimeTicks& delayed_work_time) { 90 const TimeTicks& delayed_work_time) {
82 // We know that we can't be blocked on Wait right now since this method can 91 // We know that we can't be blocked on Wait right now since this method can
83 // only be called on the same thread as Run, so we only need to update our 92 // only be called on the same thread as Run, so we only need to update our
84 // record of how long to sleep when we do sleep. 93 // record of how long to sleep when we do sleep.
85 delayed_work_time_ = delayed_work_time; 94 delayed_work_time_ = delayed_work_time;
86 } 95 }
87 96
88 } // namespace base 97 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_loop_proxy_impl.cc ('k') | base/message_loop/message_pump_libevent_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698