fixes

Author: nia-e

no_alloc.json

@@ -0,0 +1,46 @@
+{
+  "backtraces": {
+    "mean": 2.4533926632,
+    "stddev": 0.034804963342590305
+  },
+  "big-allocs": {
+    "mean": 0.176591686875,
+    "stddev": 0.006329187267744716
+  },
+  "mse": {
+    "mean": 0.7929701672,
+    "stddev": 0.026615889537335267
+  },
+  "range-iteration": {
+    "mean": 4.2779571954,
+    "stddev": 0.04795180865203916
+  },
+  "serde1": {
+    "mean": 2.6164086034,
+    "stddev": 0.06291730526924717
+  },
+  "serde2": {
+    "mean": 5.798478193,
+    "stddev": 0.08070440346994077
+  },
+  "slice-chunked": {
+    "mean": 0.47576527583333333,
+    "stddev": 0.01340186535694893
+  },
+  "slice-get-unchecked": {
+    "mean": 0.784984716,
+    "stddev": 0.01936144811041201
+  },
+  "string-replace": {
+    "mean": 0.5457706088000001,
+    "stddev": 0.022212161121800092
+  },
+  "unicode": {
+    "mean": 3.4395730980000003,
+    "stddev": 0.08725374514703972
+  },
+  "zip-equal": {
+    "mean": 3.023844411,
+    "stddev": 0.044728068907096435
+  }
+}

src/shims/trace/parent.rs

@@ -347,7 +347,8 @@ fn wait_for_signal(
     }
     // Repeatedly call `waitid` until we get the signal we want, or the process dies
     loop {
-        let stat = wait::waitid(wait::Id::Pid(pid), WAIT_FLAGS).map_err(|_| ExecError::Shrug)?;
+        let stat =
+            wait::waitid(wait::Id::Pid(pid), WAIT_FLAGS).map_err(|_| ExecError::Died(None))?;
         let signal = match stat {
             // Report the cause of death, if we know it
             wait::WaitStatus::Exited(_, code) => {
@@ -367,10 +368,7 @@ fn wait_for_signal(
         if signal == wait_signal {
             break;
         } else {
-            match ptrace::cont(pid, None) {
-                Ok(_) => (),
-                Err(_) => return Err(ExecError::Shrug),
-            }
+            ptrace::cont(pid, None).map_err(|_| ExecError::Died(None))?;
         }
     }
     Ok(())