Use boost::thread instead of std::thread

and all other associated IPC

3 files changed, 16 insertions, 14 deletions

diff --git a/contrib/otshell_utils/lib_common1.hpp b/contrib/otshell_utils/lib_common1.hpp
index 456e63fbb..2cb466beb 100644
--- a/contrib/otshell_utils/lib_common1.hpp
+++ b/contrib/otshell_utils/lib_common1.hpp
@@ -19,9 +19,11 @@
 
 #include <functional>
 #include <memory>
-#include <thread>
 #include <atomic>
-#include <mutex>
+#include <boost/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/thread/lock_guard.hpp>
 
 
 // list of thigs from libraries that we pull into namespace nOT::nNewcli
@@ -45,8 +47,7 @@
 	using std::shared_ptr; \
 	using std::weak_ptr; \
 	using std::enable_shared_from_this; \
-	using std::mutex; \
-	using std::lock_guard; \
+	using boost::lock_guard; \
 
 #endif
 
diff --git a/contrib/otshell_utils/utils.cpp b/contrib/otshell_utils/utils.cpp
index e1d7d9a14..53cb44dca 100644
--- a/contrib/otshell_utils/utils.cpp
+++ b/contrib/otshell_utils/utils.cpp
@@ -12,6 +12,7 @@
 #include <fstream>
 #include <iostream>
 #include <iomanip>
+#include <chrono>
 
 #include "utils.hpp"
 
@@ -128,7 +129,7 @@ std::string get_current_time() {
 
 cNullstream g_nullstream; // extern a stream that does nothing (eats/discards data)
 
-std::recursive_mutex gLoggerGuard; // extern
+boost::recursive_mutex gLoggerGuard; // extern
 std::atomic<int> gLoggerGuardDepth; // extern
 
 std::atomic<int> & gLoggerGuardDepth_Get() {
@@ -302,7 +303,7 @@ mPid2Number_Biggest(0)
 	mIsBroken=false; // ok, constr. succeeded, so string is not broken now
 
 	// this is here, because it could be using logging itself to log creation of first thread/PID etc
-	Thread2Number( std::this_thread::get_id() ); // convert current id to short number, useful to reserve a number so that main thread is usually called 1
+	Thread2Number( boost::this_thread::get_id() ); // convert current id to short number, useful to reserve a number so that main thread is usually called 1
 	Pid2Number( getpid() ); // add this proces ID as first one
 }
 
@@ -347,7 +348,7 @@ std::ostream & cLogger::write_stream(int level, const std::string & channel ) {
 			output << windows_stream(level);
 			#endif
 			output << icon(level) << ' ';
-			std::thread::id this_id = std::this_thread::get_id();
+			boost::thread::id this_id = boost::this_thread::get_id();
 			output << "{" << Thread2Number(this_id) << "}";
 			auto nicePid = Pid2Number(getpid());
 			if (nicePid>0) output << " {p" << nicePid << "}";
@@ -516,7 +517,7 @@ std::string cLogger::endline() const {
     #endif
 }
 
-int cLogger::Thread2Number(const std::thread::id id) {
+int cLogger::Thread2Number(const boost::thread::id id) {
 	auto found = mThread2Number.find( id );
 	if (found == mThread2Number.end()) { // new one
 		mThread2Number_Biggest++;
diff --git a/contrib/otshell_utils/utils.hpp b/contrib/otshell_utils/utils.hpp
index 297f13ac0..98508b565 100644
--- a/contrib/otshell_utils/utils.hpp
+++ b/contrib/otshell_utils/utils.hpp
@@ -29,7 +29,7 @@
 // #define opt_debug_debug
 
 #ifdef opt_debug_debug
-	#define _dbg_dbg(X) do { std::cerr<<"_dbg_dbg: " << OT_CODE_STAMP << " {thread=" << std::this_thread::get_id()<<"} " \
+	#define _dbg_dbg(X) do { std::cerr<<"_dbg_dbg: " << OT_CODE_STAMP << " {thread=" << boost::this_thread::get_id()<<"} " \
 	<< " {pid="<<getpid()<<"} " <<  ": " << X << std::endl; } while(0)
 #else
 	#define _dbg_dbg(X) do { } while(0)
@@ -79,7 +79,7 @@ extern cNullstream g_nullstream; // a stream that does nothing (eats/discards da
 
 // TODO make _dbg_ignore thread-safe everywhere
 
-extern std::recursive_mutex gLoggerGuard; // the mutex guarding logging/debugging code e.g. protecting streams, files, etc
+extern boost::recursive_mutex gLoggerGuard; // the mutex guarding logging/debugging code e.g. protecting streams, files, etc
 
 std::atomic<int> & gLoggerGuardDepth_Get(); // getter for the global singleton of counter (it guarantees initializing it to 0). This counter shows the current recursion (re-entrant) level of debug macros.
 
@@ -91,7 +91,7 @@ std::atomic<int> & gLoggerGuardDepth_Get(); // getter for the global singleton o
 	_dbg_dbg("WRITE DEBUG: LEVEL="<<LEVEL<<" VAR: " << VAR ); \
 	auto level=LEVEL; short int part=0; \
 	try { \
-		std::lock_guard<std::recursive_mutex> mutex_guard( nOT::nUtils::gLoggerGuard ); \
+		boost::lock_guard<boost::recursive_mutex> mutex_guard( nOT::nUtils::gLoggerGuard ); \
 		part=1; \
 		try { \
 			++nOT::nUtils::gLoggerGuardDepth_Get(); \
@@ -111,7 +111,7 @@ std::atomic<int> & gLoggerGuardDepth_Get(); // getter for the global singleton o
 	_dbg_dbg("WRITE DEBUG: LEVEL="<<LEVEL<<" CHANNEL="<<CHANNEL<<" VAR: " << VAR ); \
 	auto level=LEVEL; short int part=0; \
 	try { \
-		std::lock_guard<std::recursive_mutex> mutex_guard( nOT::nUtils::gLoggerGuard ); \
+		boost::lock_guard<boost::recursive_mutex> mutex_guard( nOT::nUtils::gLoggerGuard ); \
 		part=1; \
 		try { \
 			++nOT::nUtils::gLoggerGuardDepth_Get(); \
@@ -253,9 +253,9 @@ class cLogger {
 		void OpenNewChannel_(const std::string & channel);  ///< internal function, will throw in case of problems
 		std::string GetLogBaseDir() const;
 
-		std::map< std::thread::id , int > mThread2Number; ///<  change long thread IDs into a short nice number to show
+		std::map< boost::thread::id , int > mThread2Number; ///<  change long thread IDs into a short nice number to show
 		int mThread2Number_Biggest; ///<  current biggest value held there (biggest key) - works as growing-only counter basically
-		int Thread2Number(const std::thread::id id); ///<  convert the system's thread id into a nice short our id; make one if new thread
+		int Thread2Number(const boost::thread::id id); ///<  convert the system's thread id into a nice short our id; make one if new thread
 
 		std::map< t_anypid , int > mPid2Number; ///<  change long proces PID into a short nice number to show
 		int mPid2Number_Biggest; ///<  current biggest value held there (biggest key) - works as growing-only counter basically