coroutine, bugfix: do not recycle fiber objects during GC.

xicilion · xicilion · commit 63b20f750451 · 2020-07-18T20:57:04.000+08:00
diff --git a/fibjs/include/Fiber.h b/fibjs/include/Fiber.h
@@ -32,6 +32,7 @@ class JSFiber : public Fiber_base,
 
     public:
         obj_ptr<JSFiber> m_pFiber;
+        v8::Global<v8::Object> m_fiber;
         TryCatch try_catch;
     };
 
diff --git a/fibjs/src/base/Runtime.cpp b/fibjs/src/base/Runtime.cpp
@@ -316,13 +316,15 @@ void Isolate::init()
     v8::Isolate::Scope isolate_scope(m_isolate);
     v8::HandleScope handle_scope(m_isolate);
 
-    JSFiber::EnterJsScope s;
-
     v8::Local<v8::Context> _context = v8::Context::New(m_isolate);
     m_context.Reset(m_isolate, _context);
 
     v8::Context::Scope context_scope(_context);
 
+    Fiber_base::class_info().getModule(this);
+
+    JSFiber::EnterJsScope s;
+
     if (g_cov && m_id == 1)
         beginCoverage(m_isolate);
 
diff --git a/fibjs/src/coroutine/Fiber.cpp b/fibjs/src/coroutine/Fiber.cpp
@@ -221,6 +221,8 @@ JSFiber::EnterJsScope::EnterJsScope(JSFiber* fb)
 
     exlib::Fiber::tlsPut(g_tlsCurrent, m_pFiber);
     m_pFiber->holder()->m_fibers.putTail(m_pFiber);
+
+    m_fiber.Reset(m_pFiber->holder()->m_isolate, m_pFiber->wrap());
 }
 
 JSFiber::EnterJsScope::~EnterJsScope()
diff --git a/test/coroutine_test.js b/test/coroutine_test.js
@@ -92,6 +92,12 @@ describe('coroutine', () => {
             assert.equal(n, 1300);
         });
 
+        it('do not recycle fiber objects during GC', () => {
+            coroutine.current().v = 100;
+            GC();
+            assert.equal(coroutine.current().v, 100);
+        });
+
         it('caller', () => {
             function t_fiber3(v1, v2) {
                 n = v1 + v2 + this.caller.v;

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,8 @@ JSFiber::EnterJsScope::EnterJsScope(JSFiber* fb)`
`221`	`221`
`222`	`222`	`exlib::Fiber::tlsPut(g_tlsCurrent, m_pFiber);`
`223`	`223`	`m_pFiber->holder()->m_fibers.putTail(m_pFiber);`
	`224`	`+`
	`225`	`+ m_fiber.Reset(m_pFiber->holder()->m_isolate, m_pFiber->wrap());`
`224`	`226`	`}`
`225`	`227`
`226`	`228`	`JSFiber::EnterJsScope::~EnterJsScope()`