Adding more detail to MessageQueue::Dispatch logging.

webrtc/api/proxy.h

 /*
  *  Copyright 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.
  */
 
@@ skipping 89 matching lines @@
 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) {
+  void Invoke(const rtc::Location& posted_from, rtc::Thread* t) {
     if (t->IsCurrent()) {
       proxy_->OnMessage(NULL);
     } else {
       e_.reset(new rtc::Event(false, false));
-      t->Post(this, 0);
+      t->Post(posted_from, this, 0);
       e_->Wait(rtc::Event::kForever);
     }
   }
 
  private:
   void OnMessage(rtc::Message*) { proxy_->OnMessage(NULL); e_->Set(); }
   std::unique_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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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);
+  R Marshal(const rtc::Location& posted_from, rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(posted_from, 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_SIGNALING_PROXY_MAP(c)                                           \
   template <class INTERNAL_CLASS>                                              \
   class c##ProxyWithInternal;                                                  \
   typedef c##ProxyWithInternal<c##Interface> c##Proxy;                         \
   template <class INTERNAL_CLASS>                                              \
   class c##ProxyWithInternal : public c##Interface {                           \
    protected:                                                                  \
     typedef c##Interface C;                                                    \
     c##ProxyWithInternal(rtc::Thread* signaling_thread, INTERNAL_CLASS* c)     \
         : signaling_thread_(signaling_thread), c_(c) {}                        \
     ~c##ProxyWithInternal() {                                                  \
       MethodCall0<c##ProxyWithInternal, void> call(                            \
           this, &c##ProxyWithInternal::Release_s);                             \
-      call.Marshal(signaling_thread_);                                         \
+      call.Marshal(RTC_FROM_HERE, signaling_thread_);                          \
     }                                                                          \
                                                                                \
    public:                                                                     \
     static rtc::scoped_refptr<c##ProxyWithInternal> Create(                    \
         rtc::Thread* signaling_thread,                                         \
         INTERNAL_CLASS* c) {                                                   \
       return new rtc::RefCountedObject<c##ProxyWithInternal>(signaling_thread, \
                                                              c);               \
     }                                                                          \
     const INTERNAL_CLASS* internal() const { return c_.get(); }                \
     INTERNAL_CLASS* internal() { return c_.get(); }
 
 #define BEGIN_PROXY_MAP(c)                                      \
   template <class INTERNAL_CLASS>                               \
   class c##ProxyWithInternal;                                   \
   typedef c##ProxyWithInternal<c##Interface> c##Proxy;          \
   template <class INTERNAL_CLASS>                               \
   class c##ProxyWithInternal : public c##Interface {            \
    protected:                                                   \
     typedef c##Interface C;                                     \
     c##ProxyWithInternal(rtc::Thread* signaling_thread,         \
                          rtc::Thread* worker_thread,            \
                          INTERNAL_CLASS* c)                     \
         : signaling_thread_(signaling_thread),                  \
           worker_thread_(worker_thread),                        \
           c_(c) {}                                              \
     ~c##ProxyWithInternal() {                                   \
       MethodCall0<c##ProxyWithInternal, void> call(             \
           this, &c##ProxyWithInternal::Release_s);              \
-      call.Marshal(signaling_thread_);                          \
+      call.Marshal(RTC_FROM_HERE, signaling_thread_);           \
     }                                                           \
                                                                 \
    public:                                                      \
     static rtc::scoped_refptr<c##ProxyWithInternal> Create(     \
         rtc::Thread* signaling_thread,                          \
         rtc::Thread* worker_thread,                             \
         INTERNAL_CLASS* c) {                                    \
       return new rtc::RefCountedObject<c##ProxyWithInternal>(   \
           signaling_thread, worker_thread, c);                  \
     }                                                           \
     const INTERNAL_CLASS* internal() const { return c_.get(); } \
     INTERNAL_CLASS* internal() { return c_.get(); }
 
-#define PROXY_METHOD0(r, method)                  \
-  r method() override {                           \
-    MethodCall0<C, r> call(c_.get(), &C::method); \
-    return call.Marshal(signaling_thread_);       \
+#define PROXY_METHOD0(r, method)                           \
+  r method() override {                                    \
+    MethodCall0<C, r> call(c_.get(), &C::method);          \
+    return call.Marshal(RTC_FROM_HERE, signaling_thread_); \
   }
 
-#define PROXY_CONSTMETHOD0(r, method)                  \
-  r method() const override {                          \
-    ConstMethodCall0<C, r> call(c_.get(), &C::method); \
-    return call.Marshal(signaling_thread_);            \
+#define PROXY_CONSTMETHOD0(r, method)                      \
+  r method() const override {                              \
+    ConstMethodCall0<C, r> call(c_.get(), &C::method);     \
+    return call.Marshal(RTC_FROM_HERE, signaling_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(signaling_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(RTC_FROM_HERE, signaling_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(signaling_thread_);                    \
+    return call.Marshal(RTC_FROM_HERE, signaling_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(signaling_thread_);                       \
+    return call.Marshal(RTC_FROM_HERE, signaling_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(signaling_thread_);                               \
+    return call.Marshal(RTC_FROM_HERE, signaling_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(signaling_thread_);                                  \
+    return call.Marshal(RTC_FROM_HERE, signaling_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(signaling_thread_);                                  \
+    return call.Marshal(RTC_FROM_HERE, signaling_thread_);                   \
   }
 
 // Define methods which should be invoked on the worker thread.
 #define PROXY_WORKER_METHOD1(r, method, t1)               \
   r method(t1 a1) override {                              \
     MethodCall1<C, r, t1> call(c_.get(), &C::method, a1); \
-    return call.Marshal(worker_thread_);                  \
+    return call.Marshal(RTC_FROM_HERE, worker_thread_);   \
   }
 
 #define PROXY_WORKER_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(worker_thread_);                          \
+    return call.Marshal(RTC_FROM_HERE, worker_thread_);           \
   }
 
 #define END_SIGNALING_PROXY()             \
  private:                                 \
   void Release_s() { c_ = NULL; }         \
   mutable rtc::Thread* signaling_thread_; \
   rtc::scoped_refptr<INTERNAL_CLASS> c_;  \
   }                                       \
   ;
 
 #define END_PROXY()                       \
  private:                                 \
   void Release_s() { c_ = NULL; }         \
   mutable rtc::Thread* signaling_thread_; \
   mutable rtc::Thread* worker_thread_;    \
   rtc::scoped_refptr<INTERNAL_CLASS> c_;  \
   }                                       \
   ;
 
 }  // namespace webrtc
 
 #endif  //  WEBRTC_API_PROXY_H_