commit ca8087f466407dd5981795d2754876cd44182582
author Mike Klein <mtklein@google.com> Mon Mar 18 09:01:39 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 18 16:59:06 2019 +0000
tree be1f8c2d3e80aee477271fe8a3df16bb1f9dcd9f
parent 01f8de478c5476afb023528e2d15735af5bcf2e1

rework --ignoreSigInt

Send it through the main signal handler so we can see resource stats and
what was running at the time we got the SIGINT, and print an FYI note
that we're ignoring it.

Change-Id: Id3bee87d8d07c3ee74b5443198327b7b14d12ddf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201867
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index a04b3dc..05c7675 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -291,8 +291,13 @@
     #endif
         fflush(stdout);
 
-        signal(sig, previous_handler[sig]);
-        raise(sig);
+        if (sig == SIGINT && FLAGS_ignoreSigInt) {
+            info("Ignoring signal %d because of --ignoreSigInt.\n"
+                 "This is probably a sign the bot is overloaded with work.\n", sig);
+        } else {
+            signal(sig, previous_handler[sig]);
+            raise(sig);
+        }
     }
 
     static void setup_crash_handler() {
@@ -300,10 +305,6 @@
         for (int sig : kSignals) {
             previous_handler[sig] = signal(sig, crash_handler);
         }
-
-        if (FLAGS_ignoreSigInt) {
-            signal(SIGINT, SIG_IGN);
-        }
     }
 #endif