f83a94a41e
Reason for revert: There seems to be a TSan warning that wasn't caught by the trybot: https://build.chromium.org/p/client.webrtc/builders/Linux%20Tsan%20v2/builds/6732/steps/peerconnection_unittests/logs/stdio Apparently a thread is still alive even after destroying WebRTCSession. Need to think of a way to fix this, without adding a critical section around g_clock (since that would hurt performance). Original issue's description: > Improving the fake clock and using it to fix a flaky STUN timeout test. > > When the fake clock's time is advanced, it now ensures all pending > queued messages have been dispatched. This allows us to write a > "SIMULATED_WAIT" macro that ticks the simulated clock by milliseconds up > until the target time. > > Useful in this case, where we know the STUN timeout should take a total > of 9500ms, but it would be overly complex to write test code that waits > for each individual timeout, ensures a STUN packet has been > retransmited, etc. > > (The test described above *should* be written, but it belongs in > p2ptransportchannel_unittest.cc, not webrtcsession_unittest.cc). > > Committed: https://crrev.com/ffbe0e17e2c9b7fe101023acf40574dc0c95631a > Cr-Commit-Position: refs/heads/master@{#13043} TBR=pthatcher@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.webrtc.org/2038213002 Cr-Commit-Position: refs/heads/master@{#13045}
41 lines
1.1 KiB
C++
41 lines
1.1 KiB
C++
/*
|
|
* Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/fakeclock.h"
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/messagequeue.h"
|
|
|
|
namespace rtc {
|
|
|
|
uint64_t FakeClock::TimeNanos() const {
|
|
CritScope cs(&lock_);
|
|
return time_;
|
|
}
|
|
|
|
void FakeClock::SetTimeNanos(uint64_t nanos) {
|
|
{
|
|
CritScope cs(&lock_);
|
|
RTC_DCHECK(nanos >= time_);
|
|
time_ = nanos;
|
|
}
|
|
// If message queues are waiting in a socket select() with a timeout provided
|
|
// by the OS, they should wake up to check if there are any messages ready to
|
|
// be dispatched based on the fake time.
|
|
MessageQueueManager::WakeAllMessageQueues();
|
|
}
|
|
|
|
void FakeClock::AdvanceTime(TimeDelta delta) {
|
|
CritScope cs(&lock_);
|
|
SetTimeNanos(time_ + delta.ToNanoseconds());
|
|
}
|
|
|
|
} // namespace rtc
|