[optimization] php&c stack reuse

Author: brewlin

coroutine/Coroutine.cpp

@@ -9,12 +9,11 @@ Coroutine::Coroutine(run_func func,ZendFunction *args)
 {
     callback = args;
     ctx = new Context(func,static_cast<void *>(this));
-    creator = (void***)tsrm_get_ls_cache();
+    creator = args->creator;
 }
 /**
  * 获取一个G
- * 1. 从本地空闲free_stack中获取一个
- * 2. 没有空闲的则new一个新的G
+ * 从本地空闲free_stack中获取一个
  * @return Corouine*
  */
 Coroutine* Coroutine::getg(ZendFunction* fn)
@@ -32,7 +31,11 @@ Coroutine* Coroutine::getg(ZendFunction* fn)
         co->ctx->reset();
         co->callback = fn;
         co->gstatus = Gidle;
+        co->creator = fn->creator;
+    }else{
+        co = new Coroutine(PHPCoroutine::run,fn);
     }
+    co->gstatus = Gidle;
     return co;
 }
 /**
@@ -43,8 +46,8 @@ long Coroutine::run()
 {
     Debug("G run: start push g to global queue g:%x ctx:%x", this, ctx);
 //    投递到 proc 线程去执行该协程
-    if(proc == nullptr)Error("proc not init");
-    proc->gogo(ctx);
+//    if(proc == nullptr)Error("proc not init");
+//    proc->gogo(ctx);
     return 1;
 }
 /**

coroutine/PHPCoroutine.cpp

@@ -11,13 +11,14 @@
 long PHPCoroutine::go(zend_function *func,zval *argv,uint32_t argc)
 {
     ZendFunction *call = new ZendFunction(func,argv,argc);
-    Coroutine* ctx = Coroutine::getg(call);
-    if(ctx){
-        GO_ZG(runq)->push(ctx);
-        return 1;
-    }
-    ctx = new Coroutine(run,call);
-    proc->gogo(ctx->ctx);
+//    Coroutine* ctx = Coroutine::getg(call);
+//    if(ctx){
+//        GO_ZG(runq)->push(ctx);
+//        return 1;
+//    }
+//    ctx = new Coroutine(run,call);
+//    proc->gogo(ctx->ctx);
+    proc->gogo(call);
     //    return ctx->run();
     return 1;
 }

runtime/Proc.cpp

@@ -12,7 +12,7 @@ vector<M> allm;
  * 投递一个协程给多个线程调度执行
  * @param ctx
  */
-void Proc::gogo(Context* ctx)
+void Proc::gogo(ZendFunction* ctx)
 {
     assert(!stop);
     unique_lock<mutex> lock(queue_mu);
@@ -72,8 +72,8 @@ void Proc::prepare_shutdown()
  */
 void Proc::schedule()
 {
-    Context*   ctx;
-    Coroutine* co;
+    Coroutine*    co;
+    ZendFunction* fn;
     queue<Coroutine*> *runq = GO_ZG(runq);
     for(;;){
         {
@@ -86,9 +86,9 @@ void Proc::schedule()
                 else continue;
 
             if(!this->tasks.empty()){
-                ctx = move(this->tasks.front());
+                fn = move(this->tasks.front());
                 this->tasks.pop();
-                co = static_cast<Coroutine *>(ctx->func_data);
+                co = Coroutine::getg(fn);
             }else{
                 co = move(runq->front());
                 runq->pop();
@@ -104,7 +104,7 @@ void Proc::schedule()
         //恢复被暂停的G
         else co->resume();
         //G运行结束 销毁栈
-        if(ctx->is_end)
+        if(co->ctx->is_end)
         {
             Debug("coroutine end: start close");
             co->close();

runtime/Proc.h

@@ -37,8 +37,8 @@ class Proc
 public:
     Proc(size_t threads);
     ~Proc();
-//    void                    gogo(ZendFunction *call);
-    void                    gogo(Context *ctx);
+    void                    gogo(ZendFunction *call);
+//    void                    gogo(Context *ctx);
     void                    preapre_start();
     void                    schedule();
     void                    prepare_shutdown();
@@ -48,7 +48,8 @@ class Proc
     size_t                  threads;
     size_t                  start_threads = 0;
     condition_variable      cond;
-    queue<Context *>        tasks;
+//    queue<Context *>        tasks;
+    queue<ZendFunction *>        tasks;
     time_point              now;
     bool                    ready;
 

runtime/ZendFunction.cpp

@@ -13,11 +13,21 @@ void ZendFunction::freehash(zval *zval_ptr)
 //    }
     zval_ptr_dtor(zval_ptr);
 }
+/**
+ *
+ * @param func
+ * @param argv
+ * @param argc
+ */
 ZendFunction::ZendFunction(zend_function *func,zval *argv,uint32_t argc):argv(argv),argc(argc),is_new(1)
 {
     arena_checkpoint = zend_arena_checkpoint(CG(arena));;
     this->func = copy_function(func);
+    creator = (void***)tsrm_get_ls_cache();
 }
+/**
+ * free all the env
+ */
 ZendFunction::~ZendFunction()
 {
     zend_op_array *op = &func->op_array;

runtime/ZendFunction.h

@@ -18,6 +18,7 @@ class ZendFunction
     zval                            *argv;
     uint32_t                        argc;
     int                             is_new = 0;
+    void***                         creator;
 public:
     ZendFunction(zend_function *func,zval *argv,uint32_t argc);
     ~ZendFunction();