mirror/alcove
1
0
Fork 0
mirror of https://github.com/uselessd/alcove.git synced 2026-04-15 09:15:19 +00:00
Code Issues Projects Releases Wiki Activity

alcove_drv:call/2,3: add timeout

Browse Source 
Also comment some unused functions to silence dialyzer.
This commit is contained in:
Michael Santos
2014-03-02 12:55:16 -05:00
parent cd9ccde26d
commit 742b7eccf0
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/alcove_drv.erl
View File

@@ -16,21 +16,28 @@
%% API
-export([start/0, start/1, stop/1]).
-export([call/2, cast/2, encode/2, encode/3, event/1, event/2]).
-export([call/2, call/3, cast/2, encode/2, encode/3, event/1, event/2]).
-export([getopts/1]).
-spec start() -> port().
start() ->
start([]).
-spec start(proplists:proplist()) -> port().
start(Options) ->
[Cmd|Argv] = getopts(Options),
open_port({spawn_executable, Cmd}, [{args, Argv}, {packet, 2}, binary]).
call(Port, Data) when is_port(Port), is_binary(Data), byte_size(Data) < 16#ffff ->
call(Port, Data) ->
call(Port, Data, infinity).
call(Port, Data, Timeout) when is_port(Port), is_binary(Data), byte_size(Data) < 16#ffff ->
true = erlang:port_command(Port, Data),
receive
{Port, {data, <<?UINT16(?ALCOVE_MSG_CALL), Msg/binary>>}} ->
binary_to_term(Msg)
after
Timeout ->
{error,timedout}
end.
cast(Port, Data) when is_port(Port), is_binary(Data), byte_size(Data) < 16#ffff ->
@@ -86,10 +93,10 @@ optarg(_) -> "".
switch(Switch) ->
[lists:concat(["-", Switch])].
switch(Switch, Arg) when is_binary(Arg) ->
switch(Switch, binary_to_list(Arg));
switch(Switch, Arg) ->
[lists:concat(["-", Switch]), Arg].
%switch(Switch, Arg) when is_binary(Arg) ->
% switch(Switch, binary_to_list(Arg));
%switch(Switch, Arg) ->
% [lists:concat(["-", Switch]), Arg].
find_executable(Exe) ->
case os:find_executable(Exe) of
@@ -101,7 +108,7 @@ find_executable(Exe) ->
type_to_atom(?ALCOVE_MSG_CALL) -> call;
type_to_atom(?ALCOVE_MSG_CAST) -> cast;
type_to_atom(?ALCOVE_MSG_CHILDIN) -> stdin;
%type_to_atom(?ALCOVE_MSG_CHILDIN) -> stdin;
type_to_atom(?ALCOVE_MSG_CHILDOUT) -> stdout;
type_to_atom(?ALCOVE_MSG_CHILDERR) -> stderr.