Lua now properly yields when an operation throws EAgain.

1 files changed, 25 insertions, 12 deletions

diff --git a/src/LuaTask.cc b/src/LuaTask.cc
index fc92cdf..f94a2b4 100644
--- a/src/LuaTask.cc
+++ b/src/LuaTask.cc
@@ -57,19 +57,32 @@ void Balau::LuaMainTask::Do() {
 }
 
 void Balau::LuaTask::Do() {
-    try {
-        m_cell->run(L);
-    }
-    catch (GeneralException e) {
-        m_cell->m_exception = new GeneralException(e);
-    }
-    catch (...) {
-        m_cell->setError();
+    while(true) {
+        try {
+            if (L.yielded())
+                LuaHelpersBase::resume(L);
+            else
+                m_cell->run(L);
+        }
+        catch (GeneralException e) {
+            m_cell->m_exception = new GeneralException(e);
+        }
+        catch (...) {
+            m_cell->setError();
+        }
+        if (L.yielded()) {
+            Events::BaseEvent * evt = LuaHelpersBase::getEvent(L);
+            IAssert(evt, "We need an event for now here.");
+            waitFor(evt);
+            yield();
+            continue;
+        }
+        if (m_cell->m_detached)
+            delete m_cell;
+        else
+            m_cell->m_event.trigger();
+        break;
     }
-    if (m_cell->m_detached)
-        delete m_cell;
-    else
-        m_cell->m_event.trigger();
 }
 
 void Balau::LuaExecCell::exec(LuaMainTask * mainTask) {