Skip to content

Commit 8cfc435

Browse files
jakebolewskijakebolewski
committed
Parse all command line options in repl.c
 - consolidate all compiler / cmdline options into jl_options_t struct in julia.h - add options.jl to base/ with an immutable type JLOptions that reflects the jl_options_t struct - add --procs=<n> command line flag (equivalent to -p <n>) - add --history-file={yes|no} and --startup-file={yes|no} cmdline opts - deprecate -f, -F, --no-startup, --no-history-file cmdline flags - add tests for cmdline arguments in test/cmdlineargs.jl - modify test/Makefile and tests to use long command line option, add command line argument tests to runtests.jl - update relevant docs in the manual and manpages
1 parent 060aaec commit 8cfc435

24 files changed

+765
-385
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ BASE_SRCS := $(wildcard base/*.jl base/*/*.jl base/*/*/*.jl)
148148
$(build_private_libdir)/sys.o: VERSION $(BASE_SRCS) $(build_docdir)/helpdb.jl $(build_private_libdir)/sys0.$(SHLIB_EXT)
149149
@$(call PRINT_JULIA, cd base && \
150150
$(call spawn,$(JULIA_EXECUTABLE)) -C $(JULIA_CPU_TARGET) --build $(call cygpath_w,$(build_private_libdir)/sys) \
151-
-J$(call cygpath_w,$(build_private_libdir))/$$([ -e $(build_private_libdir)/sys.ji ] && echo sys.ji || echo sys0.ji) -f sysimg.jl \
151+
-J$(call cygpath_w,$(build_private_libdir))/$$([ -e $(build_private_libdir)/sys.ji ] && echo sys.ji || echo sys0.ji) --startup-file=no sysimg.jl \
152152
|| { echo '*** This error is usually fixed by running `make clean`. If the error persists$(,) try `make cleanall`. ***' && false; } )
153153

154154
$(build_bindir)/stringreplace: contrib/stringreplace.c | $(build_bindir)

‎base/client.jl

+120-107
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,10 @@ end
183183
# try to include() a file, ignoring if not found
184184
try_include(path::AbstractString) = isfile(path) && include(path)
185185

186-
function init_bind_addr(args::Vector{UTF8String})
187-
# Treat --bind-to in a position independent manner in ARGS since
188-
# --worker, -n and --machinefile options are affected by it
189-
btoidx = findfirst(args, "--bind-to")
190-
if btoidx > 0
191-
bind_to = split(args[btoidx+1], ":")
186+
# initialize the local proc network address / port
187+
function init_bind_addr(opts::JLOptions)
188+
if opts.bindto != C_NULL
189+
bind_to = split(bytestring(opts.bindto), ":")
192190
bind_addr = string(parseip(bind_to[1]))
193191
if length(bind_to) > 1
194192
bind_port = parseint(bind_to[2])
@@ -210,113 +208,122 @@ function init_bind_addr(args::Vector{UTF8String})
210208
LPROC.bind_port = uint16(bind_port)
211209
end
212210

213-
214-
function process_options(args::Vector{UTF8String})
215-
quiet = false
216-
repl = true
217-
startup = true
218-
color_set = false
219-
no_history_file = false
220-
i = 1
221-
while i <= length(args)
222-
if args[i]=="-q" || args[i]=="--quiet"
223-
quiet = true
224-
elseif args[i]=="--worker"
225-
start_worker()
226-
# doesn't return
227-
elseif args[i]=="--bind-to"
228-
i+=1 # has already been processed
229-
elseif args[i]=="-e" || args[i]=="--eval"
230-
i == length(args) && error("-e,--eval no <expr> provided")
231-
repl = false
232-
i+=1
233-
splice!(ARGS, 1:length(ARGS), args[i+1:end])
234-
eval(Main,parse_input_line(args[i]))
235-
break
236-
elseif args[i]=="-E" || args[i]=="--print"
237-
i == length(args) && error("-E,--print no <expr> provided")
238-
repl = false
239-
i+=1
240-
splice!(ARGS, 1:length(ARGS), args[i+1:end])
241-
show(eval(Main,parse_input_line(args[i])))
242-
println()
243-
break
244-
elseif args[i]=="-P" || args[i]=="--post-boot"
245-
i == length(args) && error("-P,--post-boot no <expr> provided")
246-
i+=1
247-
eval(Main,parse_input_line(args[i]))
248-
elseif args[i]=="-L" || args[i]=="--load"
249-
i == length(args) && error("-L, --load no <file> provided")
250-
i+=1
251-
require(args[i])
252-
elseif args[i]=="-p"
253-
i == length(args) && error("-p <n> processes not provided")
254-
i+=1
255-
if i > length(args) || !isdigit(args[i][1])
256-
np = Sys.CPU_CORES
257-
i -= 1
258-
else
259-
np = int(args[i])
260-
np < 1 && error("-p <n> must be ≥ 1")
211+
let reqarg = Set(UTF8String["--home", "-H",
212+
"--eval", "-e",
213+
"--print", "-E",
214+
"--post-boot", "-P",
215+
"--load", "-L",
216+
"--sysimage", "-J",
217+
"--cpu-target", "-C",
218+
"--procs", "-p",
219+
"--machinefile",
220+
"--color",
221+
"--history-file",
222+
"--startup-file",
223+
"--compile",
224+
"--check-bounds",
225+
"--int-literals",
226+
"--dump-bitcode",
227+
"--depwarn",
228+
"--inline",
229+
"--build", "-b",
230+
"--bind-to"])
231+
global process_options
232+
function process_options(opts::JLOptions, args::Vector{UTF8String})
233+
if !isempty(args) && (arg = first(args); arg[1] == '-' && in(arg, reqarg))
234+
println(STDERR, "julia: option `$arg` is missing an argument")
235+
exit(1)
236+
end
237+
quiet = false
238+
repl = true
239+
startup = true
240+
color_set = false
241+
no_history_file = false
242+
opts = unsafe_load(cglobal(:jl_options, JLOptions))
243+
while true
244+
# show julia VERSION and quit
245+
if bool(opts.version)
246+
println("julia version ", VERSION)
247+
exit(0)
261248
end
262-
addprocs(np)
263-
elseif args[i]=="--machinefile"
264-
i == length(args) && error("--machinefile no <file> provided")
265-
i+=1
266-
machines = load_machine_file(args[i])
267-
addprocs(machines)
268-
elseif args[i]=="-v" || args[i]=="--version"
269-
println("julia version ", VERSION)
270-
exit(0)
271-
elseif args[i]=="--no-history"
272-
# deprecated in v0.3
273-
warn("'--no-history' is deprecated; use '--no-history-file'")
274-
no_history_file = true
275-
elseif args[i] == "--no-history-file"
276-
no_history_file = true
277-
elseif args[i] == "-f" || args[i] == "--no-startup"
278-
startup = false
279-
elseif args[i] == "-F"
280-
# load juliarc now before processing any more options
281-
load_juliarc()
282-
startup = false
283-
elseif args[i] == "-i"
284-
global is_interactive = true
285-
elseif startswith(args[i], "--color")
286-
if args[i] == "--color"
287-
color_set = true
288-
global have_color = true
289-
elseif args[i][8] == '='
290-
val = args[i][9:end]
291-
if in(val, ("no","0","false"))
292-
color_set = true
293-
global have_color = false
294-
elseif in(val, ("yes","1","true"))
295-
color_set = true
296-
global have_color = true
297-
end
249+
# startup worker
250+
if bool(opts.worker)
251+
start_worker() # does not return
298252
end
299-
if !color_set
300-
error("invalid option: ", args[i])
253+
# load file immediately on all processors
254+
if opts.load != C_NULL
255+
require(bytestring(opts.load))
301256
end
302-
elseif args[i][1]!='-'
303-
if startup
257+
# show banner
258+
quiet = bool(opts.quiet)
259+
# load ~/.juliarc file
260+
if opts.startupfile == 1
304261
load_juliarc()
305262
startup = false
263+
elseif opts.startupfile == 2
264+
startup = false
265+
end
266+
# load ~/.julia_history file
267+
no_history_file = bool(opts.historyfile)
268+
# add processors
269+
if opts.nprocs > 1
270+
addprocs(opts.nprocs)
271+
end
272+
# load processes from machine file
273+
if opts.machinefile != C_NULL
274+
addprocs(load_machine_file(bytestring(opts.machinefile)))
275+
end
276+
global is_interactive = bool(opts.isinteractive)
277+
# REPL color
278+
if opts.color == 0
279+
color_set = false
280+
global have_color = false
281+
elseif opts.color == 1
282+
color_set = true
283+
global have_color = true
284+
elseif opts.color == 2
285+
color_set = true
286+
global have_color = false
287+
end
288+
# eval expression
289+
if opts.eval != C_NULL
290+
repl = false
291+
eval(Main, parse_input_line(bytestring(opts.eval)))
292+
break
293+
end
294+
# eval expression and show result
295+
if opts.print != C_NULL
296+
repl = false
297+
show(eval(Main, parse_input_line(bytestring(opts.print))))
298+
println()
299+
break
300+
end
301+
# eval expression but don't disable interactive mode
302+
if opts.postboot != C_NULL
303+
eval(Main, parse_input_line(bytestring(opts.postboot)))
304+
end
305+
# load file
306+
if !isempty(args)
307+
if args[1][1] != '-'
308+
if startup
309+
load_juliarc()
310+
startup = false
311+
end
312+
# program
313+
repl = false
314+
# remove filename from ARGS
315+
shift!(ARGS)
316+
ccall(:jl_exit_on_sigint, Void, (Cint,), 1)
317+
include(args[1])
318+
else
319+
println(STDERR, "julia: unknown option `$(args[1])`")
320+
exit(1)
321+
end
306322
end
307-
# program
308-
repl = false
309-
# remove julia's arguments
310-
splice!(ARGS, 1:length(ARGS), args[i+1:end])
311-
ccall(:jl_exit_on_sigint, Void, (Cint,), 1)
312-
include(args[i])
313323
break
314-
else
315-
error("unknown option: ", args[i])
316324
end
317-
i += 1
325+
return (quiet,repl,startup,color_set,no_history_file)
318326
end
319-
return (quiet,repl,startup,color_set,no_history_file)
320327
end
321328

322329
const roottask = current_task()
@@ -334,6 +341,8 @@ function init_load_path()
334341
push!(LOAD_PATH,abspath(JULIA_HOME,"..","share","julia","site",vers))
335342
end
336343

344+
# start local process as head "master" process with process id 1
345+
# register this process as a local worker
337346
function init_head_sched()
338347
# start in "head node" mode
339348
global PGRP
@@ -377,6 +386,8 @@ function early_init()
377386
end
378387
end
379388

389+
# starts the gc message task (for distrubuted gc) and
390+
# registers worker process termination method
380391
function init_parallel()
381392
start_gc_msgs_task()
382393
atexit(terminate_all_workers)
@@ -386,11 +397,13 @@ import .Terminals
386397
import .REPL
387398

388399
function _start()
400+
opts = JLOptions()
389401
try
390402
init_parallel()
391-
init_bind_addr(ARGS)
392-
any(a->(a=="--worker"), ARGS) || init_head_sched()
393-
(quiet,repl,startup,color_set,no_history_file) = process_options(copy(ARGS))
403+
init_bind_addr(opts)
404+
# if this process is not a worker,
405+
bool(opts.worker) || init_head_sched()
406+
(quiet,repl,startup,color_set,no_history_file) = process_options(opts,copy(ARGS))
394407

395408
local term
396409
global active_repl

‎base/deprecated.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ macro deprecate(old,new)
3636
end
3737

3838
function depwarn(msg, funcsym)
39-
if bool(compileropts().depwarn)
39+
if bool(JLOptions().depwarn)
4040
bt = backtrace()
4141
caller = firstcaller(bt, funcsym)
4242
warn(msg, once=(caller!=C_NULL), key=caller, bt=bt)

‎base/inference.jl

+2-21
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,6 @@ end
3434

3535
inference_stack = EmptyCallStack()
3636

37-
# Julia compiler options struct (see jl_compileropts_t in src/julia.h)
38-
immutable JLCompilerOpts
39-
julia_home::Ptr{Cchar}
40-
julia_bin::Ptr{Cchar}
41-
build_path::Ptr{Cchar}
42-
image_file::Ptr{Cchar}
43-
cpu_target::Ptr{Cchar}
44-
code_coverage::Int8
45-
malloc_log::Int8
46-
check_bounds::Int8
47-
dumpbitcode::Int8
48-
int_literals::Cint
49-
compile_enabled::Int8
50-
opt_level::Int8
51-
depwarn::Int8
52-
can_inline::Int8
53-
end
54-
55-
compileropts() = unsafe_load(cglobal(:jl_compileropts, JLCompilerOpts))
56-
5737
function is_static_parameter(sv::StaticVarInfo, s::Symbol)
5838
sp = sv.sp
5939
for i=1:2:length(sp)
@@ -1181,6 +1161,7 @@ function tmerge(typea::ANY, typeb::ANY)
11811161
return u
11821162
end
11831163

1164+
11841165
tchanged(n::ANY, o::ANY) = is(o,NF) || (!is(n,NF) && !(n <: o))
11851166

11861167
stupdate(state::(), changes::VarTable, vars) = copy(changes)
@@ -1592,7 +1573,7 @@ function typeinf(linfo::LambdaStaticData,atypes::Tuple,sparams::Tuple, def, cop)
15921573

15931574
if !rec
15941575
@assert fulltree.args[3].head === :body
1595-
if compileropts().can_inline == 1
1576+
if JLOptions().can_inline == 1
15961577
fulltree.args[3] = inlining_pass(fulltree.args[3], sv, fulltree)[1]
15971578
# inlining can add variables
15981579
sv.vars = append_any(f_argnames(fulltree), fulltree.args[2][1])

‎base/options.jl

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Julia options struct (see jl_options_t in src/julia.h)
2+
3+
immutable JLOptions
4+
version::Int8
5+
quiet::Int8
6+
julia_home::Ptr{Cchar}
7+
julia_bin::Ptr{Cchar}
8+
build_path::Ptr{Cchar}
9+
eval::Ptr{Cchar}
10+
print::Ptr{Cchar}
11+
postboot::Ptr{Cchar}
12+
load::Ptr{Cchar}
13+
image_file::Ptr{Cchar}
14+
cpu_target::Ptr{Cchar}
15+
nprocs::Clong
16+
machinefile::Ptr{Cchar}
17+
isinteractive::Int8
18+
color::Int8
19+
historyfile::Int8
20+
startupfile::Int8
21+
compile_enabled::Int8
22+
code_coverage::Int8
23+
malloc_log::Int8
24+
opt_level::Int8
25+
check_bounds::Int8
26+
int_literals::Cint
27+
dumpbitcode::Int8
28+
depwarn::Int8
29+
can_inline::Int8
30+
worker::Int8
31+
bindto::Ptr{Cchar}
32+
end
33+
34+
JLOptions() = unsafe_load(cglobal(:jl_options, JLOptions))

‎base/sysimg.jl

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ include("reflection.jl")
3131
include("build_h.jl")
3232
include("version_git.jl")
3333
include("c.jl")
34+
include("options.jl")
3435

3536
# core operations & types
3637
include("promotion.jl")

‎base/util.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ warn(err::Exception; prefix="ERROR: ", kw...) =
243243
warn(sprint(io->showerror(io,err)), prefix=prefix; kw...)
244244

245245
function julia_cmd(julia=joinpath(JULIA_HOME, "julia"))
246-
opts = compileropts()
246+
opts = JLOptions()
247247
cpu_target = bytestring(opts.cpu_target)
248248
image_file = bytestring(opts.image_file)
249249
`$julia -C$cpu_target -J$image_file`

0 commit comments

Comments
 (0)