Merge pull request #778 from alexrp/master

Fix issue #769.

Author: José Valim

lib/elixir/lib/code.ex

@@ -379,7 +379,7 @@ defmodule Code do
   end
 
   defp server_call(args) do
-    :gen_server.call(:elixir_code_server, args)
+    :gen_server.call(:elixir_code_server, args, System.services_timeout)
   end
 
   defp server_cast(args) do

lib/elixir/lib/kernel/cli.ex

@@ -12,7 +12,7 @@ defmodule Kernel.CLI do
     argv = lc arg inlist argv, do: list_to_binary(arg)
 
     { config, argv } = process_argv(argv, Kernel.CLI.Config.new)
-    :gen_server.call(:elixir_code_server, { :argv, argv })
+    :gen_server.call(:elixir_code_server, { :argv, argv }, System.services_timeout)
 
     run fn ->
       Enum.map Enum.reverse(config.commands), process_command(&1, config)
@@ -24,7 +24,7 @@ defmodule Kernel.CLI do
   Wait until the CLI finishes procesing options.
   """
   def wait_until_finished do
-    case :gen_server.call(:elixir_code_server, { :wait_until_finished, self }) do
+    case :gen_server.call(:elixir_code_server, { :wait_until_finished, self }, System.services_timeout) do
       :wait ->
         receive do
           { :elixir_code_server, :finished } -> :ok
@@ -74,7 +74,7 @@ defmodule Kernel.CLI do
   ## Private
 
   defp at_exit(status) do
-    hooks = :gen_server.call(:elixir_code_server, :flush_at_exit)
+    hooks = :gen_server.call(:elixir_code_server, :flush_at_exit, System.services_timeout)
 
     lc hook inlist hooks do
       try do

lib/elixir/lib/system.ex

@@ -50,7 +50,7 @@ defmodule System do
   """
   @spec argv() :: [String.t]
   def argv do
-    :gen_server.call(:elixir_code_server, :argv)
+    :gen_server.call(:elixir_code_server, :argv, System.services_timeout)
   end
 
   @doc """
@@ -296,6 +296,14 @@ defmodule System do
     do_halt(to_char_list(status), options)
   end
 
+  # services_timeout/0 is an internal function only to be used by Elixir.
+
+  @doc false
+  @spec services_timeout() :: non_neg_integer | :infinity
+  def services_timeout() do
+    :elixir_compiler.get_timeout
+  end
+
   # Support R15B
   if List.member?(:erlang.module_info(:exports), { :halt, 2 }) do
     defp do_halt(status, options),  do: :erlang.halt(status, options)
@@ -307,7 +315,7 @@ defmodule System do
   ## Helpers
 
   defp server_call(args) do
-    :gen_server.call(:elixir_code_server, args)
+    :gen_server.call(:elixir_code_server, args, System.services_timeout)
   end
 
   defp filter_stacktrace([{ Kernel, :raise, _, _ }|t]), do: t

lib/elixir/src/elixir_compiler.erl

@@ -1,5 +1,5 @@
 -module(elixir_compiler).
--export([get_opts/0, get_opt/1, get_opt/2, string/2, file/1, file_to_path/2]).
+-export([get_opts/0, get_opt/1, get_opt/2, string/2, file/1, file_to_path/2, get_timeout/0]).
 -export([core/0, module/3, eval_forms/4]).
 -include("elixir.hrl").
 -compile({parse_transform, elixir_transform}).
@@ -16,8 +16,14 @@ get_opt(Key, Dict) ->
     { Key, Value } -> Value
   end.
 
+get_timeout() ->
+  case application:get_env(elixir, system_services_timeout) of
+    {ok, Val} -> Val;
+    undefined -> 60000
+  end.
+
 get_opts() ->
-  gen_server:call(elixir_code_server, compiler_options).
+  gen_server:call(elixir_code_server, compiler_options, get_timeout()).
 
 %% Compiles the given string.
 
@@ -107,7 +113,7 @@ module(Forms, File, Options, Bootstrap, Callback) when
 
 core() ->
   application:start(elixir),
-  gen_server:call(elixir_code_server, { compiler_options, [{docs,false},{internal,true}] }),
+  gen_server:call(elixir_code_server, { compiler_options, [{docs,false},{internal,true}] }, get_timeout()),
   [core_file(File) || File <- core_main()].
 
 %% HELPERS
@@ -139,7 +145,7 @@ module_form(Fun, Exprs, Line, File, Module, Vars) when
 %% Generate module names from code server.
 
 retrieve_module_name() ->
-  gen_server:call(elixir_code_server, retrieve_module_name).
+  gen_server:call(elixir_code_server, retrieve_module_name, get_timeout()).
 
 return_module_name(I) ->
   gen_server:cast(elixir_code_server, { return_module_name, I }).
@@ -207,4 +213,4 @@ format_errors(File, Errors) ->
 format_warnings(Bootstrap, File, Warnings) ->
   lists:foreach(fun ({_, Each}) ->
     lists:foreach(fun (Warning) -> elixir_errors:handle_file_warning(Bootstrap, File, Warning) end, Each)
-  end, Warnings).
+  end, Warnings).

lib/elixir/test/elixir/gen_server/behaviour_test.exs

@@ -31,8 +31,8 @@ defmodule GenServer.BehaviourTest do
 
   test :using do
     assert { :ok, pid } = :gen_server.start_link(Sample, [:hello], [])
-    assert :gen_server.call(pid, :pop) == :hello
+    assert :gen_server.call(pid, :pop, System.services_timeout) == :hello
     assert :gen_server.cast(pid, { :push, :world }) == :ok
-    assert :gen_server.call(pid, :pop) == :world
+    assert :gen_server.call(pid, :pop, System.services_timeout) == :world
   end
 end

lib/ex_unit/lib/ex_unit/cli_formatter.ex

@@ -18,7 +18,7 @@ defmodule ExUnit.CLIFormatter do
   end
 
   def suite_finished(id) do
-    :gen_server.call(id, :suite_finished)
+    :gen_server.call(id, :suite_finished, System.services_timeout)
   end
 
   def case_started(_id, _test_case) do
@@ -113,4 +113,4 @@ defmodule ExUnit.CLIFormatter do
       binary
     end
   end
-end
+end

lib/ex_unit/lib/ex_unit/server.ex

@@ -30,15 +30,15 @@ defmodule ExUnit.Server do
   ## After run API
 
   def options do
-    :gen_server.call(__MODULE__, :options)
+    :gen_server.call(__MODULE__, :options, System.services_timeout)
   end
 
   def cases do
-    :gen_server.call(__MODULE__, :cases)
+    :gen_server.call(__MODULE__, :cases, System.services_timeout)
   end
 
   def run_after_spawn do
-    funs = :gen_server.call(__MODULE__, :after_spawn)
+    funs = :gen_server.call(__MODULE__, :after_spawn, System.services_timeout)
     lc fun inlist funs, do: fun.()
   end
 

lib/mix/lib/mix/server.ex

@@ -12,7 +12,7 @@ defmodule Mix.Server do
   end
 
   def call(arg) do
-    :gen_server.call(__MODULE__, arg)
+    :gen_server.call(__MODULE__, arg, System.services_timeout)
   end
 
   def cast(arg) do

src/elixir.app.src

@@ -6,5 +6,6 @@
   ]},
  {registered,[elixir_code_server]},
  {applications, [kernel,stdlib]},
- {mod, {elixir,[]}}
-]}.
+ {mod, {elixir,[]}},
+ {env, [{system_services_timeout, 60000}]}
+]}.