updated debug macros.

Author: treefrogframework

src/tdebug.cpp

@@ -14,13 +14,6 @@
 #include <TLog>
 #include <TLogger>
 
-#undef tFatal
-#undef tError
-#undef tWarn
-#undef tInfo
-#undef tDebug
-#undef tTrace
-
 /*!
   \class TDebug
   \brief The TDebug class provides a file output stream for debugging information.
@@ -152,10 +145,10 @@ void TDebug::fatal(const char *fmt, ...) const
     flushAppLoggers();
 
     if (Tf::appSettings()->value(Tf::ApplicationAbortOnFatal).toBool()) {
-#if (defined(Q_OS_UNIX) || defined(Q_CC_MINGW))
+#if defined(Q_OS_UNIX)
         abort();  // trap; generates core dump
 #else
-        _exit(-1);
+        std::exit(-1);
 #endif
     }
 }

src/tglobal.cpp

@@ -299,6 +299,13 @@ int64_t Tf::getMSecsSinceEpoch()
 }
 
 
+bool getAbortOnFatalFlag()
+{
+    static bool ret = Tf::appSettings()->value(Tf::ApplicationAbortOnFatal).toBool();
+    return ret;
+}
+
+
 /*!
   \def T_EXPORT(VAR)
   Exports the current value of a local variable named \a VAR from the

src/tglobal.h

@@ -165,14 +165,6 @@ constexpr auto TF_SRC_REVISION = 3082;
 #define T_VARIANT(VAR) (variant(QLatin1String(#VAR)).toString())
 
 
-#define tFatal TDebug(Tf::FatalLevel).fatal
-#define tError TDebug(Tf::ErrorLevel).error
-#define tWarn TDebug(Tf::WarnLevel).warn
-#define tInfo TDebug(Tf::InfoLevel).info
-#define tDebug TDebug(Tf::DebugLevel).debug
-#define tTrace TDebug(Tf::TraceLevel).trace
-
-
 #include "tfexception.h"
 #include "tfnamespace.h"
 #include "tdeclexport.h"
@@ -181,6 +173,86 @@ constexpr auto TF_SRC_REVISION = 3082;
 #include <cstring>
 #include <functional>
 #include <algorithm>
+
+
+T_CORE_EXPORT bool getAbortOnFatalFlag();
+
+
+inline TDebug tFatal()
+{
+    return TDebug(Tf::FatalLevel);
+}
+
+inline TDebug tError()
+{
+    return TDebug(Tf::ErrorLevel);
+}
+
+inline TDebug tWarn()
+{
+    return TDebug(Tf::WarnLevel);
+}
+
+inline TDebug tInfo()
+{
+    return TDebug(Tf::InfoLevel);
+}
+
+inline TDebug tDebug()
+{
+    return TDebug(Tf::DebugLevel);
+}
+
+inline TDebug tTrace()
+{
+    return TDebug(Tf::TraceLevel);
+}
+
+template <typename... Args>
+inline void tFatal(const char *fmt, Args&&... args)
+{
+    TDebug(Tf::FatalLevel).fatal(fmt, std::forward<Args>(args)...);
+
+    if (getAbortOnFatalFlag()) {
+#if defined(Q_OS_UNIX)
+        abort();  // trap; generates core dump
+#else
+        std::exit(-1);
+#endif
+    }
+}
+
+template <typename... Args>
+inline void tError(const char *fmt, Args&&... args)
+{
+    TDebug(Tf::FatalLevel).error(fmt, std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+inline void tWarn(const char *fmt, Args&&... args)
+{
+    TDebug(Tf::FatalLevel).warn(fmt, std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+inline void tInfo(const char *fmt, Args&&... args)
+{
+    TDebug(Tf::FatalLevel).info(fmt, std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+inline void tDebug(const char *fmt, Args&&... args)
+{
+    TDebug(Tf::FatalLevel).debug(fmt, std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+inline void tTrace(const char *fmt, Args&&... args)
+{
+    TDebug(Tf::FatalLevel).trace(fmt, std::forward<Args>(args)...);
+}
+
+
 #ifdef TF_HAVE_STD_FORMAT  // std::format
 #include <format>
 
@@ -219,6 +291,7 @@ class TCache;
 class QSqlDatabase;
 
 namespace Tf {
+
 T_CORE_EXPORT TWebApplication *app() noexcept;
 T_CORE_EXPORT TAppSettings *appSettings() noexcept;
 T_CORE_EXPORT const QVariantMap &conf(const QString &configName) noexcept;
@@ -262,6 +335,14 @@ void fatal(const std::format_string<Args...> &fmt, Args&&... args)
 {
     std::string msg = std::format(fmt, std::forward<Args>(args)...);
     Tf::logging(Tf::FatalLevel, QByteArray::fromStdString(msg));
+
+    if (getAbortOnFatalFlag()) {
+#if defined(Q_OS_UNIX)
+        abort();  // trap; generates core dump
+#else
+        std::exit(-1);
+#endif
+    }
 }
 
 /*!
@@ -375,6 +456,14 @@ void fatal(const std::string &fmt, Args&&... args)
 {
     auto msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
     Tf::logging(Tf::FatalLevel, msg);
+
+    if (getAbortOnFatalFlag()) {
+#if defined(Q_OS_UNIX)
+        abort();  // trap; generates core dump
+#else
+        std::exit(-1);
+#endif
+    }
 }
 
 template<typename... Args>

tools/tspawn/filewriter.cpp

@@ -125,7 +125,7 @@ bool FileWriter::write(const QString &data, bool overwrite) const
                     break;
 
                 } else if (c == 'Q' || c == 'q') {
-                    ::_exit(1);
+                    std::exit(1);
                     return false;
 
                 } else if (c == 'D' || c == 'd') {

tools/tspawn/main.cpp

@@ -457,14 +457,14 @@ int deleteScaffold(const QString &name)
         // Removes controllers
         rmfiles(ctrls, allRemove, quit, D_CTRLS, "controllers.pro");
         if (quit) {
-            ::_exit(1);
+            std::exit(1);
             return 1;
         }
 
         // Removes models
         rmfiles(models, allRemove, quit, D_MODELS, "models.pro");
         if (quit) {
-            ::_exit(1);
+            std::exit(1);
             return 1;
         }