commit a573df154b900b6618d0b46f8d2635a8dba1082f
author Brian Silverman <bsilver16384@gmail.com> Sun Mar 08 17:24:47 2020 -0700
committer Gerrit Code Review <gerrit@robotics.mvla.net> Sun Mar 08 17:24:47 2020 -0700
tree 4fd8a84ded65c49d382c1b92f9c07544a5fb8d43
parent ce9bc28306d8da81afcf441c6ba4b9e61d7db7dc
parent af5a5065ce065c84e4aab82d1e85a5ececb7dbcf

Merge changes I24c90237,I4bf3aba1,If158322f

* changes:
  Fixing broken calibrate_intrinsics.  Write files to json
  Send only the first match (of two choices).  Keeps from sending bad matches
  Adding calibration files for robot using cafeteria target

third_party/google-glog/src/logging.cc

diff --git a/third_party/google-glog/src/logging.cc b/third_party/google-glog/src/logging.cc
index ad4047d..2bfce3d 100644
--- a/third_party/google-glog/src/logging.cc
+++ b/third_party/google-glog/src/logging.cc
@@ -1459,6 +1459,13 @@
   // someone else can use them (as long as they flush afterwards)
   if (data_->severity_ == GLOG_FATAL && exit_on_dfatal) {
     if (data_->first_fatal_) {
+      {
+        // Put this back on SCHED_OTHER by default.
+        struct sched_param param;
+        param.sched_priority = 0;
+        sched_setscheduler(0, SCHED_OTHER, &param);
+      }
+
       // Store crash information so that it is accessible from within signal
       // handlers that may be invoked later.
       RecordCrashReason(&crash_reason);

third_party/google-glog/src/signalhandler.cc

diff --git a/third_party/google-glog/src/signalhandler.cc b/third_party/google-glog/src/signalhandler.cc
index c3a0f80..049efa5 100644
--- a/third_party/google-glog/src/signalhandler.cc
+++ b/third_party/google-glog/src/signalhandler.cc
@@ -308,6 +308,14 @@
       sleep(1);
     }
   }
+
+  {
+    // Put this back on SCHED_OTHER by default.
+    struct sched_param param;
+    param.sched_priority = 0;
+    sched_setscheduler(0, SCHED_OTHER, &param);
+  }
+
   // This is the first time we enter the signal handler.  We are going to
   // do some interesting stuff from here.
   // TODO(satorux): We might want to set timeout here using alarm(), but