aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lanes.c4
-rw-r--r--src/lanes.lua2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lanes.c b/src/lanes.c
index 40af6c0..676032a 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -1153,8 +1153,10 @@ static int selfdestruct_atexit( lua_State *L)
1153 if( !THREAD_ISNULL( s->thread)) // can be NULL if previous 'soft' termination succeeded 1153 if( !THREAD_ISNULL( s->thread)) // can be NULL if previous 'soft' termination succeeded
1154 { 1154 {
1155 THREAD_KILL( &s->thread); 1155 THREAD_KILL( &s->thread);
1156 // make sure the thread is really stopped! 1156#if THREADAPI == THREADAPI_PTHREAD
1157 // pthread: make sure the thread is really stopped!
1157 THREAD_WAIT( &s->thread, -1, &s->done_signal_, &s->done_lock_, &s->status); 1158 THREAD_WAIT( &s->thread, -1, &s->done_signal_, &s->done_lock_, &s->status);
1159#endif // THREADAPI == THREADAPI_PTHREAD
1158 } 1160 }
1159 // NO lua_close() in this case because we don't know where execution of the state was interrupted 1161 // NO lua_close() in this case because we don't know where execution of the state was interrupted
1160#if THREADWAIT_METHOD == THREADWAIT_CONDVAR 1162#if THREADWAIT_METHOD == THREADWAIT_CONDVAR
diff --git a/src/lanes.lua b/src/lanes.lua
index 6ba0ef3..d56e05f 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -82,7 +82,7 @@ local pairs= assert( pairs )
82local tostring= assert( tostring ) 82local tostring= assert( tostring )
83local error= assert( error ) 83local error= assert( error )
84 84
85ABOUT= 85lanes.ABOUT=
86{ 86{
87 author= "Asko Kauppi <akauppi@gmail.com>", 87 author= "Asko Kauppi <akauppi@gmail.com>",
88 description= "Running multiple Lua states in parallel", 88 description= "Running multiple Lua states in parallel",