results go to debugger if attached

Author: vinniefalco

include/mrdox/Debug.hpp

@@ -14,20 +14,20 @@
 #if ! defined(NDEBUG)
 #include <llvm/Support/ErrorHandling.h>
 #endif
+#include <llvm/Support/raw_ostream.h>
 
 // Some nice odds and ends such as leak checking
 // and redirection to the Visual Studio output window.
 
 namespace clang {
 namespace mrdox {
 
-/** Enable output window redirection for standard streams.
-
-    This will only take effect if a debugger
-    is attached at the time of the call.
+/** Return a stream which writes output to the debugger.
 */
-void
-debugEnableRedirecton();
+/** @{ */
+llvm::raw_ostream& debug_outs();
+llvm::raw_ostream& debug_errs();
+/** @} */
 
 /** Enable debug heap checking.
 */

source/lib/Debug.cpp

@@ -9,12 +9,11 @@
 //
 
 #include <mrdox/Debug.hpp>
+#include <atomic>
+#include <memory>
 
 #if defined(_MSC_VER) && ! defined(NDEBUG)
 
-#include <iostream>
-#include <sstream>
-
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
@@ -23,51 +22,67 @@ namespace mrdox {
 
 namespace {
 
-class debug_streambuf
-    : public std::stringbuf
+static bool const isDebuggerPresent = ::IsDebuggerPresent();
+
+class debug_ostream
+    : public llvm::raw_ostream
 {
-    bool dbg_;
-    std::ostream& os_;
-    std::streambuf* sb_;
+    static constexpr std::size_t BufferSize = 4096;
 
-    void
-    write(char const* s)
+    llvm::raw_ostream& os_;
+    std::string buf_;
+
+    void write_impl(const char * Ptr, size_t Size) override
     {
-        if(dbg_)
-            ::OutputDebugStringA(s);
-        sb_->sputn(s, std::strlen(s));
+        os_.write(Ptr, Size);
+
+        if(isDebuggerPresent)
+        {
+            // Windows expects a null terminated string
+            buf_[Size] = '\0';
+            ::OutputDebugStringA(buf_.data());
+        }
     }
 
 public:
-    explicit
-    debug_streambuf(
-        std::ostream& os)
-        : dbg_(::IsDebuggerPresent() != 0)
-        , os_(os)
-        , sb_(dbg_ ? os.rdbuf(this) : os.rdbuf())
+    debug_ostream(
+        llvm::raw_ostream& os)
+        : os_(os)
     {
+        buf_.resize(BufferSize + 1);
+        SetBuffer(buf_.data(), BufferSize);
+        os_.tie(this);
     }
 
-    ~debug_streambuf()
+    ~debug_ostream()
     {
-        sync();
+        os_.tie(nullptr);
+        flush();
     }
 
-    int sync() override
+    std::size_t preferred_buffer_size() const override
+    {
+        return BufferSize;
+    }
+
+    std::uint64_t current_pos() const override
     {
-        write(this->str().c_str());
-        this->str("");
         return 0;
     }
 };
 
 } // (anon)
 
-void
-debugEnableRedirecton()
+llvm::raw_ostream& debug_outs()
 {
-    static debug_streambuf out(std::cout);
-    static debug_streambuf err(std::cerr);
+    static debug_ostream stream(llvm::outs());
+    return stream;
+}
+
+llvm::raw_ostream& debug_errs()
+{
+    static debug_ostream stream(llvm::errs());
+    return stream;
 }
 
 void
@@ -91,8 +106,14 @@ debugEnableHeapChecking()
 namespace clang {
 namespace mrdox {
 
-void debugEnableRedirecton()
+llvm::raw_ostream& debug_outs()
+{
+    return llvm::outs();
+}
+
+llvm::raw_ostream& debug_errs()
 {
+    return llvm::errs();
 }
 
 void debugEnableHeapChecking()

source/tests/TestMain.cpp

@@ -398,9 +398,10 @@ main(int argc, const char** argv)
 {
     using namespace clang::mrdox;
 
-    debugEnableRedirecton();
+    // VFALCO This is crashing now on exit...
+    //llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
+
     debugEnableHeapChecking();
-    llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
 
     Reporter R;
 
@@ -424,7 +425,7 @@ main(int argc, const char** argv)
                 break;
     }
 
-    auto& os = std::cerr;
+    auto& os = debug_outs();
     if(results.numberofFilesWritten > 0)
         os <<
             results.numberofFilesWritten << " files written\n";
@@ -454,13 +455,15 @@ main(int argc, const char** argv)
         }
     }
     auto milli = results.elapsedMilliseconds();
-    if(milli < 1000)
+    if(milli < 10000)
         os <<
             " in " << milli << " milliseconds\n";
+#if 0
     else if(milli < 10000)
         os <<
             " in " << std::setprecision(1) <<
             double(milli) / 1000 << " seconds\n";
+#endif
     else
         os <<
             " in " << ((milli + 500) / 1000) <<

source/tool/ToolMain.cpp

@@ -160,12 +160,12 @@ toolMain(
 
 int main(int argc, char const** argv)
 {
-    clang::mrdox::debugEnableRedirecton();
-    clang::mrdox::debugEnableHeapChecking();
+    using namespace clang::mrdox;
+
+    debugEnableHeapChecking();
     llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
 
-    clang::mrdox::Reporter R;
-    clang::mrdox::toolMain(argc, argv, R);
-
+    Reporter R;
+    toolMain(argc, argv, R);
     return R.getExitCode();
 }