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

Side by Side Diff: chrome/app/chrome_main.cc

Issue 402723002: Experimentally disable termination on heap corrruption in order to measure the contribution of this… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comment date. Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "content/public/app/content_main.h" 7 #include "content/public/app/content_main.h"
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include "base/debug/dump_without_crashing.h" 10 #include "base/debug/dump_without_crashing.h"
11 #include "base/win/win_util.h" 11 #include "base/win/win_util.h"
12 #include "chrome/common/chrome_constants.h" 12 #include "chrome/common/chrome_constants.h"
13 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h"
13 14
14 #define DLLEXPORT __declspec(dllexport) 15 #define DLLEXPORT __declspec(dllexport)
15 16
16 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling. 17 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
17 extern "C" { 18 extern "C" {
18 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, 19 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
19 sandbox::SandboxInterfaceInfo* sandbox_info); 20 sandbox::SandboxInterfaceInfo* sandbox_info);
20 } 21 }
21 #elif defined(OS_POSIX) 22 #elif defined(OS_POSIX)
22 extern "C" { 23 extern "C" {
(...skipping 19 matching lines...) Expand all
42 params.sandbox_info = sandbox_info; 43 params.sandbox_info = sandbox_info;
43 44
44 // SetDumpWithoutCrashingFunction must be passed the DumpProcess function 45 // SetDumpWithoutCrashingFunction must be passed the DumpProcess function
45 // from the EXE and not from the DLL in order for DumpWithoutCrashing to 46 // from the EXE and not from the DLL in order for DumpWithoutCrashing to
46 // function correctly. 47 // function correctly.
47 typedef void (__cdecl *DumpProcessFunction)(); 48 typedef void (__cdecl *DumpProcessFunction)();
48 DumpProcessFunction DumpProcess = reinterpret_cast<DumpProcessFunction>( 49 DumpProcessFunction DumpProcess = reinterpret_cast<DumpProcessFunction>(
49 ::GetProcAddress(::GetModuleHandle(chrome::kBrowserProcessExecutableName), 50 ::GetProcAddress(::GetModuleHandle(chrome::kBrowserProcessExecutableName),
50 "DumpProcessWithoutCrash")); 51 "DumpProcessWithoutCrash"));
51 base::debug::SetDumpWithoutCrashingFunction(DumpProcess); 52 base::debug::SetDumpWithoutCrashingFunction(DumpProcess);
53
54 params.enable_termination_on_heap_corruption =
55 !ShouldExperimentallyDisableTerminateOnHeapCorruption();
52 #else 56 #else
53 params.argc = argc; 57 params.argc = argc;
54 params.argv = argv; 58 params.argv = argv;
55 #endif 59 #endif
56 60
57 int rv = content::ContentMain(params); 61 int rv = content::ContentMain(params);
58 62
59 #if defined(OS_WIN) 63 #if defined(OS_WIN)
60 base::win::SetShouldCrashOnProcessDetach(false); 64 base::win::SetShouldCrashOnProcessDetach(false);
61 #endif 65 #endif
62 66
63 return rv; 67 return rv;
64 } 68 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_win.cc » ('j') | chrome/common/terminate_on_heap_corruption_experiment_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698