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
392 lines
12 KiB
C++
392 lines
12 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
// This file contains Macros for creating proxies for webrtc MediaStream and
|
|
// PeerConnection classes.
|
|
|
|
//
|
|
// Example usage:
|
|
//
|
|
// class TestInterface : public rtc::RefCountInterface {
|
|
// public:
|
|
// std::string FooA() = 0;
|
|
// std::string FooB(bool arg1) const = 0;
|
|
// std::string FooC(bool arg1)= 0;
|
|
// };
|
|
//
|
|
// Note that return types can not be a const reference.
|
|
//
|
|
// class Test : public TestInterface {
|
|
// ... implementation of the interface.
|
|
// };
|
|
//
|
|
// BEGIN_PROXY_MAP(Test)
|
|
// PROXY_METHOD0(std::string, FooA)
|
|
// PROXY_CONSTMETHOD1(std::string, FooB, arg1)
|
|
// PROXY_METHOD1(std::string, FooC, arg1)
|
|
// END_PROXY()
|
|
//
|
|
// The proxy can be created using TestProxy::Create(Thread*, TestInterface*).
|
|
|
|
#ifndef TALK_APP_WEBRTC_PROXY_H_
|
|
#define TALK_APP_WEBRTC_PROXY_H_
|
|
|
|
#include "webrtc/base/event.h"
|
|
#include "webrtc/base/thread.h"
|
|
|
|
namespace webrtc {
|
|
|
|
template <typename R>
|
|
class ReturnType {
|
|
public:
|
|
template<typename C, typename M>
|
|
void Invoke(C* c, M m) { r_ = (c->*m)(); }
|
|
template<typename C, typename M, typename T1>
|
|
void Invoke(C* c, M m, T1 a1) { r_ = (c->*m)(a1); }
|
|
template<typename C, typename M, typename T1, typename T2>
|
|
void Invoke(C* c, M m, T1 a1, T2 a2) { r_ = (c->*m)(a1, a2); }
|
|
template<typename C, typename M, typename T1, typename T2, typename T3>
|
|
void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3) { r_ = (c->*m)(a1, a2, a3); }
|
|
template<typename C, typename M, typename T1, typename T2, typename T3,
|
|
typename T4>
|
|
void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3, T4 a4) {
|
|
r_ = (c->*m)(a1, a2, a3, a4);
|
|
}
|
|
template<typename C, typename M, typename T1, typename T2, typename T3,
|
|
typename T4, typename T5>
|
|
void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5) {
|
|
r_ = (c->*m)(a1, a2, a3, a4, a5);
|
|
}
|
|
|
|
R value() { return r_; }
|
|
|
|
private:
|
|
R r_;
|
|
};
|
|
|
|
template <>
|
|
class ReturnType<void> {
|
|
public:
|
|
template<typename C, typename M>
|
|
void Invoke(C* c, M m) { (c->*m)(); }
|
|
template<typename C, typename M, typename T1>
|
|
void Invoke(C* c, M m, T1 a1) { (c->*m)(a1); }
|
|
template<typename C, typename M, typename T1, typename T2>
|
|
void Invoke(C* c, M m, T1 a1, T2 a2) { (c->*m)(a1, a2); }
|
|
template<typename C, typename M, typename T1, typename T2, typename T3>
|
|
void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3) { (c->*m)(a1, a2, a3); }
|
|
|
|
void value() {}
|
|
};
|
|
|
|
namespace internal {
|
|
|
|
class SynchronousMethodCall
|
|
: public rtc::MessageData,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
explicit SynchronousMethodCall(rtc::MessageHandler* proxy)
|
|
: e_(), proxy_(proxy) {}
|
|
~SynchronousMethodCall() {}
|
|
|
|
void Invoke(rtc::Thread* t) {
|
|
if (t->IsCurrent()) {
|
|
proxy_->OnMessage(NULL);
|
|
} else {
|
|
e_.reset(new rtc::Event(false, false));
|
|
t->Post(this, 0);
|
|
e_->Wait(rtc::Event::kForever);
|
|
}
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { proxy_->OnMessage(NULL); e_->Set(); }
|
|
rtc::scoped_ptr<rtc::Event> e_;
|
|
rtc::MessageHandler* proxy_;
|
|
};
|
|
|
|
} // namespace internal
|
|
|
|
template <typename C, typename R>
|
|
class MethodCall0 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)();
|
|
MethodCall0(C* c, Method m) : c_(c), m_(m) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
};
|
|
|
|
template <typename C, typename R>
|
|
class ConstMethodCall0 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)() const;
|
|
ConstMethodCall0(C* c, Method m) : c_(c), m_(m) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
};
|
|
|
|
template <typename C, typename R, typename T1>
|
|
class MethodCall1 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)(T1 a1);
|
|
MethodCall1(C* c, Method m, T1 a1) : c_(c), m_(m), a1_(a1) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_, a1_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
T1 a1_;
|
|
};
|
|
|
|
template <typename C, typename R, typename T1>
|
|
class ConstMethodCall1 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)(T1 a1) const;
|
|
ConstMethodCall1(C* c, Method m, T1 a1) : c_(c), m_(m), a1_(a1) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_, a1_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
T1 a1_;
|
|
};
|
|
|
|
template <typename C, typename R, typename T1, typename T2>
|
|
class MethodCall2 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)(T1 a1, T2 a2);
|
|
MethodCall2(C* c, Method m, T1 a1, T2 a2) : c_(c), m_(m), a1_(a1), a2_(a2) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_, a1_, a2_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
T1 a1_;
|
|
T2 a2_;
|
|
};
|
|
|
|
template <typename C, typename R, typename T1, typename T2, typename T3>
|
|
class MethodCall3 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)(T1 a1, T2 a2, T3 a3);
|
|
MethodCall3(C* c, Method m, T1 a1, T2 a2, T3 a3)
|
|
: c_(c), m_(m), a1_(a1), a2_(a2), a3_(a3) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_, a1_, a2_, a3_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
T1 a1_;
|
|
T2 a2_;
|
|
T3 a3_;
|
|
};
|
|
|
|
template <typename C, typename R, typename T1, typename T2, typename T3,
|
|
typename T4>
|
|
class MethodCall4 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)(T1 a1, T2 a2, T3 a3, T4 a4);
|
|
MethodCall4(C* c, Method m, T1 a1, T2 a2, T3 a3, T4 a4)
|
|
: c_(c), m_(m), a1_(a1), a2_(a2), a3_(a3), a4_(a4) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_, a1_, a2_, a3_, a4_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
T1 a1_;
|
|
T2 a2_;
|
|
T3 a3_;
|
|
T4 a4_;
|
|
};
|
|
|
|
template <typename C, typename R, typename T1, typename T2, typename T3,
|
|
typename T4, typename T5>
|
|
class MethodCall5 : public rtc::Message,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
typedef R (C::*Method)(T1 a1, T2 a2, T3 a3, T4 a4, T5 a5);
|
|
MethodCall5(C* c, Method m, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
|
|
: c_(c), m_(m), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5) {}
|
|
|
|
R Marshal(rtc::Thread* t) {
|
|
internal::SynchronousMethodCall(this).Invoke(t);
|
|
return r_.value();
|
|
}
|
|
|
|
private:
|
|
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_, a1_, a2_, a3_, a4_, a5_); }
|
|
|
|
C* c_;
|
|
Method m_;
|
|
ReturnType<R> r_;
|
|
T1 a1_;
|
|
T2 a2_;
|
|
T3 a3_;
|
|
T4 a4_;
|
|
T5 a5_;
|
|
};
|
|
|
|
#define BEGIN_PROXY_MAP(c) \
|
|
class c##Proxy : public c##Interface { \
|
|
protected: \
|
|
typedef c##Interface C; \
|
|
c##Proxy(rtc::Thread* thread, C* c) : owner_thread_(thread), c_(c) {} \
|
|
~c##Proxy() { \
|
|
MethodCall0<c##Proxy, void> call(this, &c##Proxy::Release_s); \
|
|
call.Marshal(owner_thread_); \
|
|
} \
|
|
\
|
|
public: \
|
|
static rtc::scoped_refptr<C> Create(rtc::Thread* thread, C* c) { \
|
|
return new rtc::RefCountedObject<c##Proxy>(thread, c); \
|
|
}
|
|
|
|
#define PROXY_METHOD0(r, method) \
|
|
r method() override { \
|
|
MethodCall0<C, r> call(c_.get(), &C::method); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define PROXY_CONSTMETHOD0(r, method) \
|
|
r method() const override { \
|
|
ConstMethodCall0<C, r> call(c_.get(), &C::method); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define PROXY_METHOD1(r, method, t1) \
|
|
r method(t1 a1) override { \
|
|
MethodCall1<C, r, t1> call(c_.get(), &C::method, a1); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define PROXY_CONSTMETHOD1(r, method, t1) \
|
|
r method(t1 a1) const override { \
|
|
ConstMethodCall1<C, r, t1> call(c_.get(), &C::method, a1); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define PROXY_METHOD2(r, method, t1, t2) \
|
|
r method(t1 a1, t2 a2) override { \
|
|
MethodCall2<C, r, t1, t2> call(c_.get(), &C::method, a1, a2); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define PROXY_METHOD3(r, method, t1, t2, t3) \
|
|
r method(t1 a1, t2 a2, t3 a3) override { \
|
|
MethodCall3<C, r, t1, t2, t3> call(c_.get(), &C::method, a1, a2, a3); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define PROXY_METHOD4(r, method, t1, t2, t3, t4) \
|
|
r method(t1 a1, t2 a2, t3 a3, t4 a4) override { \
|
|
MethodCall4<C, r, t1, t2, t3, t4> call(c_.get(), &C::method, a1, a2, a3, \
|
|
a4); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define PROXY_METHOD5(r, method, t1, t2, t3, t4, t5) \
|
|
r method(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) override { \
|
|
MethodCall5<C, r, t1, t2, t3, t4, t5> call(c_.get(), &C::method, a1, a2, \
|
|
a3, a4, a5); \
|
|
return call.Marshal(owner_thread_); \
|
|
}
|
|
|
|
#define END_PROXY() \
|
|
private:\
|
|
void Release_s() {\
|
|
c_ = NULL;\
|
|
}\
|
|
mutable rtc::Thread* owner_thread_;\
|
|
rtc::scoped_refptr<C> c_;\
|
|
};\
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // TALK_APP_WEBRTC_PROXY_H_
|