Add location to RegisterModule

webrtc/modules/utility/source/process_thread_impl.cc

 /*
  *  Copyright (c) 2012 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/modules/utility/source/process_thread_impl.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/task_queue.h"
 #include "webrtc/base/timeutils.h"
+#include "webrtc/base/trace_event.h"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/system_wrappers/include/logging.h"
 
 namespace webrtc {
 namespace {
 
 // We use this constant internally to signal that a module has requested
 // a callback right away.  When this is set, no call to TimeUntilNextProcess
 // should be made, but Process() should be called directly.
 const int64_t kCallProcessImmediately = -1;
@@ skipping 96 matching lines @@
 
 void ProcessThreadImpl::PostTask(std::unique_ptr<rtc::QueuedTask> task) {
   // Allowed to be called on any thread.
   {
     rtc::CritScope lock(&lock_);
     queue_.push(task.release());
   }
   wake_up_->Set();
 }
 
-void ProcessThreadImpl::RegisterModule(Module* module) {
+void ProcessThreadImpl::RegisterModule(Module* module,
+                                       const rtc::Location& from) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   RTC_DCHECK(module);
 
 #if RTC_DCHECK_IS_ON
   {
     // Catch programmer error.
     rtc::CritScope lock(&lock_);
     for (const ModuleCallback& mc : modules_)
       RTC_DCHECK(mc.module != module);
   }
 #endif
 
   // Now that we know the module isn't in the list, we'll call out to notify
   // the module that it's attached to the worker thread.  We don't hold
   // the lock while we make this call.
   if (thread_.get())
     module->ProcessThreadAttached(this);
 
   {
     rtc::CritScope lock(&lock_);
-    modules_.push_back(ModuleCallback(module));
+    modules_.push_back(ModuleCallback(module, from));
   }
 
   // Wake the thread calling ProcessThreadImpl::Process() to update the
   // waiting time. The waiting time for the just registered module may be
   // shorter than all other registered modules.
   wake_up_->Set();
 }
 
 void ProcessThreadImpl::DeRegisterModule(Module* module) {
   // Allowed to be called on any thread.
@@ skipping 18 matching lines @@
       module->ProcessThreadAttached(nullptr);
   }
 }
 
 // static
 bool ProcessThreadImpl::Run(void* obj) {
   return static_cast<ProcessThreadImpl*>(obj)->Process();
 }
 
 bool ProcessThreadImpl::Process() {
+  TRACE_EVENT1("webrtc", "ProcessThreadImpl", "name", thread_name_);
   int64_t now = rtc::TimeMillis();
   int64_t next_checkpoint = now + (1000 * 60);
 
   {
     rtc::CritScope lock(&lock_);
     if (stop_)
       return false;
     for (ModuleCallback& m : modules_) {
       // TODO(tommi): Would be good to measure the time TimeUntilNextProcess
       // takes and dcheck if it takes too long (e.g. >=10ms).  Ideally this
       // operation should not require taking a lock, so querying all modules
       // should run in a matter of nanoseconds.
       if (m.next_callback == 0)
         m.next_callback = GetNextCallbackTime(m.module, now);
 
       if (m.next_callback <= now ||
           m.next_callback == kCallProcessImmediately) {
-        m.module->Process();
+        {
+          TRACE_EVENT2("webrtc", "ModuleProcess", "function",
+                       m.location.function_name(), "file",
+                       m.location.file_and_line());
+          m.module->Process();
+        }
         // Use a new 'now' reference to calculate when the next callback
         // should occur.  We'll continue to use 'now' above for the baseline
         // of calculating how long we should wait, to reduce variance.
         int64_t new_now = rtc::TimeMillis();
         m.next_callback = GetNextCallbackTime(m.module, new_now);
       }
 
       if (m.next_callback < next_checkpoint)
         next_checkpoint = m.next_callback;
     }
 
     while (!queue_.empty()) {
       rtc::QueuedTask* task = queue_.front();
       queue_.pop();
       lock_.Leave();
       task->Run();
       delete task;
       lock_.Enter();
     }
   }
 
   int64_t time_to_wait = next_checkpoint - rtc::TimeMillis();
   if (time_to_wait > 0)
     wake_up_->Wait(static_cast<unsigned long>(time_to_wait));
 
   return true;
 }
 }  // namespace webrtc