Merge pull request zeromq#30 from moteus/master

Fix. User `prelude` code overwrite library one.

Author: moteus

.travis.yml

@@ -63,6 +63,7 @@ script:
   - lunit.sh test_proxy.lua
   - lua -lluacov test_threads.lua
   - lua -lluacov test_threads_arg.lua
+  - lua -lluacov test_threads_opt.lua
   - lua -lluacov test_threads_fork_arg.lua
   - lua -lluacov test_threads_fork.lua
   - lua -lluacov test_threads_file.lua

lakefile

@@ -79,6 +79,7 @@ target('test', install, function()
   run_test('test_proxy.lua')
   run_test('test_threads.lua')
   run_test('test_threads_arg.lua')
+  run_test('test_threads_opt.lua')
   run_test('test_threads_fork.lua')
   run_test('test_threads_fork_arg.lua')
   run_test('test_threads_file.lua')

src/lua/lzmq/impl/threads.lua

@@ -117,22 +117,33 @@ local function make_pipe(ctx)
   return pipe, pipe_endpoint
 end
 
-local function thread_opts(code, default_thread_opts)
-  local source
-  local prelude
-  local lua_init
+local function thread_opts(code, opt)
   if type(code) == "table" then
-    source = code[1] or code.source
-    prelude = code.prelude
-    lua_init = code.lua_init
-  else
-    source = code
+    local source   = assert(code[1] or code.source)
+    local lua_init = code.lua_init or opt.lua_init
+    local prelude  = opt.prelude
+    if code.prelude then
+      --! @todo support user prelude as `@filename`
+      local user_prelude = code.prelude
+      if type(user_prelude) == 'function' then
+        user_prelude = T(user_prelude)
+      end
+      if type(prelude) == 'function' then
+        prelude = T(prelude)
+      end
+
+      prelude = string.format([[
+        local loadstring = loadstring or load
+        local prelude1 = loadstring(%q)
+        local prelude2 = loadstring(%q)
+        return prelude1(prelude2(...))
+      ]], user_prelude, prelude)
+    end
+    return {source, prelude = prelude, lua_init = lua_init}
   end
-  return {
-    [1]      = assert(source) or default_thread_opts.source,
-    prelude  = prelude        or default_thread_opts.prelude,
-    lua_init = lua_init       or default_thread_opts.lua_init
-  }
+
+  opt.source = assert(code)
+  return opt
 end
 
 local zthreads = {}
@@ -162,7 +173,6 @@ function zthreads.actor(...)
   return actor_new(thread, pipe)
 end
 
-
 function zthreads.xrun(...)
   return zthreads.run(zthreads.context(), ...)
 end

test/test_threads_opt.lua

@@ -0,0 +1,34 @@
+local TEST_FFI = ("ffi" == os.getenv("LZMQ"))
+local LZMQ     = "lzmq" .. (TEST_FFI and ".ffi" or "")
+
+local zthreads = require (LZMQ .. ".threads" )
+
+local thread_code = function(...)
+  local function assert_equal(name, a, b, ...)
+    if a == b then return b, ... end
+    print(name .. " Fail! Expected `" .. tostring(a) .. "` got `" .. tostring(b) .. "`")
+    os.exit(1)
+  end
+
+  local a,b,c,d,e,f = ...
+  assert_equal("1:", 1       , a )
+  assert_equal("2:", nil     , b )
+  assert_equal("3:", 'hello' , c )
+  assert_equal("4:", nil     , d )
+  assert_equal("5:", 2       , e )
+  assert_equal("6:", nil     , f )
+  assert_equal("#:", 6       , select("#", ...))
+end
+
+-- pass `prelude` function that change thread arguments
+local thread = zthreads.xrun({thread_code, prelude = function(...)
+  return 1, nil, 'hello', ...
+end}, nil, 2, nil)
+
+local a = assert(thread:start())
+
+assert(thread:join())
+
+assert(a == thread)
+
+print("done!")