Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Roll buildroot to 75660ad5 and complete the C++ 17 transition. #9319

Merged
tvolkert merged 2 commits into from
Jun 14, 2019
Merged

Roll buildroot to 75660ad5 and complete the C++ 17 transition. #9319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5761d5
Roll buildroot to 75660ad5 and complete the C++ 17 transition.
chinmaygarde Jun 13, 2019
19a74f1
Remove check that was MacOS only that messes up Windows with C++ 17.
chinmaygarde Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '95662021f20c859d1a1d30d3e436375b1078a39d',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '75660ad57986ef4a0ebeafe346b887ef2666ca6d',

# Fuchsia compatibility
#
Expand Down
62 changes: 19 additions & 43 deletions fml/trace_event.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,6 @@
#include "flutter/fml/build_config.h"
#include "flutter/fml/logging.h"

#if OS_MACOSX && !defined(NDEBUG)

#include <malloc/malloc.h>

#define DCHECK_LITERAL(x) \
({ \
do { \
FML_DCHECK(malloc_size((x)) == 0) \
<< "Timeline string must not be on the heap."; \
} while (0); \
((x)); \
})

#else // OS_MACOSX

#define DCHECK_LITERAL(x) ((x))

#endif // OS_MACOSX

namespace fml {
namespace tracing {

Expand All @@ -50,15 +31,11 @@ void TraceTimelineEvent(TraceArg category_group,
c_values.resize(argument_count, nullptr);

for (size_t i = 0; i < argument_count; i++) {
#if !defined(NDEBUG)
DCHECK_LITERAL(c_names[i]);
#endif // !defined(NDEBUG)

c_values[i] = values[i].c_str();
}

Dart_TimelineEvent(
DCHECK_LITERAL(name), // label
name, // label
Dart_TimelineGetMicros(), // timestamp0
identifier, // timestamp1_or_async_id
type, // event type
Expand All @@ -69,7 +46,7 @@ void TraceTimelineEvent(TraceArg category_group,
}

void TraceEvent0(TraceArg category_group, TraceArg name) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
0, // timestamp1_or_async_id
Dart_Timeline_Event_Begin, // event type
Expand All @@ -83,9 +60,9 @@ void TraceEvent1(TraceArg category_group,
TraceArg name,
TraceArg arg1_name,
TraceArg arg1_val) {
const char* arg_names[] = {DCHECK_LITERAL(arg1_name)};
const char* arg_names[] = {arg1_name};
const char* arg_values[] = {arg1_val};
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
0, // timestamp1_or_async_id
Dart_Timeline_Event_Begin, // event type
Expand All @@ -101,10 +78,9 @@ void TraceEvent2(TraceArg category_group,
TraceArg arg1_val,
TraceArg arg2_name,
TraceArg arg2_val) {
const char* arg_names[] = {DCHECK_LITERAL(arg1_name),
DCHECK_LITERAL(arg2_name)};
const char* arg_names[] = {arg1_name, arg2_name};
const char* arg_values[] = {arg1_val, arg2_val};
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
0, // timestamp1_or_async_id
Dart_Timeline_Event_Begin, // event type
Expand All @@ -115,7 +91,7 @@ void TraceEvent2(TraceArg category_group,
}

void TraceEventEnd(TraceArg name) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
0, // timestamp1_or_async_id
Dart_Timeline_Event_End, // event type
Expand All @@ -135,15 +111,15 @@ void TraceEventAsyncComplete(TraceArg category_group,
std::swap(begin, end);
}

Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
begin.ToEpochDelta().ToMicroseconds(), // timestamp0
identifier, // timestamp1_or_async_id
Dart_Timeline_Event_Async_Begin, // event type
0, // argument_count
nullptr, // argument_names
nullptr // argument_values
);
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
end.ToEpochDelta().ToMicroseconds(), // timestamp0
identifier, // timestamp1_or_async_id
Dart_Timeline_Event_Async_End, // event type
Expand All @@ -156,7 +132,7 @@ void TraceEventAsyncComplete(TraceArg category_group,
void TraceEventAsyncBegin0(TraceArg category_group,
TraceArg name,
TraceIDArg id) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
id, // timestamp1_or_async_id
Dart_Timeline_Event_Async_Begin, // event type
Expand All @@ -169,7 +145,7 @@ void TraceEventAsyncBegin0(TraceArg category_group,
void TraceEventAsyncEnd0(TraceArg category_group,
TraceArg name,
TraceIDArg id) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
id, // timestamp1_or_async_id
Dart_Timeline_Event_Async_End, // event type
Expand All @@ -184,9 +160,9 @@ void TraceEventAsyncBegin1(TraceArg category_group,
TraceIDArg id,
TraceArg arg1_name,
TraceArg arg1_val) {
const char* arg_names[] = {DCHECK_LITERAL(arg1_name)};
const char* arg_names[] = {arg1_name};
const char* arg_values[] = {arg1_val};
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
id, // timestamp1_or_async_id
Dart_Timeline_Event_Async_Begin, // event type
Expand All @@ -201,9 +177,9 @@ void TraceEventAsyncEnd1(TraceArg category_group,
TraceIDArg id,
TraceArg arg1_name,
TraceArg arg1_val) {
const char* arg_names[] = {DCHECK_LITERAL(arg1_name)};
const char* arg_names[] = {arg1_name};
const char* arg_values[] = {arg1_val};
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
id, // timestamp1_or_async_id
Dart_Timeline_Event_Async_End, // event type
Expand All @@ -214,7 +190,7 @@ void TraceEventAsyncEnd1(TraceArg category_group,
}

void TraceEventInstant0(TraceArg category_group, TraceArg name) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
0, // timestamp1_or_async_id
Dart_Timeline_Event_Instant, // event type
Expand All @@ -227,7 +203,7 @@ void TraceEventInstant0(TraceArg category_group, TraceArg name) {
void TraceEventFlowBegin0(TraceArg category_group,
TraceArg name,
TraceIDArg id) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
id, // timestamp1_or_async_id
Dart_Timeline_Event_Flow_Begin, // event type
Expand All @@ -240,7 +216,7 @@ void TraceEventFlowBegin0(TraceArg category_group,
void TraceEventFlowStep0(TraceArg category_group,
TraceArg name,
TraceIDArg id) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
id, // timestamp1_or_async_id
Dart_Timeline_Event_Flow_Step, // event type
Expand All @@ -251,7 +227,7 @@ void TraceEventFlowStep0(TraceArg category_group,
}

void TraceEventFlowEnd0(TraceArg category_group, TraceArg name, TraceIDArg id) {
Dart_TimelineEvent(DCHECK_LITERAL(name), // label
Dart_TimelineEvent(name, // label
Dart_TimelineGetMicros(), // timestamp0
id, // timestamp1_or_async_id
Dart_Timeline_Event_Flow_End, // event type
Expand Down