Auto merge of #11530 - jdm:sigsegv, r=metajack

bors-servo · web-flow · commit 51d5bd3ef036 · 2016-06-20T16:24:14.000-05:00
Obtain backtraces automatically from segfaults  This enables more meaningful output from observing hard crashes outside of GDB through the judicious use of a SIGSEGV signal handler. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #9371 (github issue number if applicable). - [X] There are tests for these changes OR   --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11530)
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
@@ -571,6 +571,15 @@ impl TestBindingMethods for TestBinding {
     fn FuncControlledAttributeEnabled(&self) -> bool { false }
     fn FuncControlledMethodDisabled(&self) {}
     fn FuncControlledMethodEnabled(&self) {}
+
+    #[allow(unsafe_code)]
+    fn CrashHard(&self) {
+        static READ_ONLY_VALUE: i32 = 0;
+        unsafe {
+            let p: *mut u32 = &READ_ONLY_VALUE as *const _ as *mut _;
+            ptr::write_volatile(p, 0xbaadc0de);
+        }
+    }
 }
 
 impl TestBinding {
diff --git a/components/script/dom/webidls/TestBinding.webidl b/components/script/dom/webidls/TestBinding.webidl
@@ -456,3 +456,8 @@ interface TestBinding {
   [Func="TestBinding::condition_satisfied"]
   const unsigned short funcControlledConstEnabled = 0;
 };
+
+partial interface TestBinding {
+  [Pref="dom.testable_crash.enabled"]
+  void crashHard();
+};
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -74,6 +74,10 @@ euclid = "0.6.4"
 libc = "0.2"
 url = "1.0.0"
 
+[target.'cfg(not(target_os = "android"))'.dependencies]
+sig = "0.1"
+backtrace = "0.2"
+
 [target.'cfg(target_os = "android")'.dependencies]
 log = "0.3"
 android_glue = "0.1.3"
diff --git a/components/servo/main.rs b/components/servo/main.rs
@@ -15,11 +15,13 @@
 //!
 //! [glutin]: https://github.com/tomaka/glutin
 
-#![feature(start)]
+#![feature(start, core_intrinsics)]
 
 #[cfg(target_os = "android")]
 #[macro_use]
 extern crate android_glue;
+#[cfg(not(target_os = "android"))]
+extern crate backtrace;
 extern crate env_logger;
 // The window backed by glutin
 extern crate glutin_app as app;
@@ -30,7 +32,11 @@ extern crate libc;
 extern crate log;
 // The Servo engine
 extern crate servo;
+#[cfg(not(target_os = "android"))]
+#[macro_use]
+extern crate sig;
 
+#[cfg(not(target_os = "android"))]
 use servo::Browser;
 use servo::compositing::windowing::WindowEvent;
 use servo::util::opts::{self, ArgumentParsingResult};
@@ -48,7 +54,33 @@ pub mod platform {
     pub fn deinit() {}
 }
 
+#[cfg(not(target_os = "android"))]
+fn install_crash_handler() {
+    use backtrace::Backtrace;
+    use sig::ffi::Sig;
+    use std::intrinsics::abort;
+    use std::thread;
+
+    fn handler(_sig: i32) {
+        let name = thread::current().name()
+                                    .map(|n| format!(" for thread \"{}\"", n))
+                                    .unwrap_or("".to_owned());
+        println!("Stack trace{}\n{:?}", name, Backtrace::new());
+        unsafe {
+            abort();
+        }
+    }
+
+    signal!(Sig::SEGV, handler);
+}
+
+#[cfg(target_os = "android")]
+fn install_crash_handler() {
+}
+
 fn main() {
+    install_crash_handler();
+
     // Parse the command line options and store them globally
     let opts_result = opts::from_cmdline_args(&*args());
 
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git a/resources/prefs.json b/resources/prefs.json
@@ -4,6 +4,7 @@
   "dom.mouseevent.which.enabled": false,
   "dom.mozbrowser.enabled": false,
   "dom.serviceworker.timeout_seconds": 60,
+  "dom.testable_crash.enabled": false,
   "dom.testbinding.enabled": false,
   "gfx.webrender.enabled": false,
   "js.baseline.enabled": true,
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6952,6 +6952,12 @@
             "url": "/_mozilla/mozilla/service-workers/service-worker-registration.html"
           }
         ],
+        "mozilla/sigsegv.html": [
+          {
+            "path": "mozilla/sigsegv.html",
+            "url": "/_mozilla/mozilla/sigsegv.html"
+          }
+        ],
         "mozilla/storage.html": [
           {
             "path": "mozilla/storage.html",
diff --git a/tests/wpt/mozilla/meta/mozilla/sigsegv.html.ini b/tests/wpt/mozilla/meta/mozilla/sigsegv.html.ini
@@ -0,0 +1,4 @@
+[sigsegv.html]
+  type: testharness
+  prefs: [dom.testbinding.enabled:true,dom.testable_crash.enabled:true]
+  expected: CRASH
diff --git a/tests/wpt/mozilla/tests/mozilla/sigsegv.html b/tests/wpt/mozilla/tests/mozilla/sigsegv.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<meta charset="utf-8">
+<title></title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+(new TestBinding()).crashHard();
+</script>

Original file line number	Diff line number	Diff line change
`@@ -6952,6 +6952,12 @@`
`6952`	`6952`	`"url": "/_mozilla/mozilla/service-workers/service-worker-registration.html"`
`6953`	`6953`	`}`
`6954`	`6954`	`],`
	`6955`	`+ "mozilla/sigsegv.html": [`
	`6956`	`+ {`
	`6957`	`+ "path": "mozilla/sigsegv.html",`
	`6958`	`+ "url": "/_mozilla/mozilla/sigsegv.html"`
	`6959`	`+ }`
	`6960`	`+ ],`
`6955`	`6961`	`"mozilla/storage.html": [`
`6956`	`6962`	`{`
`6957`	`6963`	`"path": "mozilla/storage.html",`