aboutsummaryrefslogtreecommitdiff
path: root/src/lanes.lua
diff options
context:
space:
mode:
authorBenoit Germain <b n t DOT g e r m a i n AT g m a i l DOT c o m>2013-09-27 20:34:51 +0200
committerBenoit Germain <b n t DOT g e r m a i n AT g m a i l DOT c o m>2013-09-27 20:34:51 +0200
commit623a8f48a624510a0461b0893da647e22e08cdd7 (patch)
treed414e72f4dedb4d196a24a9b0adc8c4393bbd46c /src/lanes.lua
parentf823c6887e28c815234f8b4bd355887b4f554857 (diff)
downloadlanes-623a8f48a624510a0461b0893da647e22e08cdd7.tar.gz
lanes-623a8f48a624510a0461b0893da647e22e08cdd7.tar.bz2
lanes-623a8f48a624510a0461b0893da647e22e08cdd7.zip
version 3.6.6
no longer call core.configure with dummy params when requiring lanes more than once (fixes potential multithreading issues with LuaJIT allocator) activated EnableCrashingOnCrashes() Win32 debug builds fixed some comments in code
Diffstat (limited to 'src/lanes.lua')
-rw-r--r--src/lanes.lua19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/lanes.lua b/src/lanes.lua
index 175002a..173db00 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -145,23 +145,18 @@ lanes.configure = function( _params)
145 145
146 local core = require "lanes.core" 146 local core = require "lanes.core"
147 assert( type( core)=="table") 147 assert( type( core)=="table")
148 148 core.configure( _params.nb_keepers, _params.on_state_create, _params.shutdown_timeout, _params.track_lanes, _params.protect_allocator, _params.verbose_errors)
149 -- configure() is available only the first time lanes.core is required process-wide, and we *must* call it to have the other functions in the interface
150 if core.configure then core.configure( _params.nb_keepers, _params.on_state_create, _params.shutdown_timeout, _params.track_lanes, _params.protect_allocator, _params.verbose_errors) end
151
152 local thread_new = assert( core.thread_new) 149 local thread_new = assert( core.thread_new)
153
154 local set_singlethreaded = assert( core.set_singlethreaded) 150 local set_singlethreaded = assert( core.set_singlethreaded)
155
156 local max_prio = assert( core.max_prio) 151 local max_prio = assert( core.max_prio)
157 152
158lanes.ABOUT= 153lanes.ABOUT =
159{ 154{
160 author= "Asko Kauppi <akauppi@gmail.com>, Benoit Germain <bnt.germain@gmail.com>", 155 author= "Asko Kauppi <akauppi@gmail.com>, Benoit Germain <bnt.germain@gmail.com>",
161 description= "Running multiple Lua states in parallel", 156 description= "Running multiple Lua states in parallel",
162 license= "MIT/X11", 157 license= "MIT/X11",
163 copyright= "Copyright (c) 2007-10, Asko Kauppi; (c) 2011-12, Benoit Germain", 158 copyright= "Copyright (c) 2007-10, Asko Kauppi; (c) 2011-13, Benoit Germain",
164 version = assert( core.version) 159 version = assert( core.version)
165} 160}
166 161
167 162