| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/debug/trace_event_impl.h" | 5 #include "base/debug/trace_event_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1555 thread_message_loops_.begin(); | 1555 thread_message_loops_.begin(); |
| 1556 it != thread_message_loops_.end(); ++it) { | 1556 it != thread_message_loops_.end(); ++it) { |
| 1557 (*it)->PostTask( | 1557 (*it)->PostTask( |
| 1558 FROM_HERE, | 1558 FROM_HERE, |
| 1559 Bind(&TraceLog::FlushCurrentThread, Unretained(this), generation)); | 1559 Bind(&TraceLog::FlushCurrentThread, Unretained(this), generation)); |
| 1560 } | 1560 } |
| 1561 flush_message_loop_proxy_->PostDelayedTask( | 1561 flush_message_loop_proxy_->PostDelayedTask( |
| 1562 FROM_HERE, | 1562 FROM_HERE, |
| 1563 Bind(&TraceLog::OnFlushTimeout, Unretained(this), generation), | 1563 Bind(&TraceLog::OnFlushTimeout, Unretained(this), generation), |
| 1564 TimeDelta::FromMilliseconds(kThreadFlushTimeoutMs)); | 1564 TimeDelta::FromMilliseconds(kThreadFlushTimeoutMs)); |
| 1565 return; | 1565 //return; |
| 1566 } | 1566 } |
| 1567 } | 1567 } |
| 1568 | 1568 |
| 1569 FinishFlush(generation); | 1569 FinishFlush(generation); |
| 1570 } | 1570 } |
| 1571 | 1571 |
| 1572 void TraceLog::ConvertTraceEventsToTraceFormat( | 1572 void TraceLog::ConvertTraceEventsToTraceFormat( |
| 1573 scoped_ptr<TraceBuffer> logged_events, | 1573 scoped_ptr<TraceBuffer> logged_events, |
| 1574 const TraceLog::OutputCallback& flush_output_callback) { | 1574 const TraceLog::OutputCallback& flush_output_callback) { |
| 1575 | 1575 |
| (...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2306 0, NULL, NULL, NULL, NULL, TRACE_EVENT_FLAG_NONE); | 2306 0, NULL, NULL, NULL, NULL, TRACE_EVENT_FLAG_NONE); |
| 2307 } | 2307 } |
| 2308 } | 2308 } |
| 2309 | 2309 |
| 2310 ScopedTraceBinaryEfficient::~ScopedTraceBinaryEfficient() { | 2310 ScopedTraceBinaryEfficient::~ScopedTraceBinaryEfficient() { |
| 2311 if (*category_group_enabled_) | 2311 if (*category_group_enabled_) |
| 2312 TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(event_handle_); | 2312 TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(event_handle_); |
| 2313 } | 2313 } |
| 2314 | 2314 |
| 2315 } // namespace trace_event_internal | 2315 } // namespace trace_event_internal |
| OLD | NEW |