Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFC: User definable transports using ClusterManagers #9046

Closed
wants to merge 3 commits into from
Closed

RFC: User definable transports using ClusterManagers #9046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b5f243
User definable transports
amitmurthy Nov 12, 2014
5f146aa
Added an example using ZMQ
amitmurthy Nov 19, 2014
61f4ba4
Fixed some bugs in the ZMQ clustermanager
amitmurthy Nov 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions base/client.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,18 +171,19 @@ end
# try to include() a file, ignoring if not found
try_include(path::AbstractString) = isfile(path) && include(path)

function init_bind_addr(args::Vector{UTF8String})
function init_bind_addr()
# Treat --bind-to in a position independent manner in ARGS since
# --worker, -n and --machinefile options are affected by it
btoidx = findfirst(args, "--bind-to")
btoidx = findfirst(ARGS, "--bind-to")
if btoidx > 0
bind_to = split(args[btoidx+1], ":")
bind_to = split(ARGS[btoidx+1], ":")
bind_addr = parseip(bind_to[1])
if length(bind_to) > 1
bind_port = parseint(bind_to[2])
else
bind_port = 0
end
deleteat!(ARGS, btoidx:btoidx+1)
else
bind_port = 0
try
Expand Down Expand Up @@ -210,10 +211,16 @@ function process_options(args::Vector{UTF8String})
if args[i]=="-q" || args[i]=="--quiet"
quiet = true
elseif args[i]=="--worker"
start_worker()
# doesn't return
elseif args[i]=="--bind-to"
i+=1 # has already been processed
i+=1
local manager
try
manager = eval(symbol(args[i]))
catch
# not defined, default to in-built worker startup and transport
manager = ClusterManager
end
start_worker(manager) # Built in manager, doesn't return

elseif args[i]=="-e" || args[i]=="--eval"
i == length(args) && error("-e,--eval no <expr> provided")
repl = false
Expand Down Expand Up @@ -376,7 +383,7 @@ function _start()

try
init_parallel()
init_bind_addr(ARGS)
init_bind_addr()
any(a->(a=="--worker"), ARGS) || init_head_sched()
init_load_path()
(quiet,repl,startup,color_set,no_history_file) = process_options(copy(ARGS))
Expand Down
1 change: 1 addition & 0 deletions base/exports.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export
BitArray,
BitMatrix,
BitVector,
BufferStream,
CFILE,
Cmd,
Colon,
Expand Down
Loading