Ensure that the current fiber is recycled in discardAndResume()

emper/ContextManager.cpp

@@ -64,5 +64,17 @@ void ContextManager::discardAndResume(Context* context) {
 			LOGD("Freeing context " << contextToFree);
 			putFreeContext(contextToFree);
 	});
+
+	// Since we are going to discard this context, it will never reach
+	// the end of its dispatch loop, and hence we need to ensure that
+	// the fiber is recycled.
+	const Fiber* currentFiber = Dispatcher::currentFiber;
+	if (currentFiber) {
+		Dispatcher::recycle(currentFiber);
+
+		// Set currentFiber to nullptr to avoid double frees here.
+		Dispatcher::currentFiber = nullptr;
+	}
+
 	contextToFree->discardAndResume(context);
 }

emper/ContextManager.hpp

 #pragma once
 
 #include "Common.hpp"
+#include "Dispatcher.hpp"
 #include "WsClQueue.hpp"
 #include "Runtime.hpp"
 #include "Context.hpp"
@@ -17,6 +18,8 @@ private:
 
 	friend Context;
 
+	friend Dispatcher;
+
 public:
 	ContextManager(Runtime& runtime);
 

emper/Dispatcher.hpp

@@ -35,7 +35,7 @@ protected:
 		return fiber->doAtomicDecrRefCount();
 	}
 
-	inline void recycle(const Fiber* fiber) {
+	static inline void recycle(const Fiber* fiber) {
 		delete fiber;
 	}