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

Side by Side Diff: webrtc/base/messagequeue.cc

Issue 1982733002: Re-enabling socket tests that were previously flaky. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removing debug logging and adding IPv6 check for more tests Created 4 years, 7 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
« no previous file with comments | « no previous file | webrtc/base/nethelpers.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include <algorithm> 10 #include <algorithm>
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 MessageData* pdata) { 346 MessageData* pdata) {
347 // This should work even if it is used (unexpectedly). 347 // This should work even if it is used (unexpectedly).
348 int delay = static_cast<uint32_t>(TimeMillis()) - tstamp; 348 int delay = static_cast<uint32_t>(TimeMillis()) - tstamp;
349 return DoDelayPost(delay, tstamp, phandler, id, pdata); 349 return DoDelayPost(delay, tstamp, phandler, id, pdata);
350 } 350 }
351 351
352 void MessageQueue::PostAt(int64_t tstamp, 352 void MessageQueue::PostAt(int64_t tstamp,
353 MessageHandler* phandler, 353 MessageHandler* phandler,
354 uint32_t id, 354 uint32_t id,
355 MessageData* pdata) { 355 MessageData* pdata) {
356 return DoDelayPost(TimeUntil(tstamp), tstamp, phandler, id, pdata); 356 return DoDelayPost(static_cast<int>(TimeUntil(tstamp)), tstamp, phandler, id,
pthatcher1 2016/05/19 18:05:39 Could make DelayedMessage.cmsDelay_ an int64_t.
Taylor Brandstetter 2016/05/19 18:12:34 Done.
357 pdata);
357 } 358 }
358 359
359 void MessageQueue::DoDelayPost(int cmsDelay, 360 void MessageQueue::DoDelayPost(int cmsDelay,
360 int64_t tstamp, 361 int64_t tstamp,
361 MessageHandler* phandler, 362 MessageHandler* phandler,
362 uint32_t id, 363 uint32_t id,
363 MessageData* pdata) { 364 MessageData* pdata) {
364 if (fStop_) 365 if (fStop_)
365 return; 366 return;
366 367
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 dmsgq_.container().erase(new_end, dmsgq_.container().end()); 450 dmsgq_.container().erase(new_end, dmsgq_.container().end());
450 dmsgq_.reheap(); 451 dmsgq_.reheap();
451 } 452 }
452 453
453 void MessageQueue::Dispatch(Message *pmsg) { 454 void MessageQueue::Dispatch(Message *pmsg) {
454 TRACE_EVENT0("webrtc", "MessageQueue::Dispatch"); 455 TRACE_EVENT0("webrtc", "MessageQueue::Dispatch");
455 pmsg->phandler->OnMessage(pmsg); 456 pmsg->phandler->OnMessage(pmsg);
456 } 457 }
457 458
458 } // namespace rtc 459 } // namespace rtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/nethelpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698