Skip to content

Commit 0287a99

Browse files
authored
Merge pull request #18697 from JuliaLang/amitm/parallel_startup
workers should ignore startupfile
2 parents 2042ee6 + 6e2ba58 commit 0287a99

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

base/client.jl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,12 @@ function process_options(opts::JLOptions)
218218
global have_color = (opts.color == 1)
219219
global is_interactive = (opts.isinteractive != 0)
220220
while true
221-
# load ~/.juliarc file
222-
startup && load_juliarc()
223-
224-
# startup worker
221+
# startup worker.
222+
# opts.startupfile, opts.load, etc should should not be processed for workers.
225223
if opts.worker != C_NULL
226224
start_worker(unsafe_string(opts.worker)) # does not return
227225
end
226+
228227
# add processors
229228
if opts.nprocs > 0
230229
addprocs(opts.nprocs)
@@ -233,6 +232,10 @@ function process_options(opts::JLOptions)
233232
if opts.machinefile != C_NULL
234233
addprocs(load_machine_file(unsafe_string(opts.machinefile)))
235234
end
235+
236+
# load ~/.juliarc file
237+
startup && load_juliarc()
238+
236239
# load file immediately on all processors
237240
if opts.load != C_NULL
238241
@sync for p in procs()

0 commit comments

Comments
 (0)