| 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 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1557 existing_names.end(), | 1557 existing_names.end(), |
| 1558 new_name) != existing_names.end(); | 1558 new_name) != existing_names.end(); |
| 1559 if (!found) { | 1559 if (!found) { |
| 1560 existing_name->second.push_back(','); | 1560 existing_name->second.push_back(','); |
| 1561 existing_name->second.append(new_name); | 1561 existing_name->second.append(new_name); |
| 1562 } | 1562 } |
| 1563 } | 1563 } |
| 1564 } | 1564 } |
| 1565 } | 1565 } |
| 1566 | 1566 |
| 1567 #if defined (OS_WIN) |
| 1568 TraceEventETWProvider::TraceWithArgs( |
| 1569 GetCategoryGroupName(category_group_enabled), name, phase, |
| 1570 id, thread_names_[thread_id], |
| 1571 num_args, arg_names, arg_types, arg_values, convertable_values); |
| 1572 #endif // defined (OS_WIN) |
| 1573 |
| 1567 if (!subtle::NoBarrier_Load(&buffer_is_full_)) { | 1574 if (!subtle::NoBarrier_Load(&buffer_is_full_)) { |
| 1568 TraceEvent trace_event(thread_id, now, thread_now, phase, | 1575 TraceEvent trace_event(thread_id, now, thread_now, phase, |
| 1569 category_group_enabled, name, id, | 1576 category_group_enabled, name, id, |
| 1570 num_args, arg_names, arg_types, arg_values, | 1577 num_args, arg_names, arg_types, arg_values, |
| 1571 convertable_values, flags); | 1578 convertable_values, flags); |
| 1572 | 1579 |
| 1573 if (thread_local_event_buffer) { | 1580 if (thread_local_event_buffer) { |
| 1574 thread_local_event_buffer->AddEvent(trace_event, ¬ifier); | 1581 thread_local_event_buffer->AddEvent(trace_event, ¬ifier); |
| 1575 } else { | 1582 } else { |
| 1576 AutoLock lock(lock_); | 1583 AutoLock lock(lock_); |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2031 0, // num_args | 2038 0, // num_args |
| 2032 NULL, // arg_names | 2039 NULL, // arg_names |
| 2033 NULL, // arg_types | 2040 NULL, // arg_types |
| 2034 NULL, // arg_values | 2041 NULL, // arg_values |
| 2035 NULL, // convertable values | 2042 NULL, // convertable values |
| 2036 TRACE_EVENT_FLAG_NONE); // flags | 2043 TRACE_EVENT_FLAG_NONE); // flags |
| 2037 } | 2044 } |
| 2038 } | 2045 } |
| 2039 | 2046 |
| 2040 } // namespace trace_event_internal | 2047 } // namespace trace_event_internal |
| OLD | NEW |