remove DebugBreak calls which might generate crash in bin release

b-xiang · Sep 3, 2017 · d4b5eed · d4b5eed
1 parent 2cb48dc
commit d4b5eed
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/AirLib/include/common/common_utils/WorkerThread.hpp b/AirLib/include/common/common_utils/WorkerThread.hpp
@@ -264,7 +264,7 @@ class WorkerThread {
                     pending->execute();
                 }
                 catch (std::exception& e) {
-                    Utils::DebugBreak();
+                    //Utils::DebugBreak();
                     Utils::log(Utils::stringf("WorkerThread caught unhandled exception: %s", e.what()), Utils::kLogLevelError);
                 }
 

diff --git a/AirLib/include/controllers/MavLinkDroneController.hpp b/AirLib/include/controllers/MavLinkDroneController.hpp
@@ -675,8 +675,10 @@ struct MavLinkDroneController::impl {
             hil_node_->sendMessage(hil_gps);
         }
 
-        if (hil_gps.lat < 0.1f && hil_gps.lat > -0.1f)
-            Utils::DebugBreak();
+        if (hil_gps.lat < 0.1f && hil_gps.lat > -0.1f) {
+            //Utils::DebugBreak();
+            Utils::log("hil_gps.lat was too close to 0", Utils::kLogLevelError);
+        }
 
         std::lock_guard<std::mutex> guard(last_message_mutex_);
         last_gps_message_ = hil_gps;

diff --git a/AirLib/include/firmwares/simple_flight/AirSimSimpleFlightCommLink.hpp b/AirLib/include/firmwares/simple_flight/AirSimSimpleFlightCommLink.hpp
@@ -37,8 +37,8 @@ class AirSimSimpleFlightCommLink : public simple_flight::ICommLink {
 
     virtual void log(const std::string& message, int32_t log_level = ICommLink::kLogLevelInfo)
     {
-        if (log_level > 0)
-            Utils::DebugBreak();
+        //if (log_level > 0)
+        //    Utils::DebugBreak();
         messages_.push_back(std::string(message));
     }
 

diff --git a/AirLib/include/physics/FastPhysicsEngine.hpp b/AirLib/include/physics/FastPhysicsEngine.hpp
@@ -382,8 +382,10 @@ class FastPhysicsEngine : public PhysicsEngineBase {
             Thus new attitude is q0q1
             */
             next.pose.orientation = current_pose.orientation * angle_dt_q;
-            if (VectorMath::hasNan(next.pose.orientation))
-                Utils::DebugBreak();
+            if (VectorMath::hasNan(next.pose.orientation)) {
+                //Utils::DebugBreak();
+                Utils::log("orientation had NaN!", Utils::kLogLevelError);
+            }
 
             //re-normalize quaternion to avoid accumulating error
             next.pose.orientation.normalize();

diff --git a/AirLib/include/physics/PhysicsBody.hpp b/AirLib/include/physics/PhysicsBody.hpp
@@ -178,8 +178,10 @@ class PhysicsBody : public UpdatableObject {
     }
     void setKinematics(const Kinematics::State& state)
     {
-        if (VectorMath::hasNan(state.twist.linear))
-            Utils::DebugBreak();
+        if (VectorMath::hasNan(state.twist.linear)) {
+            //Utils::DebugBreak();
+            Utils::log("Linear velocity had NaN!", Utils::kLogLevelError);
+        }
 
         kinematics_.setState(state);
     }

diff --git a/AirLib/include/physics/World.hpp b/AirLib/include/physics/World.hpp
@@ -116,11 +116,11 @@ class World : public UpdatableContainer<UpdatableObject*> {
             update();
         }
         catch(const std::exception& ex) {
-            Utils::DebugBreak();
+            //Utils::DebugBreak();
             Utils::log(Utils::stringf("Exception occurred while updating world: %s", ex.what()), Utils::kLogLevelError);
         }
         catch(...) {
-            Utils::DebugBreak();
+            //Utils::DebugBreak();
             Utils::log("Exception occurred while updating world", Utils::kLogLevelError);
         }