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

Unified Diff: content/renderer/renderer_main.cc

Issue 9837053: Added code for renderer to cleanly exit. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed some comments. Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/chrome_render_process_observer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 306dee9aaf0ea6a511c53ae66884e431dc7abb29..99f2c06effe44ea6ce54c6df2514e7215f1de30c 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -126,6 +126,24 @@ class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
DISALLOW_COPY_AND_ASSIGN(RendererMessageLoopObserver);
};
+#if defined(RENDERER_CLEAN_EXIT)
+static void SigtermHandler(int signal_number)
+{
+ base::clean_exit(signal_number);
+}
+
+static void AddSigtermHandler()
+{
+ struct sigaction term_action;
+ int return_value;
+ memset(&term_action, 0, sizeof(term_action));
+ term_action.sa_handler = SigtermHandler;
+ sigfillset(&term_action.sa_mask);
+ return_value = sigaction(SIGTERM, &term_action, NULL);
+ CHECK(return_value==0) << "Unable to install SIGTERM handler\n";
+}
+#endif // defined(RENDERER_CLEAN_EXIT)
+
// mainline routine for running as the Renderer process
int RendererMain(const content::MainFunctionParams& parameters) {
TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
@@ -232,6 +250,10 @@ int RendererMain(const content::MainFunctionParams& parameters) {
startup_timer.Stop(); // End of Startup Time Measurement.
+#if defined(RENDERER_CLEAN_EXIT)
+ AddSigtermHandler();
+#endif
+
if (run_loop) {
#if defined(OS_MACOSX)
if (pool)
« no previous file with comments | « chrome/renderer/chrome_render_process_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698