Update: rename mrntt=>pptr

smocore/marionette/lifetime.cpp

@@ -10,7 +10,7 @@
 #include <mindManager/mindManager.h>
 
 namespace sscl {
-namespace mrntt {
+namespace pptr {
 
 class MarionetteComponent::MrnttLifetimeMgmtOp
 :	public sscl::PostedAsynchronousContinuation<mrnttLifetimeMgmtOpCbFn>
@@ -139,13 +139,13 @@ public:
 				+ ": Must be executed on Marionette thread");
 		}
 
-		sscl::mrntt::mrntt.finalizeReq({nullptr, std::bind(
-			&sscl::mrntt::marionetteFinalizeReqCb,
+		sscl::pptr::mrntt.finalizeReq({nullptr, std::bind(
+			&sscl::pptr::marionetteFinalizeReqCb,
 			std::placeholders::_1)});
 	}
 };
 
-void sscl::mrntt::MarionetteComponent::initializeReq(
+void sscl::pptr::MarionetteComponent::initializeReq(
 	sscl::Callback<mrnttLifetimeMgmtOpCbFn> callback)
 {
 	auto mrntt = sscl::ComponentThread::getSelf();
@@ -165,7 +165,7 @@ void sscl::mrntt::MarionetteComponent::initializeReq(
 			request.get(), request)));
 }
 
-void sscl::mrntt::MarionetteComponent::finalizeReq(
+void sscl::pptr::MarionetteComponent::finalizeReq(
 	sscl::Callback<mrnttLifetimeMgmtOpCbFn> callback)
 {
 	auto mrntt = sscl::ComponentThread::getSelf();
@@ -185,7 +185,7 @@ void sscl::mrntt::MarionetteComponent::finalizeReq(
 			request.get(), request)));
 }
 
-void sscl::mrntt::MarionetteComponent::exceptionInd()
+void sscl::pptr::MarionetteComponent::exceptionInd()
 {
 	auto faultyThread = sscl::ComponentThread::getSelf();
 	auto mrntt = sscl::ComponentThread::getMrntt();
@@ -199,5 +199,5 @@ void sscl::mrntt::MarionetteComponent::exceptionInd()
 			request.get(), request)));
 }
 
-} // namespace mrntt
+} // namespace pptr
 } // namespace sscl

smocore/marionette/main.cpp

@@ -14,13 +14,11 @@
 #include <mindManager/mindManager.h>
 #include <salmanoff.h>
 
-// Define the global marionette thread instance (declared extern in libspinscale)
+// Define the global puppeteer thread instance (declared extern in libspinscale)
 namespace sscl {
-namespace mrntt {
-std::shared_ptr<MarionetteThread> thread = std::make_shared<MarionetteThread>();
-} // namespace mrntt
+namespace pptr {
 
-namespace mrntt {
+std::shared_ptr<PuppeteerThread> thread = std::make_shared<PuppeteerThread>();
 std::atomic<int> exitCode;
 MarionetteComponent mrntt(std::static_pointer_cast<sscl::ComponentThread>(thread));
 
@@ -41,7 +39,8 @@ void marionetteFinalizeReqCb(bool success)
 	std::cout << __func__ << ": Marionette finalized." << '\n';
 	exitMarionetteLoop();
 }
-} // namespace mrntt
+
+} // namespace pptr
 } // namespace sscl
 
 namespace smo {
@@ -57,8 +56,8 @@ void marionetteInitializeReqCb(bool success)
 	std::cerr << __func__ << ": Failed to initialize Marionette. Shutting down."
 		<< '\n';
 
-	sscl::mrntt::mrntt.finalizeReq({nullptr, std::bind(
-		&sscl::mrntt::marionetteFinalizeReqCb,
+	sscl::pptr::mrntt.finalizeReq({nullptr, std::bind(
+		&sscl::pptr::marionetteFinalizeReqCb,
 		std::placeholders::_1)});
 }
 
@@ -66,7 +65,7 @@ void marionetteInitializeReqCb(bool success)
 
 namespace sscl {
 
-void MarionetteThread::main(MarionetteThread& self)
+void PuppeteerThread::main(PuppeteerThread& self)
 {
 	std::string threadName = "smo:" + self.name;
 	pthread_setname_np(pthread_self(), threadName.c_str());
@@ -74,7 +73,7 @@ void MarionetteThread::main(MarionetteThread& self)
     std::cout << __func__ << ": Waiting for command line JOLT" << std::endl;
     self.getIoService().run();
     self.initializeTls();
-    sscl::mrntt::exitCode = EXIT_SUCCESS;
+    sscl::pptr::exitCode = EXIT_SUCCESS;
 	static boost::asio::signal_set signals(self.getIoService(), SIGINT);
 	bool callShutdownSalmanoff = false;
 
@@ -96,8 +95,8 @@ void MarionetteThread::main(MarionetteThread& self)
 					default:
 						break;
 				}
-				sscl::mrntt::mrntt.finalizeReq({nullptr, std::bind(
-					&sscl::mrntt::marionetteFinalizeReqCb,
+				sscl::pptr::mrntt.finalizeReq({nullptr, std::bind(
+					&sscl::pptr::marionetteFinalizeReqCb,
 					std::placeholders::_1)});
 			}
 		);
@@ -140,7 +139,7 @@ void MarionetteThread::main(MarionetteThread& self)
 		callShutdownSalmanoff = true;
 
 		// Create new Mind instance just before initializeReq
-		sscl::mrntt::mrntt.initializeReq({nullptr, std::bind(
+		sscl::pptr::mrntt.initializeReq({nullptr, std::bind(
 			&smo::marionetteInitializeReqCb, std::placeholders::_1)});
 
 		std::cout << __func__ << ": Entering event loop" << "\n";
@@ -184,8 +183,8 @@ void MarionetteThread::main(MarionetteThread& self)
 
 			if (sendExceptionInd)
 			{
-				sscl::mrntt::exitCode = EXIT_FAILURE;
-				sscl::mrntt::mrntt.exceptionInd();
+				sscl::pptr::exitCode = EXIT_FAILURE;
+				sscl::pptr::mrntt.exceptionInd();
 			}
         }
 
@@ -198,7 +197,7 @@ void MarionetteThread::main(MarionetteThread& self)
 
 		if (typeid(e) == typeid(OptionsParserError))
 		{
-			sscl::mrntt::exitCode = EXIT_FAILURE;
+			sscl::pptr::exitCode = EXIT_FAILURE;
 			out = &std::cerr;
 			outUsageMsg = std::string(__func__) + ": ";
 		}
@@ -209,12 +208,12 @@ void MarionetteThread::main(MarionetteThread& self)
 	{
 		std::cerr << __func__ << ": Exception occurred: " << e.what()
 			<< std::endl;
-		sscl::mrntt::exitCode = EXIT_FAILURE;
+		sscl::pptr::exitCode = EXIT_FAILURE;
 	}
 	catch (...)
 	{
 		std::cerr << __func__ << ": Unknown exception occurred" << std::endl;
-		sscl::mrntt::exitCode = EXIT_FAILURE;
+		sscl::pptr::exitCode = EXIT_FAILURE;
 	}
 
 	if (callShutdownSalmanoff) {