OLD | NEW |
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 Loading... |
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(); |
55 // If the delay is under 1 ms we need to execute the task right away. | 57 #if defined(OS_WIN) |
56 if (delay.InMilliseconds() >= 1) { | 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 |
| 64 if (delay > TimeDelta()) { |
57 event_.TimedWait(delay); | 65 event_.TimedWait(delay); |
58 } else { | 66 } else { |
59 // 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 |
60 // need to call DoDelayedWork now. | 68 // need to call DoDelayedWork now. |
61 delayed_work_time_ = TimeTicks(); | 69 delayed_work_time_ = TimeTicks(); |
62 } | 70 } |
63 } | 71 } |
64 // 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 |
65 // other than service each delegate method. | 73 // other than service each delegate method. |
66 } | 74 } |
(...skipping 13 matching lines...) Expand all Loading... |
80 | 88 |
81 void MessagePumpDefault::ScheduleDelayedWork( | 89 void MessagePumpDefault::ScheduleDelayedWork( |
82 const TimeTicks& delayed_work_time) { | 90 const TimeTicks& delayed_work_time) { |
83 // 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 |
84 // 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 |
85 // record of how long to sleep when we do sleep. | 93 // record of how long to sleep when we do sleep. |
86 delayed_work_time_ = delayed_work_time; | 94 delayed_work_time_ = delayed_work_time; |
87 } | 95 } |
88 | 96 |
89 } // namespace base | 97 } // namespace base |
OLD | NEW |