From 5dc43562e534854bf93c28d7044e375fea56ba2c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 1 Nov 2017 17:05:05 +0000 Subject: [PATCH] Cleaned up assert logging. --- src/lib/api/core/ApiClientInterop.cpp | 1 + src/lib/api/core/ApiServerInterop.cpp | 1 + src/lib/config/ConfigDownloader.cpp | 2 + src/lib/config/tests/HTTPServer.cpp | 1 + src/lib/logging/Common.h | 2 + src/lib/logging/Logger.h | 9 ++-- src/lib/logging/LoggerHub.cpp | 2 + src/lib/logging/Sink.cpp | 1 + src/lib/os/os.cpp | 7 +-- src/lib/os/os.h | 1 - src/lib/quickbus/core/LocalNode.cpp | 1 + src/lib/quickbus/network/QBConnection.cpp | 1 + .../quickbus/network/QBConnectionManager.cpp | 1 + src/lib/quickbus/rpc/RPCServer.cpp | 1 + src/lib/utils/Dispatcher.h | 1 - src/lib/utils/HTTPStream.cpp | 1 + src/lib/utils/SharedList.h | 1 + src/lib/utils/bts_assert.h | 14 +++-- src/lib/utils/bts_debugger.h | 52 +++++++++++++++---- src/server/sparkd/jetfix/codec/f_toa.h | 3 +- 20 files changed, 74 insertions(+), 29 deletions(-) diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index 6912522cc..8724d5de1 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -2,6 +2,7 @@ #include "lib/quickbus/quickbus.h" #include "lib/config/config.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include "../public/ServiceContext.h" #include "../public/Result.h" diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib/api/core/ApiServerInterop.cpp index 168281c2f..89182710c 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib/api/core/ApiServerInterop.cpp @@ -1,6 +1,7 @@ #include "ApiServerInterop.h" #include "lib/quickbus/quickbus.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" namespace bts { namespace api { diff --git a/src/lib/config/ConfigDownloader.cpp b/src/lib/config/ConfigDownloader.cpp index b25e73bda..2c6e94af8 100755 --- a/src/lib/config/ConfigDownloader.cpp +++ b/src/lib/config/ConfigDownloader.cpp @@ -1,3 +1,5 @@ +#include "lib/utils/windows_wrapper.h" + #include "ConfigDownloader.h" #include diff --git a/src/lib/config/tests/HTTPServer.cpp b/src/lib/config/tests/HTTPServer.cpp index 3c1e189f8..72f18ebdf 100755 --- a/src/lib/config/tests/HTTPServer.cpp +++ b/src/lib/config/tests/HTTPServer.cpp @@ -1,5 +1,6 @@ #include "HTTPServer.h" +#include "lib/utils/bts_assert.h" using boost::asio::ip::tcp; diff --git a/src/lib/logging/Common.h b/src/lib/logging/Common.h index 1e9488534..a1f98f084 100644 --- a/src/lib/logging/Common.h +++ b/src/lib/logging/Common.h @@ -1,5 +1,7 @@ #pragma once +#include "lib/utils/windows_wrapper.h" + #include #include #include diff --git a/src/lib/logging/Logger.h b/src/lib/logging/Logger.h index 365cd9b31..2d80391aa 100644 --- a/src/lib/logging/Logger.h +++ b/src/lib/logging/Logger.h @@ -2,7 +2,6 @@ #include "MsgPacking.h" #include "LogRec.h" -#include "lib/utils/bts_assert.h" #include #include @@ -38,7 +37,7 @@ public: void enqueue (Subsystem subsystem,Level lv, const char*file, int line, const char *msg_template, Args&&... msg_args) { - bts_assert(_active); + assert(_active); lock(); if (lv.ordinal >= _filter[subsystem.ordinal].ordinal) { if (_wcursor == _write_q->size()) @@ -123,7 +122,7 @@ public: void mark_inactive() { lock(); - bts_assert(_active); + assert(_active); _active=false; unlock(); } @@ -131,8 +130,8 @@ public: ~Logger() { #ifndef WIN32 - bts_assert(!_active); - bts_assert(_wcursor == 0); + assert(!_active); + assert(_wcursor == 0); #endif } diff --git a/src/lib/logging/LoggerHub.cpp b/src/lib/logging/LoggerHub.cpp index f8838c03a..37aaf35f0 100644 --- a/src/lib/logging/LoggerHub.cpp +++ b/src/lib/logging/LoggerHub.cpp @@ -4,6 +4,8 @@ #include "lib/utils/bts_chrono.h" #include "Logger.h" #include "lib/os/os.h" +#include "lib/utils/bts_assert.h" + #include #include #include diff --git a/src/lib/logging/Sink.cpp b/src/lib/logging/Sink.cpp index c2cc1a5d3..79e77664b 100644 --- a/src/lib/logging/Sink.cpp +++ b/src/lib/logging/Sink.cpp @@ -4,6 +4,7 @@ #include "lib/os/os.h" #include "lib/utils/datetime.h" #include "lib/utils/file_utils.h" +#include "lib/utils/bts_assert.h" #include #include diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index 4ccdaf173..26f213e5d 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -991,11 +991,6 @@ BTS_EXPORT std::string host_ip (std::string const &src_interface_name) return default_ip; } -BTS_EXPORT void debug_break() -{ - DEBUG_BREAK(); -} - BTS_EXPORT void set_thread_name(std::string const&n) {set_thread_name(n.c_str());} @@ -1027,7 +1022,7 @@ BTS_EXPORT void set_thread_name(const char* name) RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info); #ifdef _MSC_VER } - __except(EXCEPTION_EXECUTE_HANDLER) + __except(EXCEPTION_EXECUTE_HANDLER) { } #endif diff --git a/src/lib/os/os.h b/src/lib/os/os.h index 80ebe8b30..28cda16ce 100755 --- a/src/lib/os/os.h +++ b/src/lib/os/os.h @@ -72,7 +72,6 @@ BTS_EXPORT std::string username(); BTS_EXPORT char* strncpy(char* dest, const char* src, size_t count); BTS_EXPORT void setenv(const char* name, const char* value); -BTS_EXPORT void debug_break(); BTS_EXPORT void set_thread_name(std::string const&); BTS_EXPORT void set_thread_name(const char* name); diff --git a/src/lib/quickbus/core/LocalNode.cpp b/src/lib/quickbus/core/LocalNode.cpp index 2b7cf01f6..05e795dc9 100644 --- a/src/lib/quickbus/core/LocalNode.cpp +++ b/src/lib/quickbus/core/LocalNode.cpp @@ -4,6 +4,7 @@ #include "lib/quickbus/routing/Router.h" #include "lib/quickbus/routing/NodeID.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/network/QBConnection.cpp b/src/lib/quickbus/network/QBConnection.cpp index 585dc7d17..c1fba091a 100644 --- a/src/lib/quickbus/network/QBConnection.cpp +++ b/src/lib/quickbus/network/QBConnection.cpp @@ -4,6 +4,7 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/datetime.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include "lib/quickbus/routing/Router.h" #include "lib/quickbus/network/endpoint_description.h" diff --git a/src/lib/quickbus/network/QBConnectionManager.cpp b/src/lib/quickbus/network/QBConnectionManager.cpp index 21c7a07bd..135a27274 100644 --- a/src/lib/quickbus/network/QBConnectionManager.cpp +++ b/src/lib/quickbus/network/QBConnectionManager.cpp @@ -4,6 +4,7 @@ #include "lib/quickbus/network/QBConnection.h" #include "lib/logging/logging.h" #include "lib/quickbus/network/endpoint_description.h" +#include "lib/utils/bts_assert.h" #include "lib/config/protos/quickbus_cfg.pb.h" diff --git a/src/lib/quickbus/rpc/RPCServer.cpp b/src/lib/quickbus/rpc/RPCServer.cpp index f3ffa41d6..bbeb2bf3d 100644 --- a/src/lib/quickbus/rpc/RPCServer.cpp +++ b/src/lib/quickbus/rpc/RPCServer.cpp @@ -5,6 +5,7 @@ #include "lib/quickbus/rpc/rpc_utils.h" #include "lib/quickbus/core/Advertisement.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/Dispatcher.h b/src/lib/utils/Dispatcher.h index cb4b5402f..eda3b33b5 100755 --- a/src/lib/utils/Dispatcher.h +++ b/src/lib/utils/Dispatcher.h @@ -2,7 +2,6 @@ #pragma once #include "lib/utils/bts_no_copy.h" -#include "lib/utils/bts_assert.h" #include "lib/utils/bts_export.h" #include diff --git a/src/lib/utils/HTTPStream.cpp b/src/lib/utils/HTTPStream.cpp index 742136464..543ac69c6 100755 --- a/src/lib/utils/HTTPStream.cpp +++ b/src/lib/utils/HTTPStream.cpp @@ -1,6 +1,7 @@ #include "HTTPStream.h" #include "lib/logging/logging.h" #include "lib/utils/defer.h" +#include "lib/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/SharedList.h b/src/lib/utils/SharedList.h index 1a4b51846..7e867fd57 100644 --- a/src/lib/utils/SharedList.h +++ b/src/lib/utils/SharedList.h @@ -5,6 +5,7 @@ #include "lib/utils/SharedMemory.h" #include "lib/utils/bts_array_size.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include "lib/os/os.h" #include "lib/config/config.h" diff --git a/src/lib/utils/bts_assert.h b/src/lib/utils/bts_assert.h index 142d2473a..71beae0ec 100644 --- a/src/lib/utils/bts_assert.h +++ b/src/lib/utils/bts_assert.h @@ -1,5 +1,9 @@ #pragma once #include +#include + +#include "lib/logging/logging.h" +#include "lib/utils/bts_debugger.h" #ifdef _WIN32 #define TERMINATE ::_exit(-1); @@ -7,10 +11,12 @@ #define TERMINATE abort (); #endif -#define bts_assert_msg(EXP, msg) do { \ - if (!(EXP)) { \ - std::cerr << "Assert failure: " << __FILE__ << ":" << __LINE__ << " Exp: " << #EXP << std::endl; \ - TERMINATE; \ +#define bts_assert_msg(EXP, msg) do { \ + if (!(EXP)) { \ + LOG(Assert,Fatal, "Assert failure: {} {}",std::string(#EXP),std::string(msg) ); \ + if (is_debugger_present()) \ + debug_break(); \ + TERMINATE; \ }} while(0) #define bts_assert(EXP) bts_assert_msg(EXP, "") diff --git a/src/lib/utils/bts_debugger.h b/src/lib/utils/bts_debugger.h index 04e0f0a00..0a7efc1ee 100755 --- a/src/lib/utils/bts_debugger.h +++ b/src/lib/utils/bts_debugger.h @@ -1,16 +1,46 @@ -#ifndef BTS_DEBUGGER_H_ -#define BTS_DEBUGGER_H_ +#pragma once -#include "../os/os.h" +#include +#include +#include #include "windows_wrapper.h" -#ifdef _WIN32 - #define DEBUG_BREAK() do { if (IsDebuggerPresent()) __debugbreak(); } while(0) -#else -//#include -//#include -// #define DEBUG_BREAK() do { if (ptrace(PTRACE_TRACEME, 0, NULL, 0) == -1) raise(SIGTRAP); } while(0) -#define DEBUG_BREAK() -#endif +inline bool is_debugger_present() +{ + #ifdef WIN32 + return IsDebuggerPresent(); + #else + char buf[1024]; + int debugger_present = 0; + int status_fd = open("/proc/self/status", O_RDONLY); + if (status_fd == -1) + return 0; + + ssize_t num_read = read(status_fd, buf, sizeof(buf)-1); + + if (num_read > 0) + { + static const char TracerPid[] = "TracerPid:"; + char *tracer_pid; + + buf[num_read] = 0; + tracer_pid = strstr(buf, TracerPid); + if (tracer_pid) + debugger_present = !!atoi(tracer_pid + sizeof(TracerPid) - 1); + } + + return debugger_present; + #endif +} + +inline void debug_break() +{ +#ifdef _WIN32 + __debugbreak(); +#else + std::raise(SIGINT); #endif +} + + diff --git a/src/server/sparkd/jetfix/codec/f_toa.h b/src/server/sparkd/jetfix/codec/f_toa.h index e5d2a77e9..2f5cc468d 100644 --- a/src/server/sparkd/jetfix/codec/f_toa.h +++ b/src/server/sparkd/jetfix/codec/f_toa.h @@ -5,6 +5,7 @@ #include #include +namespace bts { inline int f_toa (float n,char*buffer, size_t buffer_size,int pad=0) { static double_conversion::DoubleToStringConverter const &c = @@ -39,4 +40,4 @@ inline int f_toa (float n,char*buffer, size_t buffer_size,int pad=0) return pad; } } - +}