#include "stdafx.h"
-#if defined(_MSC_VER)
-#pragma warning (disable : 4100) // 'identifier' : unreferenced formal parameter
-#pragma warning (disable : 4512) // 'class' : assignment operator could not be generated
-#endif
-
#include "log.h"
#include "except.h"
#include "utf.h"
-#include "compiler/vs/stack_walker.h"
#include <ios>
+#include <iomanip>
#include <string>
#include <ostream>
-#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
#include <boost/filesystem/convenience.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/log/core/core.hpp>
-
-#include <boost/log/formatters/stream.hpp>
-#include <boost/log/formatters/attr.hpp>
-#include <boost/log/formatters/date_time.hpp>
-#include <boost/log/formatters/message.hpp>
-
-#include <boost/log/filters/attr.hpp>
-
-#include <boost/log/sinks/text_file_backend.hpp>
-
-#include <boost/log/detail/universal_path.hpp>
+#include <boost/log/core.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/log/expressions.hpp>
#include <boost/log/sinks/text_file_backend.hpp>
#include <boost/log/sinks/text_ostream_backend.hpp>
#include <boost/log/sinks/sync_frontend.hpp>
#include <boost/log/sinks/async_frontend.hpp>
#include <boost/log/core/record.hpp>
-#include <boost/log/utility/attribute_value_extractor.hpp>
+#include <boost/log/attributes/attribute_value.hpp>
+#include <boost/log/attributes/current_thread_id.hpp>
+#include <boost/log/utility/setup/common_attributes.hpp>
-#include <boost/log/utility/init/common_attributes.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
+#include <boost/core/null_deleter.hpp>
#include <boost/lambda/lambda.hpp>
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
-#include <tbb/enumerable_thread_specific.h>
+#include <tbb/atomic.h>
namespace caspar { namespace log {
using namespace boost;
-void my_formatter(bool print_all_characters, std::wostream& strm, boost::log::basic_record<wchar_t> const& rec)
+template<typename Stream>
+void append_timestamp(Stream& stream)
{
- namespace lambda = boost::lambda;
-
- #pragma warning(disable : 4996)
- time_t rawtime;
- struct tm* timeinfo;
- time(&rawtime );
- timeinfo = localtime ( &rawtime );
- char buffer [80];
- strftime (buffer,80, "%c", timeinfo);
- strm << L"[" << buffer << L"] ";
-
- boost::log::attributes::current_thread_id::held_type thread_id;
- if(boost::log::extract<boost::log::attributes::current_thread_id::held_type>(L"ThreadID", rec.attribute_values(), lambda::var(thread_id) = lambda::_1))
- strm << L"[" << thread_id << L"] ";
-
- severity_level severity;
- if(boost::log::extract<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get(), rec.attribute_values(), lambda::var(severity) = lambda::_1))
+ auto timestamp = boost::posix_time::microsec_clock::local_time();
+ auto date = timestamp.date();
+ auto time = timestamp.time_of_day();
+ auto milliseconds = time.fractional_seconds() / 1000; // microseconds to milliseconds
+
+ std::wstringstream buffer;
+
+ buffer
+ << std::setfill(L'0')
+ << L"["
+ << std::setw(4) << date.year() << L"-" << std::setw(2) << date.month().as_number() << "-" << std::setw(2) << date.day().as_number()
+ << L" "
+ << std::setw(2) << time.hours() << L":" << std::setw(2) << time.minutes() << L":" << std::setw(2) << time.seconds()
+ << L"."
+ << std::setw(3) << milliseconds
+ << L"] ";
+
+ stream << buffer.str();
+}
+
+class column_writer
+{
+ tbb::atomic<int> column_width_;
+public:
+ column_writer(int initial_width = 0)
+ {
+ column_width_ = initial_width;
+ }
+
+ template<typename Stream, typename Val>
+ void write(Stream& out, const Val& value)
{
- std::stringstream ss;
- ss << severity;
- strm << L"[" << severity << L"] ";
- for(int n = 0; n < 7-static_cast<int>(ss.str().size()); ++n)
- strm << L" ";
+ std::string to_string = boost::lexical_cast<std::string>(value);
+ int length = static_cast<int>(to_string.size());
+ int read_width;
+
+ while ((read_width = column_width_) < length && column_width_.compare_and_swap(length, read_width) != read_width);
+ read_width = column_width_;
+
+ out << L"[" << to_string << L"] ";
+
+ for (int n = 0; n < read_width - length; ++n)
+ out << L" ";
}
+};
+
+template<typename Stream>
+void my_formatter(bool print_all_characters, const boost::log::record_view& rec, Stream& strm)
+{
+ static column_writer thread_id_column;
+ static column_writer severity_column(7);
+ namespace expr = boost::log::expressions;
+
+ append_timestamp(strm);
+
+ thread_id_column.write(strm, boost::log::extract<boost::log::attributes::current_thread_id::value_type>("ThreadID", rec).get().native_id());
+ severity_column.write(strm, boost::log::extract<boost::log::trivial::severity_level>("Severity", rec));
if (print_all_characters)
{
- strm << rec.message();
+ strm << rec[expr::message];
}
else
{
- strm << replace_nonprintable_copy(rec.message(), L'?');
+ strm << replace_nonprintable_copy(rec[expr::message].get<std::wstring>(), L'?');
}
}
void init()
{
- boost::log::add_common_attributes<wchar_t>();
- typedef boost::log::aux::add_common_attributes_constants<wchar_t> traits_t;
-
- typedef boost::log::sinks::synchronous_sink<boost::log::sinks::wtext_file_backend> file_sink_type;
-
+ boost::log::add_common_attributes();
typedef boost::log::sinks::asynchronous_sink<boost::log::sinks::wtext_ostream_backend> stream_sink_type;
auto stream_backend = boost::make_shared<boost::log::sinks::wtext_ostream_backend>();
- stream_backend->add_stream(boost::shared_ptr<std::wostream>(&std::wcout, boost::log::empty_deleter()));
+ stream_backend->add_stream(boost::shared_ptr<std::wostream>(&std::wcout, boost::null_deleter()));
stream_backend->auto_flush(true);
auto stream_sink = boost::make_shared<stream_sink_type>(stream_backend);
-
-//#ifdef NDEBUG
-// stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
-//#else
-// stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
-//#endif
- stream_sink->locked_backend()->set_formatter(boost::bind(my_formatter, false, _1, _2));
+ bool print_all_characters = false;
+ stream_sink->set_formatter(boost::bind(&my_formatter<boost::log::wformatting_ostream>, print_all_characters, _1, _2));
- boost::log::wcore::get()->add_sink(stream_sink);
-}
-
-std::wstring get_call_stack()
-{
- class log_call_stack_walker : public stack_walker
- {
- std::string str_;
- public:
- log_call_stack_walker() : stack_walker() {}
-
- std::string flush()
- {
- return std::move(str_);
- }
- protected:
- virtual void OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUserName)
- {
- }
- virtual void OnLoadModule(LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size, DWORD result, LPCSTR symType, LPCSTR pdbName, ULONGLONG fileVersion)
- {
- }
- virtual void OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr)
- {
- }
- virtual void OnOutput(LPCSTR szText)
- {
- std::string str = szText;
-
- if(str.find("internal::get_call_stack") == std::string::npos && str.find("stack_walker::ShowCallstack") == std::string::npos)
- str_ += std::move(str);
- }
- };
-
- static tbb::enumerable_thread_specific<log_call_stack_walker> walkers;
- try
- {
- auto& walker = walkers.local();
- walker.ShowCallstack();
- return u16(walker.flush());
- }
- catch(...)
- {
- return L"!!!";
- }
+ boost::log::core::get()->add_sink(stream_sink);
}
}
void add_file_sink(const std::wstring& folder)
-{
- boost::log::add_common_attributes<wchar_t>();
- typedef boost::log::aux::add_common_attributes_constants<wchar_t> traits_t;
-
- typedef boost::log::sinks::synchronous_sink<boost::log::sinks::wtext_file_backend> file_sink_type;
+{
+ typedef boost::log::sinks::synchronous_sink<boost::log::sinks::text_file_backend> file_sink_type;
try
{
- if(!boost::filesystem::is_directory(folder))
- CASPAR_THROW_EXCEPTION(directory_not_found());
+ if (!boost::filesystem::is_directory(folder))
+ BOOST_THROW_EXCEPTION(directory_not_found());
auto file_sink = boost::make_shared<file_sink_type>(
boost::log::keywords::file_name = (folder + L"caspar_%Y-%m-%d.log"),
boost::log::keywords::time_based_rotation = boost::log::sinks::file::rotation_at_time_point(0, 0, 0),
boost::log::keywords::auto_flush = true,
boost::log::keywords::open_mode = std::ios::app
- );
-
- file_sink->locked_backend()->set_formatter(boost::bind(my_formatter, true, _1, _2));
-
-//#ifdef NDEBUG
-// file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
-//#else
-// file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
-//#endif
- boost::log::wcore::get()->add_sink(file_sink);
+ );
+
+ bool print_all_characters = true;
+
+ file_sink->set_formatter(boost::bind(&my_formatter<boost::log::formatting_ostream>, print_all_characters, _1, _2));
+ boost::log::core::get()->add_sink(file_sink);
}
- catch(...)
+ catch (...)
{
std::wcerr << L"Failed to Setup File Logging Sink" << std::endl << std::endl;
}
}
void set_log_level(const std::wstring& lvl)
-{
- if(boost::iequals(lvl, L"trace"))
- boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);
- else if(boost::iequals(lvl, L"debug"))
- boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
- else if(boost::iequals(lvl, L"info"))
- boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= info);
- else if(boost::iequals(lvl, L"warning"))
- boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= warning);
- else if(boost::iequals(lvl, L"error"))
- boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= error);
- else if(boost::iequals(lvl, L"fatal"))
- boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= fatal);
+{
+ if (boost::iequals(lvl, L"trace"))
+ boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::trace);
+ else if (boost::iequals(lvl, L"debug"))
+ boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::debug);
+ else if (boost::iequals(lvl, L"info"))
+ boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::info);
+ else if (boost::iequals(lvl, L"warning"))
+ boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::warning);
+ else if (boost::iequals(lvl, L"error"))
+ boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::error);
+ else if (boost::iequals(lvl, L"fatal"))
+ boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::fatal);
}
-}}
\ No newline at end of file
+}}
projects / casparcg / blobdiff