Async: add sh_ptr<ContinuationChainLink> to Callback<>

This change enables us to finally implement the tracing of
continuations backward from the point of acquisition for deadlock
debugging.

smocore/marionette/lifetime.cpp

@@ -1,6 +1,7 @@
 #include <iostream>
 #include <asynchronousContinuation.h>
 #include <asynchronousLoop.h>
+#include <callback.h>
 #include <component.h>
 #include <componentThread.h>
 #include <mindManager/mindManager.h>
@@ -15,7 +16,7 @@ class MarionetteComponent::MrnttLifetimeMgmtOp
 public:
 	MrnttLifetimeMgmtOp(
 		MarionetteComponent &parent, const std::shared_ptr<ComponentThread> &caller,
-		mrnttLifetimeMgmtOpCbFn callback)
+		Callback<mrnttLifetimeMgmtOpCbFn> callback)
 	:	PostedAsynchronousContinuation<mrnttLifetimeMgmtOpCbFn>(
 			caller, callback),
 	parent(parent)
@@ -37,10 +38,9 @@ public:
 		}
 
 		smo::mind::globalMind = std::make_shared<Mind>();
-		smo::mind::globalMind->initializeReq(
-			std::bind(
-				&MrnttLifetimeMgmtOp::initializeReq2,
-				this, context, std::placeholders::_1));
+		smo::mind::globalMind->initializeReq({context, std::bind(
+			&MrnttLifetimeMgmtOp::initializeReq2,
+			this, context, std::placeholders::_1)});
 	}
 
 	void initializeReq2(
@@ -70,10 +70,9 @@ public:
 				+ ": Must be executed on Marionette thread");
 		}
 
-		smo::mind::globalMind->finalizeReq(
-			std::bind(
-				&MrnttLifetimeMgmtOp::finalizeReq2,
-				this, context, std::placeholders::_1));
+		smo::mind::globalMind->finalizeReq({context, std::bind(
+			&MrnttLifetimeMgmtOp::finalizeReq2,
+			this, context, std::placeholders::_1)});
 	}
 
 	void finalizeReq2(
@@ -93,7 +92,8 @@ public:
 	}
 };
 
-void MarionetteComponent::initializeReq(mrnttLifetimeMgmtOpCbFn callback)
+void MarionetteComponent::initializeReq(
+	Callback<mrnttLifetimeMgmtOpCbFn> callback)
 {
 	auto mrntt = ComponentThread::getSelf();
 
@@ -112,7 +112,8 @@ void MarionetteComponent::initializeReq(mrnttLifetimeMgmtOpCbFn callback)
 			request.get(), request));
 }
 
-void MarionetteComponent::finalizeReq(mrnttLifetimeMgmtOpCbFn callback)
+void MarionetteComponent::finalizeReq(
+	Callback<mrnttLifetimeMgmtOpCbFn> callback)
 {
 	auto mrntt = ComponentThread::getSelf();
 

smocore/marionette/main.cpp

@@ -56,10 +56,9 @@ void marionetteInitializeReqCb(bool success)
 	std::cerr << __func__ << ": Failed to initialize Marionette. Shutting down."
 		<< '\n';
 
-	mrntt::mrntt.finalizeReq(
-		std::bind(
-			&mrntt::marionetteFinalizeReqCb,
-			std::placeholders::_1));
+	mrntt::mrntt.finalizeReq({nullptr, std::bind(
+		&mrntt::marionetteFinalizeReqCb,
+		std::placeholders::_1)});
 }
 
 } // namespace mrntt
@@ -92,10 +91,9 @@ void MarionetteThread::main(MarionetteThread& self)
 					default:
 						break;
 				}
-				mrntt::mrntt.finalizeReq(
-					std::bind(
-						&mrntt::marionetteFinalizeReqCb,
-						std::placeholders::_1));
+				mrntt::mrntt.finalizeReq({nullptr, std::bind(
+					&mrntt::marionetteFinalizeReqCb,
+					std::placeholders::_1)});
 			}
 		);
 
@@ -137,9 +135,8 @@ void MarionetteThread::main(MarionetteThread& self)
 		callShutdownSalmanoff = true;
 
 		// Create new Mind instance just before initializeReq
-		mrntt::mrntt.initializeReq(
-			std::bind(
-				&mrntt::marionetteInitializeReqCb, std::placeholders::_1));
+		mrntt::mrntt.initializeReq({nullptr, std::bind(
+			&mrntt::marionetteInitializeReqCb, std::placeholders::_1)});
 
 		std::cout << __func__ << ": Entering event loop" << "\n";
 
@@ -183,10 +180,9 @@ void MarionetteThread::main(MarionetteThread& self)
 			if (sendExceptionInd)
 			{
 				mrntt::exitCode = EXIT_FAILURE;
-				mrntt::mrntt.finalizeReq(
-					std::bind(
-						&mrntt::marionetteFinalizeReqCb,
-						std::placeholders::_1));
+				mrntt::mrntt.finalizeReq({nullptr, std::bind(
+					&mrntt::marionetteFinalizeReqCb,
+					std::placeholders::_1)});
 			}
         }