Support for tracing app initialization.

mojo/common/trace_provider_impl.cc

Index: mojo/common/trace_provider_impl.cc
diff --git a/mojo/common/trace_provider_impl.cc b/mojo/common/trace_provider_impl.cc
index 8ffc867a46f38192022891ad5fe9adb797c9fb06..3c8cf334e957cae5b83a17641b6985785767d889 100644
--- a/mojo/common/trace_provider_impl.cc
+++ b/mojo/common/trace_provider_impl.cc
@@ -4,7 +4,10 @@
 
 #include "mojo/common/trace_provider_impl.h"
 
+#include "base/callback.h"
 #include "base/logging.h"
+#include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ -12,19 +15,25 @@
 
 namespace mojo {
 
-TraceProviderImpl::TraceProviderImpl(
-    InterfaceRequest<tracing::TraceProvider> request)
-    : tracing_already_started_(false), binding_(this, request.Pass()) {
-}
+TraceProviderImpl::TraceProviderImpl()
+    : binding_(this), tracing_forced_(false), weak_factory_(this) {}
+
+TraceProviderImpl::~TraceProviderImpl() {}
 
-TraceProviderImpl::~TraceProviderImpl() {
+void TraceProviderImpl::Bind(InterfaceRequest<tracing::TraceProvider> request) {
+  if (!binding_.is_bound()) {
+    binding_.Bind(request.Pass());
+  } else {
+    LOG(ERROR) << "Cannot accept two connections to TraceProvider.";
+  }
 }
 
 void TraceProviderImpl::StartTracing(const String& categories,
                                      tracing::TraceRecorderPtr collector) {
   DCHECK(!recorder_.get());
   recorder_ = collector.Pass();
-  if (!tracing_already_started_) {
+  tracing_forced_ = false;
+  if (!base::trace_event::TraceLog::GetInstance()->IsEnabled()) {
     std::string categories_str = categories.To<std::string>();
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
         base::trace_event::TraceConfig(categories_str,
@@ -41,6 +50,37 @@ void TraceProviderImpl::StopTracing() {
       base::Bind(&TraceProviderImpl::SendChunk, base::Unretained(this)));
 }
 
+void TraceProviderImpl::EnableTracingNow() {
+  base::trace_event::TraceLog::GetInstance()->SetEnabled(
+      base::trace_event::TraceConfig("*", base::trace_event::RECORD_UNTIL_FULL),
+      base::trace_event::TraceLog::RECORDING_MODE);
+  tracing_forced_ = true;
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&TraceProviderImpl::DelayedStop, weak_factory_.GetWeakPtr()));
+}
+
+void TraceProviderImpl::DelayedStop() {
+  // We use this indirection to account for cases where the Initialize app
+  // method (within which TraceProviderImpl is created) takes more than one
+  // second to finish; thus we start the countdown only when the current thread
+  // is unblocked.
+  base::MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&TraceProviderImpl::StopIfForced, weak_factory_.GetWeakPtr()),
+      base::TimeDelta::FromSeconds(1));
+}
+
+void TraceProviderImpl::StopIfForced() {
+  if (!tracing_forced_) {
+    return;
+  }
+  base::trace_event::TraceLog::GetInstance()->SetDisabled();
+  base::trace_event::TraceLog::GetInstance()->Flush(
+      base::Callback<void(const scoped_refptr<base::RefCountedString>&,
+                          bool)>());
+}
+
 void TraceProviderImpl::SendChunk(
     const scoped_refptr<base::RefCountedString>& events_str,
     bool has_more_events) {