Replaced logging handler mutex by shared pointers.

Klaim · Klaim · commit 44297c63f550 · 2012-11-15T12:46:38.000+01:00
diff --git a/libs/network/src/logging/logging.cpp b/libs/network/src/logging/logging.cpp
@@ -8,8 +8,7 @@
 #endif
 
 #include <iostream>
-#include <boost/thread/shared_mutex.hpp>
-#include <boost/thread/shared_lock_guard.hpp>
+#include <memory>
 #include <network/logging/logging.hpp>
 
 namespace network { namespace logging { 
@@ -32,23 +31,22 @@ namespace handler
 namespace 
 {
   // the log handler have to manage itself the thread safety on call
-  log_record_handler current_log_record_handler = handler::std_log_handler;
-  boost::upgrade_mutex mutex_log_handler; // we still need to not change the log handler concurrently
+  static auto current_log_record_handler = std::make_shared<log_record_handler>( &handler::std_log_handler );
+
 }
 
   
 void set_log_record_handler( log_record_handler handler )
 {
-  boost::lock_guard<boost::upgrade_mutex> write_lock( mutex_log_handler );
-  current_log_record_handler = handler;
+  current_log_record_handler = std::make_shared<log_record_handler>( handler );
 }
 
 void log( const log_record& log )
 {
-  boost::shared_lock<boost::upgrade_mutex> read_lock( mutex_log_handler );
-  if( current_log_record_handler )
+  auto log_handler = current_log_record_handler;
+  if( log_handler )
   {
-    current_log_record_handler( log );
+	(*log_handler)( log );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`	`#endif`
`9`	`9`
`10`	`10`	`#include <iostream>`
`11`		`-#include <boost/thread/shared_mutex.hpp>`
`12`		`-#include <boost/thread/shared_lock_guard.hpp>`
	`11`	`+#include <memory>`
`13`	`12`	`#include <network/logging/logging.hpp>`
`14`	`13`
`15`	`14`	`namespace network { namespace logging {`
`@@ -32,23 +31,22 @@ namespace handler`
`32`	`31`	`namespace`
`33`	`32`	`{`
`34`	`33`	`// the log handler have to manage itself the thread safety on call`
`35`		`- log_record_handler current_log_record_handler = handler::std_log_handler;`
`36`		`- boost::upgrade_mutex mutex_log_handler; // we still need to not change the log handler concurrently`
	`34`	`+ static auto current_log_record_handler = std::make_shared<log_record_handler>( &handler::std_log_handler );`
	`35`	`+`
`37`	`36`	`}`
`38`	`37`
`39`	`38`
`40`	`39`	`void set_log_record_handler( log_record_handler handler )`
`41`	`40`	`{`
`42`		`- boost::lock_guard<boost::upgrade_mutex> write_lock( mutex_log_handler );`
`43`		`- current_log_record_handler = handler;`
	`41`	`+ current_log_record_handler = std::make_shared<log_record_handler>( handler );`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`void log( const log_record& log )`
`47`	`45`	`{`
`48`		`- boost::shared_lock<boost::upgrade_mutex> read_lock( mutex_log_handler );`
`49`		`- if( current_log_record_handler )`
	`46`	`+ auto log_handler = current_log_record_handler;`
	`47`	`+ if( log_handler )`
`50`	`48`	`{`
`51`		`- current_log_record_handler( log );`
	`49`	`+ (*log_handler)( log );`
`52`	`50`	`}`
`53`	`51`	`}`
`54`	`52`