fixes

build/gcc/makefile

@@ -9,7 +9,7 @@ OBJS_DEBUG = $(patsubst %.cpp,debug/%.o,$(_SOURCES))
 
 CXX	= g++
 CXXFLAGS	= -march=native -Wall -std=c++11 -pthread -I../../include 
-CXX_RELEASE_FLAGS = -O2 -flto 
+CXX_RELEASE_FLAGS = -O2 -flto -g
 CXX_DEBUG_FLAGS= -g 
 
 OUTLIB_RELEASE = libc11log.a

include/c11log/details/fast_oss.h

@@ -7,12 +7,12 @@ namespace details {
 
 class str_devicebuf:public std::streambuf {
 public:
-    str_devicebuf()
+    str_devicebuf() = default;
-    {
+    ~str_devicebuf() = default;
-        _str.reserve(128);
+    str_devicebuf(const str_devicebuf&) = delete;	
-    }
+    str_devicebuf& operator=(const str_devicebuf&) = delete;
 
-    const std::string& str_ref()
+    const std::string& str_ref() const
     {
         return _str;
     }
@@ -46,31 +46,28 @@ private:
 
 class fast_oss:public std::ostream {
 public:
-    fast_oss():std::ostream(&_dev)
+    fast_oss():std::ostream(&_dev){}
-    {}
+    ~fast_oss() = default;
-    ~fast_oss()
+    fast_oss(const fast_oss&) = delete;
-    {}
+    fast_oss operator=(const fast_oss&) = delete;
+   
 
     const std::string& str_ref() const
     {        
-        auto mydevice = static_cast<str_devicebuf*>(rdbuf());
+        return _dev.str_ref();
-        return mydevice->str_ref();
     }
 
     const std::string str() const
     {     
-        auto mydevice = static_cast<str_devicebuf*>(rdbuf());
+        return _dev.str_ref();
-        return mydevice->str_ref();
     }
 
     void clear()
     {
-        auto mydevice = static_cast<str_devicebuf*>(rdbuf());
+        _dev.clear();
-        mydevice->clear();
     }
 private:
     str_devicebuf _dev;
-
 };
 }
 }

src/formatters.cpp

@@ -10,6 +10,7 @@ void c11log::formatters::format_time(const c11log::formatters::timepoint& tp, st
     //auto duration = tp.time_since_epoch();
     //int millis = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() % 1000);
     
+    
     char buf[64];
     auto size = sprintf(buf, "[%d-%02d-%02d %02d:%02d:%02d]",
             tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,

src/test.cpp

@@ -17,52 +17,29 @@ std::atomic<bool> active;
 
 
 
-class A
-{
-public:
-	A()
-	{
-		std::cout << "Regular ctor\n";
-	}
-	A(const A&) 
-	{
-		std::cout << "Copy ctor\n";
-	}
-	A& operator=(const A&)
-	{
-		std::cout << "operator=\n";
-		return *this;
-	}
-	
-	A& operator=(A&&)
-	{
-		std::cout << "operator=&&\n";
-		return *this;
-	}
-	
-	A(A&& a)
-	{
-		std::cout << "Move ctor\n";
-	}
-	~A()
-	{
-		//std::cout << "Dtor\n";
-	}
-			
-};
-
 using std::string;
 using std::chrono::seconds;
 using Q = c11log::details::blocking_queue<string>;
 
 void pusher(Q* q)
 {
+	auto &logger = c11log::get_logger("async");
+	while(active)
+	{
+		logger.info()<<"Hello logger!";
+		++push_count;
+
+	}
+		
+
+	/*
 	string a = "Hello";
 	while(active)
 	{
 		q->push(a);
 		++push_count;
 	}
+	*/
 
 }
 void popper(Q* q) 
@@ -73,6 +50,7 @@ void popper(Q* q)
 		q->pop(output);
 		++pop_count;
 	}
+	
 }
 
 void testq(int size, int pushers, int poppers)
@@ -81,9 +59,10 @@ void testq(int size, int pushers, int poppers)
 	active = true;			
 	Q q{static_cast<Q::size_type>(size)};		
 	
+	/*
 	for(int i = 0; i < poppers; i++)
-		new std::thread(std::bind(popper, &q));
+		testq(qsize, pushers, poppers);
-		
+	*/	
 	for(int i = 0; i < pushers; i++)
 		new std::thread(std::bind(pusher, &q));
 		
@@ -97,12 +76,11 @@ void testq(int size, int pushers, int poppers)
 		pop_count = 0;
 		std::this_thread::sleep_for(seconds(1));
 		cout << "Pushes/sec =\t" << format(push_count.load()) << endl;
-		cout << "Pops/sec =\t" << format(pop_count.load()) << endl;
+		//cout << "Pops/sec =\t" << format(pop_count.load()) << endl << endl;
-		cout << "Total/sec =\t" << format(push_count+pop_count) << endl << endl;
+		//cout << "Total/sec =\t" << format(push_count+pop_count) << endl;
 		cout << "Queue size =\t" << format(q.size()) << endl;
 		cout << "---------------------------------------------------------------------" << endl;		
 	}		
-		
 }
 
 
@@ -118,68 +96,28 @@ int main(int argc, char* argv[])
 	int pushers = atoi(argv[2]);
 	int poppers = atoi(argv[3]);
 	
-	testq(qsize, pushers, poppers);
+	//testq(qsize, pushers, poppers);
+	
 	
-	/*
 	using namespace std::chrono;
 	
 								
-	int nthreads = argc > 1 ? atoi(argv[1]) : 1;
-	int nlines = argc > 2 ? atoi(argv[2]) : 100000;
-	
-		
-				
     auto null_sink = std::make_shared<c11log::sinks::null_sink>();
     auto stdout_sink = std::make_shared<c11log::sinks::stdout_sink>();
     auto async = std::make_shared<c11log::sinks::async_sink>(1000);
-    //auto fsink = std::make_shared<c11log::sinks::rotating_file_sink>("newlog", "txt", 1024*1024*10 , 2);
+    auto fsink = std::make_shared<c11log::sinks::rotating_file_sink>("newlog", "txt", 1024*1024*10 , 2);
     //auto fsink = std::make_shared<c11log::sinks::daily_file_sink>("daily", "txt");
 
-	//async->add_sink(fsink);
-    async->add_sink(null_sink);
-
-    //console logger
-    auto &console = c11log::get_logger("console");
-    console.add_sink(stdout_sink);
-	//c11log::details::blocking_queue<std::string> q(1000);
-	//auto q_ptr = &q;
-    std::vector<std::thread*> threads;
-    std::cout << "Starting " << nthreads << " threads x " << utils::format(nlines) << " lines each.." << std::endl;
-    for (int i = 0; i < nthreads; i++)
-    {    	
-    	auto logger = std::make_shared<c11log::logger>("test");
-	    logger->add_sink(async);
-	    
-        auto t = new std::thread([logger, nlines, i]() {
-			auto &console = c11log::get_logger("console");
-		    for(int j = 0 ; j < nlines; ++j)
-            {            	
-                logger->info() << "Hello from thread #" << i << "\tcounter: " <<  j ;
-                if(j % 2000 == 0)
-                	console.info() << "Hello from thread " << i << "\tcounter: " <<  j;                                
-            }
-        });
-        threads.push_back(t);
-        //std::this_thread::sleep_for(milliseconds(2));
-    }
 	
        
-	auto stime = steady_clock::now();
+	//Async logger
-	int thread_joined = 0;
+	async->add_sink(null_sink);	
-	for(auto t:threads)
+	auto &logger = c11log::get_logger("async");
-	{
+	logger.add_sink(async);
-		t->join();
-		std::cout << "Joined " << ++thread_joined << " threads" << std::endl;
-	}
 	    
-	auto delta = steady_clock::now() - stime;
+    testq(qsize, pushers, poppers);
-	auto delta_seconds = duration_cast<milliseconds>(delta).count()/1000.0;	 		
     
-    auto total = nthreads*nlines;
-    std::cout << "Total: " << utils::format(total) << " = " << utils::format(total/delta_seconds) << "/sec" << std::endl; 
     
-    async->shutdown(seconds(1));
-    */
 }