14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
85 lines
2.8 KiB
C++
85 lines
2.8 KiB
C++
/*
|
|
* Copyright (c) 2013 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CLOCK_H_
|
|
#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CLOCK_H_
|
|
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// January 1970, in NTP seconds.
|
|
const uint32_t kNtpJan1970 = 2208988800UL;
|
|
|
|
// Magic NTP fractional unit.
|
|
const double kMagicNtpFractionalUnit = 4.294967296E+9;
|
|
|
|
// A clock interface that allows reading of absolute and relative timestamps.
|
|
class Clock {
|
|
public:
|
|
virtual ~Clock() {}
|
|
|
|
// Return a timestamp in milliseconds relative to some arbitrary source; the
|
|
// source is fixed for this clock.
|
|
virtual int64_t TimeInMilliseconds() const = 0;
|
|
|
|
// Return a timestamp in microseconds relative to some arbitrary source; the
|
|
// source is fixed for this clock.
|
|
virtual int64_t TimeInMicroseconds() const = 0;
|
|
|
|
// Retrieve an NTP absolute timestamp in seconds and fractions of a second.
|
|
virtual void CurrentNtp(uint32_t& seconds, uint32_t& fractions) const = 0;
|
|
|
|
// Retrieve an NTP absolute timestamp in milliseconds.
|
|
virtual int64_t CurrentNtpInMilliseconds() const = 0;
|
|
|
|
// Converts an NTP timestamp to a millisecond timestamp.
|
|
static int64_t NtpToMs(uint32_t seconds, uint32_t fractions);
|
|
|
|
// Returns an instance of the real-time system clock implementation.
|
|
static Clock* GetRealTimeClock();
|
|
};
|
|
|
|
class SimulatedClock : public Clock {
|
|
public:
|
|
explicit SimulatedClock(int64_t initial_time_us);
|
|
|
|
~SimulatedClock() override;
|
|
|
|
// Return a timestamp in milliseconds relative to some arbitrary source; the
|
|
// source is fixed for this clock.
|
|
int64_t TimeInMilliseconds() const override;
|
|
|
|
// Return a timestamp in microseconds relative to some arbitrary source; the
|
|
// source is fixed for this clock.
|
|
int64_t TimeInMicroseconds() const override;
|
|
|
|
// Retrieve an NTP absolute timestamp in milliseconds.
|
|
void CurrentNtp(uint32_t& seconds, uint32_t& fractions) const override;
|
|
|
|
// Converts an NTP timestamp to a millisecond timestamp.
|
|
int64_t CurrentNtpInMilliseconds() const override;
|
|
|
|
// Advance the simulated clock with a given number of milliseconds or
|
|
// microseconds.
|
|
void AdvanceTimeMilliseconds(int64_t milliseconds);
|
|
void AdvanceTimeMicroseconds(int64_t microseconds);
|
|
|
|
private:
|
|
int64_t time_us_;
|
|
rtc::scoped_ptr<RWLockWrapper> lock_;
|
|
};
|
|
|
|
}; // namespace webrtc
|
|
|
|
#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CLOCK_H_
|