Merge pull request Tencent#93 from linxiaocong/master

replace static array g_arrCoEnvPerThread with thread local var. fixed Tencent#85 Tencent#93
haveTryTwo · Dec 20, 2018 · 6d49ec7 · 6d49ec7
2 parents f38e101 + c6f6633
commit 6d49ec7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/co_routine.cpp b/co_routine.cpp
@@ -701,12 +701,12 @@ static short EpollEvent2Poll( uint32_t events )
 	return e;
 }
 
-static stCoRoutineEnv_t* g_arrCoEnvPerThread[ 204800 ] = { 0 };
+static __thread stCoRoutineEnv_t* gCoEnvPerThread = NULL;
+
 void co_init_curr_thread_env()
 {
-	pid_t pid = GetPid();	
-	g_arrCoEnvPerThread[ pid ] = (stCoRoutineEnv_t*)calloc( 1,sizeof(stCoRoutineEnv_t) );
-	stCoRoutineEnv_t *env = g_arrCoEnvPerThread[ pid ];
+	gCoEnvPerThread = (stCoRoutineEnv_t*)calloc( 1, sizeof(stCoRoutineEnv_t) );
+	stCoRoutineEnv_t *env = gCoEnvPerThread;
 
 	env->iCallStackSize = 0;
 	struct stCoRoutine_t *self = co_create_env( env, NULL, NULL,NULL );
@@ -724,7 +724,7 @@ void co_init_curr_thread_env()
 }
 stCoRoutineEnv_t *co_get_curr_thread_env()
 {
-	return g_arrCoEnvPerThread[ GetPid() ];
+	return gCoEnvPerThread;
 }
 
 void OnPollProcessEvent( stTimeoutItem_t * ap )