Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(877)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: src/gpu/GrTracing.h

Issue 1571603003: Move atomicinc in GrTracing to behind branch (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: tweaks Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/gpu/GrConfig.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef GrTracing_DEFINED 8 #ifndef GrTracing_DEFINED
9 #define GrTracing_DEFINED 9 #define GrTracing_DEFINED
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 private: 54 private:
55 SkTLazy<GrGpuTraceMarker> fTraceMarker; 55 SkTLazy<GrGpuTraceMarker> fTraceMarker;
56 }; 56 };
57 57
58 /** 58 /**
59 * GR_CREATE_TRACE_MARKER will place begin and end trace markers for both 59 * GR_CREATE_TRACE_MARKER will place begin and end trace markers for both
60 * cpu and gpu (if gpu tracing enabled) for the current scope. 60 * cpu and gpu (if gpu tracing enabled) for the current scope.
61 * marker is of type const char* and target is of type GrDrawTarget* 61 * marker is of type const char* and target is of type GrDrawTarget*
62 */ 62 */
63 #define GR_CREATE_TRACE_MARKER(name, target) \ 63 #define GR_CREATE_TRACE_MARKER(name, target) \
64 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target) 64 /* Chromium tracing */ \
65 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
66 bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \
67 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \
68 &SK_MACRO_APPEND_LINE(gpuTracingEnabled)) ; \
69 if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \
70 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, SK_MACRO_APPEND_LINE(name_c ounter), target) \
71 } \
72 INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), name, \
73 "id", SK_MACRO_APPEND_LINE(name_counter));
65 74
66 #define GR_CREATE_TRACE_MARKER1(name, target, arg1_name, arg1_val) \ 75 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, name_counter, target) \
67 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target, arg1_name, arg1_val)
68
69 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target, ...) \
70 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \ 76 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \
71 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
72 INTERNAL_GR_CREATE_TRACE_MARKER(SK_MACRO_APPEND_LINE(static_name), \ 77 INTERNAL_GR_CREATE_TRACE_MARKER(SK_MACRO_APPEND_LINE(static_name), \
73 SK_MACRO_APPEND_LINE(name_counter), \ 78 name_counter, \
74 target, ##__VA_ARGS__) \ 79 target) \
75 sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter)); 80 sk_atomic_inc(&name_counter);
76 81
77 #define INTERNAL_GR_CREATE_TRACE_MARKER(name, name_counter, target, ...) \ 82 #define INTERNAL_GR_CREATE_TRACE_MARKER(name, name_counter, target, ...) \
78 GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \ 83 GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \
79 INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \
80 "id", name_counter, ##__VA_ARGS__);
81 84
82 #if GR_FORCE_GPU_TRACE_DEBUGGING 85 #define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \
83 #define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \ 86 GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target); \
84 GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target); \ 87 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
85 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);
86 #else
87 #define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target) \
88 GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target); \
89 bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \
90 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \
91 &SK_MACRO_APPEND_LINE(gpuTracingEnabled) ); \
92 if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \
93 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
94 }
95 #endif
96 88
97 #define GR_CREATE_TRACE_MARKER_CONTEXT(name, context) \ 89 #define GR_CREATE_TRACE_MARKER_CONTEXT(name, context) \
98 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context) 90 /* Chromium tracing */ \
91 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
92 bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \
93 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \
94 &SK_MACRO_APPEND_LINE(gpuTracingEnabled)) ; \
95 if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \
96 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, SK_MACRO_APPEND_LINE(name _counter), context)\
97 } \
98 INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), name, \
99 "id", SK_MACRO_APPEND_LINE(name_counter));
99 100
100 #define GR_CREATE_TRACE_MARKER_CONTEXT1(name, context, arg1_name, arg1_val) \ 101 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, name_counter, context) \
101 INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context, arg1_name, arg1_val)
102
103 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context, ...) \
104 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \ 102 static const char* SK_MACRO_APPEND_LINE(static_name) = name; \
105 static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
106 INTERNAL_GR_CREATE_TRACE_MARKER_C(SK_MACRO_APPEND_LINE(static_name), \ 103 INTERNAL_GR_CREATE_TRACE_MARKER_C(SK_MACRO_APPEND_LINE(static_name), \
107 SK_MACRO_APPEND_LINE(name_counter), \ 104 name_counter, \
108 context, ##__VA_ARGS__) \ 105 context) \
109 sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter)); 106 sk_atomic_inc(&name_counter);
110 107
111 #define INTERNAL_GR_CREATE_TRACE_MARKER_C(name, name_counter, context, ...) \ 108 #define INTERNAL_GR_CREATE_TRACE_MARKER_C(name, name_counter, context, ...) \
112 GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \ 109 GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \
113 INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name, \
114 "id", name_counter, ##__VA_ARGS__);
115 110
116 #if GR_FORCE_GPU_TRACE_DEBUGGING 111 #define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \
117 #define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \ 112 GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \
118 GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \ 113 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
119 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);
120 #else
121 #define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context) \
122 GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context); \
123 bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \
124 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \
125 &SK_MACRO_APPEND_LINE(gpuTracingEnabled) ); \
126 if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \
127 SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter); \
128 }
129 #endif
130 114
131 #endif 115 #endif
OLDNEW
« no previous file with comments | « include/gpu/GrConfig.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698