Skip to content

Fix race condition in IEx.Server #4895

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

Merged
merged 1 commit into from
Jun 27, 2016
Merged

Fix race condition in IEx.Server #4895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion lib/iex/lib/iex/evaluator.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ defmodule IEx.Evaluator do
old_leader = Process.group_leader
Process.group_leader(self(), leader)

state = loop_state(opts)
send(server, {:configuration_loaded, self()})
try do
loop(server, IEx.History.init, loop_state(opts))
loop(server, IEx.History.init, state)
after
Process.group_leader(self(), old_leader)
end
Expand Down
8 changes: 7 additions & 1 deletion lib/iex/lib/iex/server.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,14 @@ defmodule IEx.Server do
self_leader = Process.group_leader

evaluator = opts[:evaluator] || spawn(fn -> IEx.Evaluator.init(self_pid, self_leader, opts) end)

Process.put(:evaluator, evaluator)

# Wait for evaluator to load config from dot file.
receive do
{:configuration_loaded, ^evaluator} -> :ok
after 1_000 -> :ok
end

loop(run_state(opts), evaluator, Process.monitor(evaluator))
end

Expand Down