Made the fiber base function robust against spurious resume calls cau…

…sed by dangling libevent events.
nootek · May 22, 2012 · 081d673 · 081d673
1 parent dbfef75
commit 081d673
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/source/vibe/core/core.d b/source/vibe/core/core.d
@@ -281,8 +281,13 @@ shared static this()
 
 private void defaultFiberFunc()
 {
+	auto fthis = Fiber.getThis();
 	while(true){
-		auto task = s_taskFuncs[Fiber.getThis()];
+		while( fthis !in s_taskFuncs )
+			s_core.yieldForEvent();
+
+		auto task = s_taskFuncs[fthis];
+		s_taskFuncs.remove(fthis);
 		try {
 			logTrace("entering task.");
 			task();
@@ -295,8 +300,7 @@ private void defaultFiberFunc()
 		// make the fiber available for the next task
 		if( s_availableFibers.length <= s_availableFibersCount )
 			s_availableFibers.length = 2*s_availableFibers.length;
-		s_availableFibers[s_availableFibersCount++] = Fiber.getThis();
-		s_core.yieldForEvent();
+		s_availableFibers[s_availableFibersCount++] = fthis;
 	}
 }