diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-02-11 12:21:50 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-02-11 12:21:50 +0100 |
| commit | 6b0aa99142ab7dcbc3db50b4940d6096d64ab6ef (patch) | |
| tree | e0a35828601078cd489625c7664138d1e73f3c29 /lib/kernel/src | |
| parent | 8abbf2b7e348674930a31c34a08fa1424bc08c78 (diff) | |
| parent | 0660708dd41e5b0b1c2d03487121ace9c3616374 (diff) | |
| download | otp-6b0aa99142ab7dcbc3db50b4940d6096d64ab6ef.tar.gz otp-6b0aa99142ab7dcbc3db50b4940d6096d64ab6ef.tar.bz2 otp-6b0aa99142ab7dcbc3db50b4940d6096d64ab6ef.zip | |
Merge branch 'vd/code_get_mode/OTP-10823'
* vd/code_get_mode/OTP-10823:
Added name prefix to code.xml
Add a new function code:get_mode() can be used to detect how the code servers behaves
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/code.erl | 6 | ||||
| -rw-r--r-- | lib/kernel/src/code_server.erl | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl index 8a543abd6f..03fba96d4b 100644 --- a/lib/kernel/src/code.erl +++ b/lib/kernel/src/code.erl @@ -64,7 +64,8 @@ where_is_file/1, where_is_file/2, set_primary_archive/4, - clash/0]). + clash/0, + get_mode/0]). -export_type([load_error_rsn/0, load_ret/0]). @@ -293,6 +294,9 @@ replace_path(Name, Dir) when (is_atom(Name) orelse is_list(Name)), -spec rehash() -> 'ok'. rehash() -> call(rehash). +-spec get_mode() -> 'embedded' | 'interactive'. +get_mode() -> call(get_mode). + %%----------------------------------------------------------------- call(Req) -> diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index b770fce887..5d74e8620b 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -422,6 +422,9 @@ handle_call({is_cached,File}, {_From,_Tag}, S=#state{cache=Cache}) -> end end; +handle_call(get_mode, {_From,_Tag}, S=#state{mode=Mode}) -> + {reply, Mode, S}; + handle_call(Other,{_From,_Tag}, S) -> error_msg(" ** Codeserver*** ignoring ~w~n ",[Other]), {noreply,S}. |