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

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed)

Created:
9 years, 8 months ago by scheib
Modified:
9 years, 7 months ago
CC:
chromium-reviews
Visibility:
Public.

Description

Merge gpu_trace_event back into base/debug/trace_event. Initial land attempt at http://codereview.chromium.org/6551019/ gpu_trace_event fork at http://codereview.chromium.org/6691013 - gpu_trace_event renamed to base/debug/trace_event and modified as appropriate for base::debug - Unit Tests implemented for trace_event - gpu_common library removed (was added only for gpu_trace_event) - Existing calls to trace_event suffixed with _ETW to make ETW calls (see decisions and incremental plans at end of 6551019) - GPU trace calls renamed to new calls. - Tracing switch removed from test_shell, as linux log file support removed. BUG=79509 TEST=trace_event_win_unittest and about:gpu Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84284 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84486 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84739

Patch Set 1 : "fix gpu/command_buffer/client/cmd_buffer_helper to new macros" #

Total comments: 55

Patch Set 2 : merge to r83717 #

Total comments: 60

Patch Set 3 : fixes for latest siggi review; merge with r83927 #

Total comments: 10

Patch Set 4 : Callbacks modified to new ref counted form to avoid lock #

Patch Set 5 : Flaky test fixed, found race in my test #

Total comments: 48

Patch Set 6 : merge to 84062 #

Total comments: 8

Patch Set 7 : Addressing latest siggi nits #

Total comments: 6

Patch Set 8 : nits & merge r84136 #

Total comments: 1

Patch Set 9 : shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 #

Total comments: 9
Unified diffs Side-by-side diffs Delta from patch set Stats (+1443 lines, -1258 lines) Patch
M base/base.gyp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M base/base.gypi View 1 1 chunk +0 lines, -1 line 0 comments Download
M base/debug/trace_event.h View 1 2 3 4 5 6 7 8 2 chunks +451 lines, -107 lines 5 comments Download
M base/debug/trace_event.cc View 1 2 3 4 5 6 7 8 2 chunks +335 lines, -117 lines 1 comment Download
A base/debug/trace_event_unittest.cc View 1 2 3 4 5 6 1 chunk +397 lines, -0 lines 0 comments Download
M base/debug/trace_event_win.h View 7 chunks +10 lines, -36 lines 0 comments Download
M base/debug/trace_event_win.cc View 5 chunks +24 lines, -23 lines 0 comments Download
M base/debug/trace_event_win_unittest.cc View 1 11 chunks +26 lines, -23 lines 0 comments Download
M chrome/app/client_util.cc View 1 2 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/automation/automation_provider.cc View 1 2 3 4 5 4 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/automation/automation_provider_win.cc View 1 4 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/browser_main.cc View 1 2 3 4 5 6 7 8 4 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/external_tab_container_win.cc View 1 2 3 4 5 6 7 8 2 chunks +3 lines, -3 lines 0 comments Download
M chrome/chrome_browser.gypi View 1 2 3 4 5 6 7 8 1 chunk +0 lines, -1 line 0 comments Download
M chrome/common/sandbox_policy.cc View 1 2 3 4 5 6 7 8 3 chunks +3 lines, -3 lines 0 comments Download
M chrome_frame/chrome_active_document.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome_frame/chrome_frame_activex.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome_frame/chrome_frame_automation.cc View 4 chunks +4 lines, -4 lines 0 comments Download
M content/browser/gpu_process_host.cc View 1 2 3 chunks +2 lines, -2 lines 0 comments Download
M content/browser/gpu_process_host_ui_shim.cc View 1 2 3 4 5 6 2 chunks +1 line, -1 line 0 comments Download
M content/browser/renderer_host/render_widget_host.cc View 1 2 3 chunks +2 lines, -2 lines 0 comments Download
M content/browser/trace_controller.h View 1 2 3 2 chunks +4 lines, -1 line 0 comments Download
M content/browser/trace_controller.cc View 1 2 3 4 5 6 7 8 7 chunks +18 lines, -11 lines 0 comments Download
M content/browser/trace_message_filter.cc View 1 2 3 4 5 6 1 chunk +2 lines, -1 line 0 comments Download
M content/common/child_trace_message_filter.h View 1 2 3 4 5 6 7 8 3 chunks +5 lines, -1 line 0 comments Download
M content/common/child_trace_message_filter.cc View 1 2 3 4 5 6 7 8 3 chunks +23 lines, -13 lines 2 comments Download
M content/common/gpu/gpu_command_buffer_stub.cc View 1 2 3 4 5 6 7 8 5 chunks +4 lines, -4 lines 0 comments Download
M content/renderer/command_buffer_proxy.cc View 1 3 chunks +2 lines, -2 lines 0 comments Download
M content/renderer/render_thread.cc View 1 2 chunks +2 lines, -2 lines 0 comments Download
M content/renderer/render_widget.cc View 1 2 4 chunks +3 lines, -3 lines 0 comments Download
M content/renderer/renderer_gl_context.cc View 1 4 chunks +3 lines, -3 lines 0 comments Download
M content/renderer/renderer_main.cc View 1 2 chunks +4 lines, -4 lines 0 comments Download
M gpu/command_buffer/client/cmd_buffer_helper.cc View 1 6 chunks +6 lines, -6 lines 0 comments Download
M gpu/command_buffer/client/gles2_implementation.cc View 1 2 3 4 5 6 7 8 21 chunks +21 lines, -21 lines 0 comments Download
A gpu/command_buffer/common/trace_event.h View 1 1 chunk +30 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder.cc View 1 8 chunks +7 lines, -7 lines 0 comments Download
M gpu/command_buffer/service/gpu_scheduler.cc View 1 2 3 4 5 6 7 8 2 chunks +2 lines, -2 lines 0 comments Download
D gpu/common/gpu_trace_event.h View 1 1 chunk +0 lines, -439 lines 0 comments Download
D gpu/common/gpu_trace_event.cc View 1 1 chunk +0 lines, -330 lines 0 comments Download
M gpu/gpu.gyp View 1 2 3 4 5 6 7 8 9 chunks +8 lines, -32 lines 1 comment Download
M ppapi/proxy/host_dispatcher.cc View 1 2 3 4 5 6 7 8 3 chunks +7 lines, -7 lines 0 comments Download
M ppapi/proxy/plugin_dispatcher.cc View 1 2 3 4 5 6 7 8 3 chunks +7 lines, -7 lines 0 comments Download
M webkit/glue/webkit_glue.gypi View 1 2 3 4 5 6 7 8 1 chunk +0 lines, -1 line 0 comments Download
M webkit/glue/webkitclient_impl.cc View 1 2 3 4 5 6 7 8 2 chunks +2 lines, -7 lines 0 comments Download
M webkit/tools/test_shell/test_shell_main.cc View 1 chunk +0 lines, -3 lines 0 comments Download
M webkit/tools/test_shell/test_shell_switches.h View 1 2 chunks +1 line, -2 lines 0 comments Download
M webkit/tools/test_shell/test_shell_switches.cc View 1 2 chunks +1 line, -4 lines 0 comments Download
M webkit/tools/test_shell/test_shell_win.cc View 1 chunk +1 line, -1 line 0 comments Download
M webkit/tools/test_shell/test_webview_delegate.cc View 1 3 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 23 (0 generated)
scheib
Let's see if we can merge gpu_trace_event back into base/debug/trace_event.
9 years, 8 months ago (2011-04-15 01:15:11 UTC) #1
scheib
Trybots: they're failing since I was on TOT and the trybots running LKGR which hasn't ...
9 years, 8 months ago (2011-04-15 01:16:50 UTC) #2
Sigurður Ásgeirsson
I'd like to rehash some of my comments from a previous incarnation of this CL: ...
9 years, 8 months ago (2011-04-15 14:24:55 UTC) #3
scheib
On 2011/04/15 14:24:55, Ruðrugis wrote: > I'd like to rehash some of my comments from ...
9 years, 8 months ago (2011-04-15 15:29:32 UTC) #4
Sigurður Ásgeirsson
On Fri, Apr 15, 2011 at 11:29 AM, <scheib@chromium.org> wrote: > On 2011/04/15 14:24:55, Ruðrugis ...
9 years, 8 months ago (2011-04-15 15:35:06 UTC) #5
Sigurður Ásgeirsson
Looks pretty good overall, I have a bunch of nits. http://codereview.chromium.org/6862002/diff/8002/base/debug/trace_event.cc File base/debug/trace_event.cc (right): http://codereview.chromium.org/6862002/diff/8002/base/debug/trace_event.cc#newcode49 ...
9 years, 8 months ago (2011-04-15 17:41:45 UTC) #6
scheib
Noting some test suggestions siggi brought up in a chat: - Function even if destroyed ...
9 years, 8 months ago (2011-04-21 17:47:18 UTC) #7
scheib
Tests implemented (less the lazy evaluation, issue filed). nits addressed. Flush holding a lock over ...
9 years, 8 months ago (2011-04-27 21:20:10 UTC) #8
scheib
Some of the build bots flaked out on my new tests - which I'll dig ...
9 years, 8 months ago (2011-04-27 23:01:22 UTC) #9
Sigurður Ásgeirsson
Hi Vincent, I have an office move today and some stuff I need to get ...
9 years, 8 months ago (2011-04-28 13:17:16 UTC) #10
Sigurður Ásgeirsson
Hi Vincent, I took another quick look, it looks much better, but there are still ...
9 years, 7 months ago (2011-05-02 19:28:41 UTC) #11
jbates
http://codereview.chromium.org/6862002/diff/25001/base/debug/trace_event.cc File base/debug/trace_event.cc (right): http://codereview.chromium.org/6862002/diff/25001/base/debug/trace_event.cc#newcode46 base/debug/trace_event.cc:46: value_.as_string_refptr = NULL; it's harmless, but setting to NULL ...
9 years, 7 months ago (2011-05-03 23:49:09 UTC) #12
scheib
siggi's and jbates' comments addressed. Please review modifications. A test is still flaky and I'm ...
9 years, 7 months ago (2011-05-04 02:14:14 UTC) #13
Sigurður Ásgeirsson
sweet, one more round of nits. Last one I hope... http://codereview.chromium.org/6862002/diff/30048/base/debug/trace_event.cc File base/debug/trace_event.cc (right): http://codereview.chromium.org/6862002/diff/30048/base/debug/trace_event.cc#newcode23 ...
9 years, 7 months ago (2011-05-04 18:58:08 UTC) #14
scheib
brettw: added as a base/ owner. siggi: nits fixed. http://codereview.chromium.org/6862002/diff/30048/base/debug/trace_event.cc File base/debug/trace_event.cc (right): http://codereview.chromium.org/6862002/diff/30048/base/debug/trace_event.cc#newcode23 base/debug/trace_event.cc:23: ...
9 years, 7 months ago (2011-05-05 00:06:36 UTC) #15
Sigurður Ásgeirsson
LGTM as far as the base/trace_event changes are concerned. http://codereview.chromium.org/6862002/diff/30053/base/debug/trace_event.cc File base/debug/trace_event.cc (right): http://codereview.chromium.org/6862002/diff/30053/base/debug/trace_event.cc#newcode239 base/debug/trace_event.cc:239: ...
9 years, 7 months ago (2011-05-05 14:58:55 UTC) #16
jbates
LGTM
9 years, 7 months ago (2011-05-05 16:40:31 UTC) #17
scheib
Nits addressed. http://codereview.chromium.org/6862002/diff/30053/base/debug/trace_event.cc File base/debug/trace_event.cc (right): http://codereview.chromium.org/6862002/diff/30053/base/debug/trace_event.cc#newcode239 base/debug/trace_event.cc:239: CHECK(!strchr(name, '"')) << "Names may not contain ...
9 years, 7 months ago (2011-05-05 16:50:28 UTC) #18
brettw
LGTM for base, I didn't really check the details. http://codereview.chromium.org/6862002/diff/32059/base/debug/trace_event.h File base/debug/trace_event.h (right): http://codereview.chromium.org/6862002/diff/32059/base/debug/trace_event.h#newcode191 base/debug/trace_event.h:191: ...
9 years, 7 months ago (2011-05-05 17:38:03 UTC) #19
scheib
Land attempt revealed some issues, which have been resolved with these changes. See comments to ...
9 years, 7 months ago (2011-05-09 23:39:51 UTC) #20
jbates
LGTM - pair programmed some of these changes. On 2011/05/09 23:39:51, scheib wrote: > Land ...
9 years, 7 months ago (2011-05-10 00:04:11 UTC) #21
nduca
LGTM
9 years, 7 months ago (2011-05-10 00:04:56 UTC) #22
Sigurður Ásgeirsson
9 years, 7 months ago (2011-05-10 13:44:52 UTC) #23
lgtm

http://codereview.chromium.org/6862002/diff/46001/base/debug/trace_event.h
File base/debug/trace_event.h (right):

http://codereview.chromium.org/6862002/diff/46001/base/debug/trace_event.h#ne...
base/debug/trace_event.h:57: // we tollerate some data loss while the system is
being enabled/disabled and
nit: tollerate -> tolerate

http://codereview.chromium.org/6862002/diff/46001/content/common/child_trace_...
File content/common/child_trace_message_filter.cc (right):

http://codereview.chromium.org/6862002/diff/46001/content/common/child_trace_...
content/common/child_trace_message_filter.cc:29: {
nit: move up to previous line

Powered by Google App Engine
This is Rietveld 408576698