commit
						84c7f927c2
					
				@ -82,6 +82,5 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
 | 
					    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
 | 
				
			||||||
    std::cout << "Rate = " << rate << "/sec" << std::endl;
 | 
					    std::cout << "Rate = " << rate << "/sec" << std::endl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -11,8 +11,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define ELPP_THREAD_SAFE
 | 
					#define ELPP_THREAD_SAFE
 | 
				
			||||||
#define ELPP_EXPERIMENTAL_ASYNC
 | 
					#define ELPP_EXPERIMENTAL_ASYNC
 | 
				
			||||||
#include "easylogging++.h"
 | 
					 | 
				
			||||||
#include "easylogging++.cc"
 | 
					#include "easylogging++.cc"
 | 
				
			||||||
 | 
					#include "easylogging++.h"
 | 
				
			||||||
INITIALIZE_EASYLOGGINGPP
 | 
					INITIALIZE_EASYLOGGINGPP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
 | 
				
			|||||||
@ -10,8 +10,8 @@
 | 
				
			|||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define ELPP_THREAD_SAFE
 | 
					#define ELPP_THREAD_SAFE
 | 
				
			||||||
#include "easylogging++.h"
 | 
					 | 
				
			||||||
#include "easylogging++.cc"
 | 
					#include "easylogging++.cc"
 | 
				
			||||||
 | 
					#include "easylogging++.h"
 | 
				
			||||||
INITIALIZE_EASYLOGGINGPP
 | 
					INITIALIZE_EASYLOGGINGPP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
 | 
				
			|||||||
@ -6,8 +6,8 @@
 | 
				
			|||||||
#include <chrono>
 | 
					#include <chrono>
 | 
				
			||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "easylogging++.h"
 | 
					 | 
				
			||||||
#include "easylogging++.cc"
 | 
					#include "easylogging++.cc"
 | 
				
			||||||
 | 
					#include "easylogging++.h"
 | 
				
			||||||
INITIALIZE_EASYLOGGINGPP
 | 
					INITIALIZE_EASYLOGGINGPP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int, char *[])
 | 
					int main(int, char *[])
 | 
				
			||||||
@ -21,7 +21,7 @@ int main(int, char *[])
 | 
				
			|||||||
    el::Configurations conf("easyl.conf");
 | 
					    el::Configurations conf("easyl.conf");
 | 
				
			||||||
    el::Loggers::reconfigureLogger("default", conf);
 | 
					    el::Loggers::reconfigureLogger("default", conf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    el::Logger* defaultLogger = el::Loggers::getLogger("default");
 | 
					    el::Logger *defaultLogger = el::Loggers::getLogger("default");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    auto start = clock::now();
 | 
					    auto start = clock::now();
 | 
				
			||||||
    for (int i = 0; i < howmany; ++i)
 | 
					    for (int i = 0; i < howmany; ++i)
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,8 @@
 | 
				
			|||||||
#include "g3log/logworker.hpp"
 | 
					#include "g3log/logworker.hpp"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
template <typename T> std::string format(const T &value);
 | 
					template<typename T>
 | 
				
			||||||
 | 
					std::string format(const T &value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int argc, char *argv[])
 | 
					int main(int argc, char *argv[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -27,7 +28,7 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
    int howmany = 1000000;
 | 
					    int howmany = 1000000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    auto worker = g3::LogWorker::createLogWorker();
 | 
					    auto worker = g3::LogWorker::createLogWorker();
 | 
				
			||||||
    auto handle= worker->addDefaultLogger(argv[0], "logs");
 | 
					    auto handle = worker->addDefaultLogger(argv[0], "logs");
 | 
				
			||||||
    g3::initializeLogging(worker.get());
 | 
					    g3::initializeLogging(worker.get());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    std::atomic<int> msg_counter{0};
 | 
					    std::atomic<int> msg_counter{0};
 | 
				
			||||||
 | 
				
			|||||||
@ -8,7 +8,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "glog/logging.h"
 | 
					#include "glog/logging.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
int main(int, char *argv[])
 | 
					int main(int, char *argv[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    using namespace std::chrono;
 | 
					    using namespace std::chrono;
 | 
				
			||||||
 | 
				
			|||||||
@ -10,17 +10,17 @@
 | 
				
			|||||||
#include <thread>
 | 
					#include <thread>
 | 
				
			||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "log4cplus/logger.h"
 | 
					 | 
				
			||||||
#include "log4cplus/fileappender.h"
 | 
					#include "log4cplus/fileappender.h"
 | 
				
			||||||
#include "log4cplus/layout.h"
 | 
					 | 
				
			||||||
#include "log4cplus/ndc.h"
 | 
					 | 
				
			||||||
#include "log4cplus/helpers/loglog.h"
 | 
					#include "log4cplus/helpers/loglog.h"
 | 
				
			||||||
#include "log4cplus/helpers/property.h"
 | 
					#include "log4cplus/helpers/property.h"
 | 
				
			||||||
 | 
					#include "log4cplus/layout.h"
 | 
				
			||||||
 | 
					#include "log4cplus/logger.h"
 | 
				
			||||||
#include "log4cplus/loggingmacros.h"
 | 
					#include "log4cplus/loggingmacros.h"
 | 
				
			||||||
 | 
					#include "log4cplus/ndc.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace log4cplus;
 | 
					using namespace log4cplus;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int argc, char * argv[])
 | 
					int main(int argc, char *argv[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    using namespace std::chrono;
 | 
					    using namespace std::chrono;
 | 
				
			||||||
    using clock = steady_clock;
 | 
					    using clock = steady_clock;
 | 
				
			||||||
@ -32,13 +32,11 @@ int main(int argc, char * argv[])
 | 
				
			|||||||
    int howmany = 1000000;
 | 
					    int howmany = 1000000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cplus::initialize();
 | 
					    log4cplus::initialize();
 | 
				
			||||||
    SharedFileAppenderPtr append(
 | 
					    SharedFileAppenderPtr append(new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench-mt.log"), std::ios_base::trunc, true, true));
 | 
				
			||||||
        new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench-mt.log"), std::ios_base::trunc,
 | 
					 | 
				
			||||||
            true, true));
 | 
					 | 
				
			||||||
    append->setName(LOG4CPLUS_TEXT("File"));
 | 
					    append->setName(LOG4CPLUS_TEXT("File"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cplus::tstring pattern = LOG4CPLUS_TEXT("%d{%Y-%m-%d %H:%M:%S.%Q}: %p - %m %n");
 | 
					    log4cplus::tstring pattern = LOG4CPLUS_TEXT("%d{%Y-%m-%d %H:%M:%S.%Q}: %p - %m %n");
 | 
				
			||||||
    append->setLayout( std::auto_ptr<Layout>(new PatternLayout(pattern)) );
 | 
					    append->setLayout(std::auto_ptr<Layout>(new PatternLayout(pattern)));
 | 
				
			||||||
    append->getloc();
 | 
					    append->getloc();
 | 
				
			||||||
    Logger::getRoot().addAppender(SharedAppenderPtr(append.get()));
 | 
					    Logger::getRoot().addAppender(SharedAppenderPtr(append.get()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -7,13 +7,13 @@
 | 
				
			|||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
#include <memory>
 | 
					#include <memory>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "log4cplus/logger.h"
 | 
					 | 
				
			||||||
#include "log4cplus/fileappender.h"
 | 
					#include "log4cplus/fileappender.h"
 | 
				
			||||||
#include "log4cplus/layout.h"
 | 
					 | 
				
			||||||
#include "log4cplus/ndc.h"
 | 
					 | 
				
			||||||
#include "log4cplus/helpers/loglog.h"
 | 
					#include "log4cplus/helpers/loglog.h"
 | 
				
			||||||
#include "log4cplus/helpers/property.h"
 | 
					#include "log4cplus/helpers/property.h"
 | 
				
			||||||
 | 
					#include "log4cplus/layout.h"
 | 
				
			||||||
 | 
					#include "log4cplus/logger.h"
 | 
				
			||||||
#include "log4cplus/loggingmacros.h"
 | 
					#include "log4cplus/loggingmacros.h"
 | 
				
			||||||
 | 
					#include "log4cplus/ndc.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace log4cplus;
 | 
					using namespace log4cplus;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -25,13 +25,11 @@ int main(int, char *[])
 | 
				
			|||||||
    int howmany = 1000000;
 | 
					    int howmany = 1000000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cplus::initialize();
 | 
					    log4cplus::initialize();
 | 
				
			||||||
    SharedFileAppenderPtr append(
 | 
					    SharedFileAppenderPtr append(new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench.log"), std::ios_base::trunc, true, true));
 | 
				
			||||||
        new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench.log"), std::ios_base::trunc,
 | 
					 | 
				
			||||||
            true, true));
 | 
					 | 
				
			||||||
    append->setName(LOG4CPLUS_TEXT("File"));
 | 
					    append->setName(LOG4CPLUS_TEXT("File"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cplus::tstring pattern = LOG4CPLUS_TEXT("%d{%Y-%m-%d %H:%M:%S.%Q}: %p - %m %n");
 | 
					    log4cplus::tstring pattern = LOG4CPLUS_TEXT("%d{%Y-%m-%d %H:%M:%S.%Q}: %p - %m %n");
 | 
				
			||||||
    append->setLayout( std::auto_ptr<Layout>(new PatternLayout(pattern)) );
 | 
					    append->setLayout(std::auto_ptr<Layout>(new PatternLayout(pattern)));
 | 
				
			||||||
    append->getloc();
 | 
					    append->getloc();
 | 
				
			||||||
    Logger::getRoot().addAppender(SharedAppenderPtr(append.get()));
 | 
					    Logger::getRoot().addAppender(SharedAppenderPtr(append.get()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -10,15 +10,15 @@
 | 
				
			|||||||
#include <thread>
 | 
					#include <thread>
 | 
				
			||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "log4cpp/Category.hh"
 | 
					 | 
				
			||||||
#include "log4cpp/Appender.hh"
 | 
					#include "log4cpp/Appender.hh"
 | 
				
			||||||
 | 
					#include "log4cpp/BasicLayout.hh"
 | 
				
			||||||
 | 
					#include "log4cpp/Category.hh"
 | 
				
			||||||
#include "log4cpp/FileAppender.hh"
 | 
					#include "log4cpp/FileAppender.hh"
 | 
				
			||||||
#include "log4cpp/Layout.hh"
 | 
					#include "log4cpp/Layout.hh"
 | 
				
			||||||
#include "log4cpp/BasicLayout.hh"
 | 
					 | 
				
			||||||
#include "log4cpp/Priority.hh"
 | 
					 | 
				
			||||||
#include "log4cpp/PatternLayout.hh"
 | 
					#include "log4cpp/PatternLayout.hh"
 | 
				
			||||||
 | 
					#include "log4cpp/Priority.hh"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int argc, char * argv[])
 | 
					int main(int argc, char *argv[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    using namespace std::chrono;
 | 
					    using namespace std::chrono;
 | 
				
			||||||
    using clock = steady_clock;
 | 
					    using clock = steady_clock;
 | 
				
			||||||
@ -29,12 +29,12 @@ int main(int argc, char * argv[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    int howmany = 1000000;
 | 
					    int howmany = 1000000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cpp::Appender *appender  = new log4cpp::FileAppender("default", "logs/log4cpp-bench-mt.log");
 | 
					    log4cpp::Appender *appender = new log4cpp::FileAppender("default", "logs/log4cpp-bench-mt.log");
 | 
				
			||||||
    log4cpp::PatternLayout *layout = new log4cpp::PatternLayout();
 | 
					    log4cpp::PatternLayout *layout = new log4cpp::PatternLayout();
 | 
				
			||||||
    layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S.%l}: %p - %m %n");
 | 
					    layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S.%l}: %p - %m %n");
 | 
				
			||||||
    appender->setLayout(layout);
 | 
					    appender->setLayout(layout);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cpp::Category& root = log4cpp::Category::getRoot();
 | 
					    log4cpp::Category &root = log4cpp::Category::getRoot();
 | 
				
			||||||
    root.addAppender(appender);
 | 
					    root.addAppender(appender);
 | 
				
			||||||
    root.setPriority(log4cpp::Priority::INFO);
 | 
					    root.setPriority(log4cpp::Priority::INFO);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -7,13 +7,13 @@
 | 
				
			|||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
#include <memory>
 | 
					#include <memory>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "log4cpp/Category.hh"
 | 
					 | 
				
			||||||
#include "log4cpp/Appender.hh"
 | 
					#include "log4cpp/Appender.hh"
 | 
				
			||||||
 | 
					#include "log4cpp/BasicLayout.hh"
 | 
				
			||||||
 | 
					#include "log4cpp/Category.hh"
 | 
				
			||||||
#include "log4cpp/FileAppender.hh"
 | 
					#include "log4cpp/FileAppender.hh"
 | 
				
			||||||
#include "log4cpp/Layout.hh"
 | 
					#include "log4cpp/Layout.hh"
 | 
				
			||||||
#include "log4cpp/BasicLayout.hh"
 | 
					 | 
				
			||||||
#include "log4cpp/Priority.hh"
 | 
					 | 
				
			||||||
#include "log4cpp/PatternLayout.hh"
 | 
					#include "log4cpp/PatternLayout.hh"
 | 
				
			||||||
 | 
					#include "log4cpp/Priority.hh"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int, char *[])
 | 
					int main(int, char *[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -22,12 +22,12 @@ int main(int, char *[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    int howmany = 1000000;
 | 
					    int howmany = 1000000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cpp::Appender *appender  = new log4cpp::FileAppender("default", "logs/log4cpp-bench.log");
 | 
					    log4cpp::Appender *appender = new log4cpp::FileAppender("default", "logs/log4cpp-bench.log");
 | 
				
			||||||
    log4cpp::PatternLayout *layout = new log4cpp::PatternLayout();
 | 
					    log4cpp::PatternLayout *layout = new log4cpp::PatternLayout();
 | 
				
			||||||
    layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S.%l}: %p - %m %n");
 | 
					    layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S.%l}: %p - %m %n");
 | 
				
			||||||
    appender->setLayout(layout);
 | 
					    appender->setLayout(layout);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log4cpp::Category& root = log4cpp::Category::getRoot();
 | 
					    log4cpp::Category &root = log4cpp::Category::getRoot();
 | 
				
			||||||
    root.addAppender(appender);
 | 
					    root.addAppender(appender);
 | 
				
			||||||
    root.setPriority(log4cpp::Priority::INFO);
 | 
					    root.setPriority(log4cpp::Priority::INFO);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -5,15 +5,14 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <atomic>
 | 
					#include <atomic>
 | 
				
			||||||
#include <chrono>
 | 
					#include <chrono>
 | 
				
			||||||
 | 
					#include <functional>
 | 
				
			||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
 | 
					#include <memory>
 | 
				
			||||||
#include <thread>
 | 
					#include <thread>
 | 
				
			||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
#include <memory>
 | 
					 | 
				
			||||||
#include <functional>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "P7_Trace.h"
 | 
					#include "P7_Trace.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
int main(int argc, char *argv[])
 | 
					int main(int argc, char *argv[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    using namespace std::chrono;
 | 
					    using namespace std::chrono;
 | 
				
			||||||
@ -27,10 +26,9 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    IP7_Trace::hModule module = NULL;
 | 
					    IP7_Trace::hModule module = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //create P7 client object
 | 
					    // create P7 client object
 | 
				
			||||||
    std::unique_ptr<IP7_Client, std::function<void (IP7_Client *)>> client(
 | 
					    std::unique_ptr<IP7_Client, std::function<void(IP7_Client *)>> client(
 | 
				
			||||||
        P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench-mt")),
 | 
					        P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench-mt")), [&](IP7_Client *ptr) {
 | 
				
			||||||
        [&](IP7_Client *ptr){
 | 
					 | 
				
			||||||
            if (ptr)
 | 
					            if (ptr)
 | 
				
			||||||
                ptr->Release();
 | 
					                ptr->Release();
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
@ -41,10 +39,9 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
        return 1;
 | 
					        return 1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //create P7 trace object 1
 | 
					    // create P7 trace object 1
 | 
				
			||||||
    std::unique_ptr<IP7_Trace, std::function<void (IP7_Trace *)>> trace(
 | 
					    std::unique_ptr<IP7_Trace, std::function<void(IP7_Trace *)>> trace(
 | 
				
			||||||
        P7_Create_Trace(client.get(), TM("Trace channel 1")),
 | 
					        P7_Create_Trace(client.get(), TM("Trace channel 1")), [&](IP7_Trace *ptr) {
 | 
				
			||||||
        [&](IP7_Trace *ptr){
 | 
					 | 
				
			||||||
            if (ptr)
 | 
					            if (ptr)
 | 
				
			||||||
                ptr->Release();
 | 
					                ptr->Release();
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
@ -65,7 +62,7 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
    for (int t = 0; t < thread_count; ++t)
 | 
					    for (int t = 0; t < thread_count; ++t)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        threads.push_back(std::thread([&]() {
 | 
					        threads.push_back(std::thread([&]() {
 | 
				
			||||||
            trace->Register_Thread(TM("Application"), t+1);
 | 
					            trace->Register_Thread(TM("Application"), t + 1);
 | 
				
			||||||
            while (true)
 | 
					            while (true)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                int counter = ++msg_counter;
 | 
					                int counter = ++msg_counter;
 | 
				
			||||||
@ -73,7 +70,7 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
                trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), counter);
 | 
					                trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), counter);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            trace->Register_Thread(TM("Application"), t+1);
 | 
					            trace->Register_Thread(TM("Application"), t + 1);
 | 
				
			||||||
        }));
 | 
					        }));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -4,13 +4,12 @@
 | 
				
			|||||||
//
 | 
					//
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <chrono>
 | 
					#include <chrono>
 | 
				
			||||||
 | 
					#include <functional>
 | 
				
			||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
#include <memory>
 | 
					#include <memory>
 | 
				
			||||||
#include <functional>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "P7_Trace.h"
 | 
					#include "P7_Trace.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
int main(int, char *[])
 | 
					int main(int, char *[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    using namespace std::chrono;
 | 
					    using namespace std::chrono;
 | 
				
			||||||
@ -20,10 +19,9 @@ int main(int, char *[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    IP7_Trace::hModule module = NULL;
 | 
					    IP7_Trace::hModule module = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //create P7 client object
 | 
					    // create P7 client object
 | 
				
			||||||
    std::unique_ptr<IP7_Client, std::function<void (IP7_Client *)>> client(
 | 
					    std::unique_ptr<IP7_Client, std::function<void(IP7_Client *)>> client(
 | 
				
			||||||
        P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench")),
 | 
					        P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench")), [&](IP7_Client *ptr) {
 | 
				
			||||||
        [&](IP7_Client *ptr){
 | 
					 | 
				
			||||||
            if (ptr)
 | 
					            if (ptr)
 | 
				
			||||||
                ptr->Release();
 | 
					                ptr->Release();
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
@ -34,10 +32,9 @@ int main(int, char *[])
 | 
				
			|||||||
        return 1;
 | 
					        return 1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //create P7 trace object 1
 | 
					    // create P7 trace object 1
 | 
				
			||||||
    std::unique_ptr<IP7_Trace, std::function<void (IP7_Trace *)>> trace(
 | 
					    std::unique_ptr<IP7_Trace, std::function<void(IP7_Trace *)>> trace(
 | 
				
			||||||
        P7_Create_Trace(client.get(), TM("Trace channel 1")),
 | 
					        P7_Create_Trace(client.get(), TM("Trace channel 1")), [&](IP7_Trace *ptr) {
 | 
				
			||||||
        [&](IP7_Trace *ptr){
 | 
					 | 
				
			||||||
            if (ptr)
 | 
					            if (ptr)
 | 
				
			||||||
                ptr->Release();
 | 
					                ptr->Release();
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
@ -55,7 +52,6 @@ int main(int, char *[])
 | 
				
			|||||||
    for (int i = 0; i < howmany; ++i)
 | 
					    for (int i = 0; i < howmany; ++i)
 | 
				
			||||||
        trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), i);
 | 
					        trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), i);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    duration<float> delta = clock::now() - start;
 | 
					    duration<float> delta = clock::now() - start;
 | 
				
			||||||
    float deltaf = delta.count();
 | 
					    float deltaf = delta.count();
 | 
				
			||||||
    auto rate = howmany / deltaf;
 | 
					    auto rate = howmany / deltaf;
 | 
				
			||||||
 | 
				
			|||||||
@ -5,8 +5,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <atomic>
 | 
					#include <atomic>
 | 
				
			||||||
#include <chrono>
 | 
					#include <chrono>
 | 
				
			||||||
#include <iostream>
 | 
					 | 
				
			||||||
#include <cstdlib>
 | 
					#include <cstdlib>
 | 
				
			||||||
 | 
					#include <iostream>
 | 
				
			||||||
#include <thread>
 | 
					#include <thread>
 | 
				
			||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -36,7 +36,7 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
        run = false;
 | 
					        run = false;
 | 
				
			||||||
    }));
 | 
					    }));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    while(run)
 | 
					    while (run)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        std::atomic<int> msg_counter{0};
 | 
					        std::atomic<int> msg_counter{0};
 | 
				
			||||||
        std::vector<std::thread> threads;
 | 
					        std::vector<std::thread> threads;
 | 
				
			||||||
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
        std::cout << "Threads: " << thread_count << std::endl;
 | 
					        std::cout << "Threads: " << thread_count << std::endl;
 | 
				
			||||||
        std::cout << "Delta = " << std::fixed << deltaf << " seconds" << std::endl;
 | 
					        std::cout << "Delta = " << std::fixed << deltaf << " seconds" << std::endl;
 | 
				
			||||||
        std::cout << "Rate = " << std::fixed << rate << "/sec" << std::endl;
 | 
					        std::cout << "Rate = " << std::fixed << rate << "/sec" << std::endl;
 | 
				
			||||||
    } //while
 | 
					    } // while
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    stoper.join();
 | 
					    stoper.join();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -5,8 +5,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <atomic>
 | 
					#include <atomic>
 | 
				
			||||||
#include <chrono>
 | 
					#include <chrono>
 | 
				
			||||||
#include <iostream>
 | 
					 | 
				
			||||||
#include <cstdlib>
 | 
					#include <cstdlib>
 | 
				
			||||||
 | 
					#include <iostream>
 | 
				
			||||||
#include <thread>
 | 
					#include <thread>
 | 
				
			||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -58,8 +58,9 @@ int main(int, char *[])
 | 
				
			|||||||
        daily_logger->info(123.44);
 | 
					        daily_logger->info(123.44);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Customize msg format for all messages
 | 
					        // Customize msg format for all messages
 | 
				
			||||||
        spd::set_pattern("*** [%H:%M:%S %z] [thread %t] %v ***");
 | 
					        spd::set_pattern("[%^+++%$] [%H:%M:%S %z] [thread %t] %v");
 | 
				
			||||||
        rotating_logger->info("This is another message with custom format");
 | 
					        console->info("This an info message with custom format (and custom color range between the '%^' and '%$')");
 | 
				
			||||||
 | 
							console->error("This an error message with custom format (and custom color range between the '%^' and '%$')");
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
        // Runtime log levels
 | 
					        // Runtime log levels
 | 
				
			||||||
        spd::set_level(spd::level::info); // Set global log level to info
 | 
					        spd::set_level(spd::level::info); // Set global log level to info
 | 
				
			||||||
 | 
				
			|||||||
@ -40,6 +40,9 @@ struct log_msg
 | 
				
			|||||||
    fmt::MemoryWriter raw;
 | 
					    fmt::MemoryWriter raw;
 | 
				
			||||||
    fmt::MemoryWriter formatted;
 | 
					    fmt::MemoryWriter formatted;
 | 
				
			||||||
    size_t msg_id{0};
 | 
					    size_t msg_id{0};
 | 
				
			||||||
 | 
					    // wrap this range with color codes
 | 
				
			||||||
 | 
					    size_t color_range_start{0};
 | 
				
			||||||
 | 
					    size_t color_range_end{0};
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
} // namespace details
 | 
					} // namespace details
 | 
				
			||||||
} // namespace spdlog
 | 
					} // namespace spdlog
 | 
				
			||||||
 | 
				
			|||||||
@ -421,6 +421,22 @@ private:
 | 
				
			|||||||
    std::string _str;
 | 
					    std::string _str;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// mark the color range. expect it to be in the form of "%^colored text%$"
 | 
				
			||||||
 | 
					class color_start_formatter SPDLOG_FINAL : public flag_formatter
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    void format(details::log_msg &msg, const std::tm &) override
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        msg.color_range_start = msg.formatted.size();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					class color_stop_formatter SPDLOG_FINAL : public flag_formatter
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    void format(details::log_msg &msg, const std::tm &) override
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        msg.color_range_end = msg.formatted.size();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Full info formatter
 | 
					// Full info formatter
 | 
				
			||||||
// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] %v
 | 
					// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] %v
 | 
				
			||||||
class full_formatter SPDLOG_FINAL : public flag_formatter
 | 
					class full_formatter SPDLOG_FINAL : public flag_formatter
 | 
				
			||||||
@ -462,8 +478,13 @@ class full_formatter SPDLOG_FINAL : public flag_formatter
 | 
				
			|||||||
        msg.formatted << '[' << *msg.logger_name << "] ";
 | 
					        msg.formatted << '[' << *msg.logger_name << "] ";
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        msg.formatted << '[' << level::to_str(msg.level) << "] ";
 | 
					        const char *level_name = level::to_str(msg.level);
 | 
				
			||||||
 | 
					        size_t level_name_size = strlen(level_name);
 | 
				
			||||||
 | 
					        msg.formatted << '[' << fmt::StringRef(level_name, level_name_size) << "] ";
 | 
				
			||||||
        msg.formatted << fmt::StringRef(msg.raw.data(), msg.raw.size());
 | 
					        msg.formatted << fmt::StringRef(msg.raw.data(), msg.raw.size());
 | 
				
			||||||
 | 
					        // wrap the level with color
 | 
				
			||||||
 | 
					        msg.color_range_start = 37;
 | 
				
			||||||
 | 
					        msg.color_range_end = 37 + level_name_size;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -491,6 +512,7 @@ inline void spdlog::pattern_formatter::compile_pattern(const std::string &patter
 | 
				
			|||||||
            {
 | 
					            {
 | 
				
			||||||
                _formatters.push_back(std::move(user_chars));
 | 
					                _formatters.push_back(std::move(user_chars));
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					            // if(
 | 
				
			||||||
            if (++it != end)
 | 
					            if (++it != end)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                handle_flag(*it);
 | 
					                handle_flag(*it);
 | 
				
			||||||
@ -645,6 +667,14 @@ inline void spdlog::pattern_formatter::handle_flag(char flag)
 | 
				
			|||||||
        _formatters.emplace_back(new details::i_formatter());
 | 
					        _formatters.emplace_back(new details::i_formatter());
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    case ('^'):
 | 
				
			||||||
 | 
					        _formatters.emplace_back(new details::color_start_formatter());
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    case ('$'):
 | 
				
			||||||
 | 
					        _formatters.emplace_back(new details::color_stop_formatter());
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    default: // Unknown flag appears as is
 | 
					    default: // Unknown flag appears as is
 | 
				
			||||||
        _formatters.emplace_back(new details::ch_formatter('%'));
 | 
					        _formatters.emplace_back(new details::ch_formatter('%'));
 | 
				
			||||||
        _formatters.emplace_back(new details::ch_formatter(flag));
 | 
					        _formatters.emplace_back(new details::ch_formatter(flag));
 | 
				
			||||||
 | 
				
			|||||||
@ -28,9 +28,9 @@ public:
 | 
				
			|||||||
        : target_file_(file)
 | 
					        : target_file_(file)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        should_do_colors_ = details::os::in_terminal(file) && details::os::is_color_terminal();
 | 
					        should_do_colors_ = details::os::in_terminal(file) && details::os::is_color_terminal();
 | 
				
			||||||
        colors_[level::trace] = cyan;
 | 
					        colors_[level::trace] = white;
 | 
				
			||||||
        colors_[level::debug] = cyan;
 | 
					        colors_[level::debug] = cyan;
 | 
				
			||||||
        colors_[level::info] = reset;
 | 
					        colors_[level::info] = green;
 | 
				
			||||||
        colors_[level::warn] = yellow + bold;
 | 
					        colors_[level::warn] = yellow + bold;
 | 
				
			||||||
        colors_[level::err] = red + bold;
 | 
					        colors_[level::err] = red + bold;
 | 
				
			||||||
        colors_[level::critical] = bold + on_red;
 | 
					        colors_[level::critical] = bold + on_red;
 | 
				
			||||||
@ -83,17 +83,20 @@ protected:
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
        // Wrap the originally formatted message in color codes.
 | 
					        // Wrap the originally formatted message in color codes.
 | 
				
			||||||
        // If color is not supported in the terminal, log as is instead.
 | 
					        // If color is not supported in the terminal, log as is instead.
 | 
				
			||||||
        if (should_do_colors_)
 | 
					        if (should_do_colors_ && msg.color_range_end > msg.color_range_start)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            const std::string &prefix = colors_[msg.level];
 | 
					            // before color range
 | 
				
			||||||
            fwrite(prefix.data(), sizeof(char), prefix.size(), target_file_);
 | 
					            _print_range(msg, 0, msg.color_range_start);
 | 
				
			||||||
            fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), target_file_);
 | 
					            // in color range
 | 
				
			||||||
            fwrite(reset.data(), sizeof(char), reset.size(), target_file_);
 | 
					            _print_ccode(colors_[msg.level]);
 | 
				
			||||||
            fwrite(clear_line.data(), sizeof(char), clear_line.size(), target_file_);
 | 
					            _print_range(msg, msg.color_range_start, msg.color_range_end);
 | 
				
			||||||
 | 
					            _print_ccode(reset);
 | 
				
			||||||
 | 
					            // after color range
 | 
				
			||||||
 | 
					            _print_range(msg, msg.color_range_end, msg.formatted.size());
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        else
 | 
					        else
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), target_file_);
 | 
					            _print_range(msg, 0, msg.formatted.size());
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        _flush();
 | 
					        _flush();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@ -103,6 +106,15 @@ protected:
 | 
				
			|||||||
        fflush(target_file_);
 | 
					        fflush(target_file_);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    void _print_ccode(const std::string &color_code)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        fwrite(color_code.data(), sizeof(char), color_code.size(), target_file_);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    void _print_range(const details::log_msg &msg, size_t start, size_t end)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        fwrite(msg.formatted.data() + start, sizeof(char), end - start, target_file_);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    FILE *target_file_;
 | 
					    FILE *target_file_;
 | 
				
			||||||
    bool should_do_colors_;
 | 
					    bool should_do_colors_;
 | 
				
			||||||
    std::unordered_map<level::level_enum, std::string, level::level_hasher> colors_;
 | 
					    std::unordered_map<level::level_enum, std::string, level::level_hasher> colors_;
 | 
				
			||||||
 | 
				
			|||||||
@ -25,6 +25,7 @@ class wincolor_sink : public base_sink<Mutex>
 | 
				
			|||||||
public:
 | 
					public:
 | 
				
			||||||
    const WORD BOLD = FOREGROUND_INTENSITY;
 | 
					    const WORD BOLD = FOREGROUND_INTENSITY;
 | 
				
			||||||
    const WORD RED = FOREGROUND_RED;
 | 
					    const WORD RED = FOREGROUND_RED;
 | 
				
			||||||
 | 
						const WORD GREEN = FOREGROUND_GREEN;
 | 
				
			||||||
    const WORD CYAN = FOREGROUND_GREEN | FOREGROUND_BLUE;
 | 
					    const WORD CYAN = FOREGROUND_GREEN | FOREGROUND_BLUE;
 | 
				
			||||||
    const WORD WHITE = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
 | 
					    const WORD WHITE = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
 | 
				
			||||||
    const WORD YELLOW = FOREGROUND_RED | FOREGROUND_GREEN;
 | 
					    const WORD YELLOW = FOREGROUND_RED | FOREGROUND_GREEN;
 | 
				
			||||||
@ -32,9 +33,9 @@ public:
 | 
				
			|||||||
    wincolor_sink(HANDLE std_handle)
 | 
					    wincolor_sink(HANDLE std_handle)
 | 
				
			||||||
        : out_handle_(std_handle)
 | 
					        : out_handle_(std_handle)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        colors_[level::trace] = CYAN;
 | 
					        colors_[level::trace] = WHITE;
 | 
				
			||||||
        colors_[level::debug] = CYAN;
 | 
					        colors_[level::debug] = CYAN;
 | 
				
			||||||
        colors_[level::info] = WHITE | BOLD;
 | 
					        colors_[level::info] = GREEN;
 | 
				
			||||||
        colors_[level::warn] = YELLOW | BOLD;
 | 
					        colors_[level::warn] = YELLOW | BOLD;
 | 
				
			||||||
        colors_[level::err] = RED | BOLD;                         // red bold
 | 
					        colors_[level::err] = RED | BOLD;                         // red bold
 | 
				
			||||||
        colors_[level::critical] = BACKGROUND_RED | WHITE | BOLD; // white bold on red background
 | 
					        colors_[level::critical] = BACKGROUND_RED | WHITE | BOLD; // white bold on red background
 | 
				
			||||||
@ -59,10 +60,22 @@ public:
 | 
				
			|||||||
protected:
 | 
					protected:
 | 
				
			||||||
    void _sink_it(const details::log_msg &msg) override
 | 
					    void _sink_it(const details::log_msg &msg) override
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        auto color = colors_[msg.level];
 | 
							if (msg.color_range_end > msg.color_range_start)
 | 
				
			||||||
        auto orig_attribs = set_console_attribs(color);
 | 
							{
 | 
				
			||||||
        WriteConsoleA(out_handle_, msg.formatted.data(), static_cast<DWORD>(msg.formatted.size()), nullptr, nullptr);
 | 
								// before color range
 | 
				
			||||||
        SetConsoleTextAttribute(out_handle_, orig_attribs); // reset to orig colors
 | 
								_print_range(msg, 0, msg.color_range_start);
 | 
				
			||||||
 | 
								
 | 
				
			||||||
 | 
								// in color range			
 | 
				
			||||||
 | 
								auto orig_attribs = set_console_attribs(colors_[msg.level]);
 | 
				
			||||||
 | 
								_print_range(msg, msg.color_range_start, msg.color_range_end);			
 | 
				
			||||||
 | 
								::SetConsoleTextAttribute(out_handle_, orig_attribs); // reset to orig colors
 | 
				
			||||||
 | 
								// after color range
 | 
				
			||||||
 | 
								_print_range(msg, msg.color_range_end, msg.formatted.size());			
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							else // print without colors if color range is invalid
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								_print_range(msg, 0, msg.formatted.size());			
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void _flush() override
 | 
					    void _flush() override
 | 
				
			||||||
@ -86,6 +99,13 @@ private:
 | 
				
			|||||||
        SetConsoleTextAttribute(out_handle_, attribs | back_color);
 | 
					        SetConsoleTextAttribute(out_handle_, attribs | back_color);
 | 
				
			||||||
        return orig_buffer_info.wAttributes; // return orig attribs
 | 
					        return orig_buffer_info.wAttributes; // return orig attribs
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// print a range of formatted message to console
 | 
				
			||||||
 | 
						void _print_range(const details::log_msg &msg, size_t start, size_t end)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							DWORD size = static_cast<DWORD>(end - start);
 | 
				
			||||||
 | 
							WriteConsoleA(out_handle_, msg.formatted.data() + start, size, nullptr, nullptr);		
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//
 | 
					//
 | 
				
			||||||
 | 
				
			|||||||
@ -7,8 +7,10 @@ static std::string log_to_str(const std::string &msg, const std::shared_ptr<spdl
 | 
				
			|||||||
    auto oss_sink = std::make_shared<spdlog::sinks::ostream_sink_mt>(oss);
 | 
					    auto oss_sink = std::make_shared<spdlog::sinks::ostream_sink_mt>(oss);
 | 
				
			||||||
    spdlog::logger oss_logger("pattern_tester", oss_sink);
 | 
					    spdlog::logger oss_logger("pattern_tester", oss_sink);
 | 
				
			||||||
    oss_logger.set_level(spdlog::level::info);
 | 
					    oss_logger.set_level(spdlog::level::info);
 | 
				
			||||||
    if (formatter)
 | 
						if (formatter)
 | 
				
			||||||
        oss_logger.set_formatter(formatter);
 | 
						{
 | 
				
			||||||
 | 
							oss_logger.set_formatter(formatter);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
    oss_logger.info(msg);
 | 
					    oss_logger.info(msg);
 | 
				
			||||||
    return oss.str();
 | 
					    return oss.str();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -61,3 +63,62 @@ TEST_CASE("date MM/DD/YY ", "[pattern_formatter]")
 | 
				
			|||||||
        << (now_tm.tm_year + 1900) % 1000 << " Some message\n";
 | 
					        << (now_tm.tm_year + 1900) % 1000 << " Some message\n";
 | 
				
			||||||
    REQUIRE(log_to_str("Some message", formatter) == oss.str());
 | 
					    REQUIRE(log_to_str("Some message", formatter) == oss.str());
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_CASE("color range test1", "[pattern_formatter]")
 | 
				
			||||||
 | 
					{	
 | 
				
			||||||
 | 
						auto formatter = std::make_shared<spdlog::pattern_formatter>("%^%v%$", spdlog::pattern_time_type::local, "\n");
 | 
				
			||||||
 | 
						spdlog::details::log_msg msg;
 | 
				
			||||||
 | 
						msg.raw << "Hello";
 | 
				
			||||||
 | 
						formatter->format(msg);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_start == 0);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_end == 5);	
 | 
				
			||||||
 | 
						REQUIRE(log_to_str("hello", formatter) == "hello\n");
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_CASE("color range test2", "[pattern_formatter]")
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						auto formatter = std::make_shared<spdlog::pattern_formatter>("%^%$", spdlog::pattern_time_type::local, "\n");
 | 
				
			||||||
 | 
						spdlog::details::log_msg msg;	
 | 
				
			||||||
 | 
						formatter->format(msg);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_start == 0);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_end == 0);
 | 
				
			||||||
 | 
						REQUIRE(log_to_str("", formatter) == "\n");
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_CASE("color range test3", "[pattern_formatter]")
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						auto formatter = std::make_shared<spdlog::pattern_formatter>("%^***%$");
 | 
				
			||||||
 | 
						spdlog::details::log_msg msg;
 | 
				
			||||||
 | 
						formatter->format(msg);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_start == 0);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_end == 3);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_CASE("color range test4", "[pattern_formatter]")
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						auto formatter = std::make_shared<spdlog::pattern_formatter>("XX%^YYY%$", spdlog::pattern_time_type::local, "\n");
 | 
				
			||||||
 | 
						spdlog::details::log_msg msg;
 | 
				
			||||||
 | 
						msg.raw << "ignored";
 | 
				
			||||||
 | 
						formatter->format(msg);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_start == 2);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_end == 5);
 | 
				
			||||||
 | 
						REQUIRE(log_to_str("ignored", formatter) == "XXYYY\n");
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_CASE("color range test5", "[pattern_formatter]")
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						auto formatter = std::make_shared<spdlog::pattern_formatter>("**%^");
 | 
				
			||||||
 | 
						spdlog::details::log_msg msg;
 | 
				
			||||||
 | 
						formatter->format(msg);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_start == 2);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_end == 0);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_CASE("color range test6", "[pattern_formatter]")
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						auto formatter = std::make_shared<spdlog::pattern_formatter>("**%$");
 | 
				
			||||||
 | 
						spdlog::details::log_msg msg;
 | 
				
			||||||
 | 
						formatter->format(msg);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_start == 0);
 | 
				
			||||||
 | 
						REQUIRE(msg.color_range_end == 2);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user