mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-24 16:23:40 +01:00
* src/ejabberd_loglevel.erl: Preliminary dynamic loglevel support.
Debug can be enabled with the command "ejabberd_loglevel:set(5)". (EJAB-74) * src/ejabberd_app.erl: Likewise. * src/ejabberd.hrl: Likewise (More log levels are now supported). * src/ram_file_io_server.erl: Likewise (Needed to dynamically recompile the error logger). SVN Revision: 689
This commit is contained in:
Mickaël Rémond
parent
0b281746c2
commit
beb3a450f0
@ -1,3 +1,12 @@
|
||||
2006-12-04 Mickael Remond <mickael.remond@process-one.net>
|
||||
|
||||
* src/ejabberd_loglevel.erl: Preliminary dynamic loglevel support.
|
||||
Debug can be enabled with the command "ejabberd_loglevel:set(5)".
|
||||
* src/ejabberd_app.erl: Likewise.
|
||||
* src/ejabberd.hrl: Likewise (More log levels are now supported).
|
||||
* src/ram_file_io_server.erl: Likewise (Needed to dynamically
|
||||
recompile the error logger).
|
||||
|
||||
2006-12-01 Alexey Shchepin <alexey@sevcom.net>
|
||||
|
||||
* src/ejabberd_receiver.erl: Bugfix
|
||||
|
||||
@ -5,27 +5,28 @@
|
||||
%%% Created : 17 Nov 2002 by Alexey Shchepin <alexey@sevcom.net>
|
||||
%%% Id : $Id$
|
||||
%%%----------------------------------------------------------------------
|
||||
|
||||
-define(VERSION, "1.1.2").
|
||||
|
||||
%-define(ejabberd_debug, true).
|
||||
%-define(DBGFSM, true).
|
||||
|
||||
-ifdef(ejabberd_debug).
|
||||
-define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
|
||||
[self(),?MODULE,?LINE]++Args)).
|
||||
-else.
|
||||
-define(DEBUG(F,A),[]).
|
||||
-endif.
|
||||
-define(VERSION, "1.1.2").
|
||||
|
||||
-define(ERROR_MSG(Format, Args),
|
||||
error_logger:error_msg("E(~p:~p:~p): "++Format++"~n",
|
||||
[self(),?MODULE,?LINE]++Args)).
|
||||
%% ---------------------------------
|
||||
%% Logging mechanism
|
||||
|
||||
-define(DEBUG(Format, Args),
|
||||
ejabberd_logger:debug_msg(?MODULE,?LINE,Format, Args)).
|
||||
|
||||
-define(INFO_MSG(Format, Args),
|
||||
error_logger:info_msg("I(~p:~p:~p): "++Format++"~n",
|
||||
[self(),?MODULE,?LINE]++Args)).
|
||||
ejabberd_logger:info_msg(?MODULE,?LINE,Format, Args)).
|
||||
|
||||
-define(WARNING_MSG(Format, Args),
|
||||
ejabberd_logger:warning_msg(?MODULE,?LINE,Format, Args)).
|
||||
|
||||
-define(ERROR_MSG(Format, Args),
|
||||
ejabberd_logger:error_msg(?MODULE,?LINE,Format, Args)).
|
||||
|
||||
-define(CRITICAL_MSG(Format, Args),
|
||||
ejabberd_logger:critical_msg(?MODULE,?LINE,Format, Args)).
|
||||
|
||||
-define(MYHOSTS, ejabberd_config:get_global_option(hosts)).
|
||||
-define(MYNAME, hd(ejabberd_config:get_global_option(hosts))).
|
||||
@ -36,7 +37,6 @@
|
||||
-define(CONFIG_PATH, "ejabberd.cfg").
|
||||
-define(LOG_PATH, "ejabberd.log").
|
||||
|
||||
|
||||
-define(PRIVACY_SUPPORT, true).
|
||||
|
||||
-define(EJABBERD_URI, "http://ejabberd.jabber.ru").
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
-include("ejabberd.hrl").
|
||||
|
||||
start(normal, _Args) ->
|
||||
ejabberd_loglevel:set(4),
|
||||
application:start(sasl),
|
||||
randoms:start(),
|
||||
db_init(),
|
||||
|
||||
118
src/ejabberd_loglevel.erl
Normal file
118
src/ejabberd_loglevel.erl
Normal file
@ -0,0 +1,118 @@
|
||||
%%%----------------------------------------------------------------------
|
||||
%%% File : ejabberd_loglevel.erl
|
||||
%%% Author : Mickael Remond <mremond@process-one.net>
|
||||
%%% Purpose : Loglevel switcher.
|
||||
%%% Be careful: you should not have any ejabberd_logger module
|
||||
%%% as ejabberd_loglevel switcher is compiling and loading
|
||||
%%% dynamically a "virtual" ejabberd_logger module (Described
|
||||
%%% in a string at the end of this module).
|
||||
%%% Created : 29 Nov 2006 by Mickael Remond <mremond@process-one.net>
|
||||
%%%----------------------------------------------------------------------
|
||||
-module(ejabberd_loglevel).
|
||||
-author('mickael.remond@process-one.net').
|
||||
-svn('$Revision: 685 $ ').
|
||||
|
||||
-export([set/1]).
|
||||
|
||||
-define(LOGMODULE, "error_logger").
|
||||
|
||||
%% Error levels:
|
||||
%% 0 -> No log
|
||||
%% 1 -> Critical
|
||||
%% 2 -> Error
|
||||
%% 3 -> Warning
|
||||
%% 4 -> Info
|
||||
%% 5 -> Debug
|
||||
set(Loglevel) when is_integer(Loglevel) ->
|
||||
Forms = compile_string(?LOGMODULE, ejabberd_logger_src(Loglevel)),
|
||||
load_logger(Forms, ?LOGMODULE, Loglevel);
|
||||
set(_) ->
|
||||
exit("Loglevel must be an integer").
|
||||
|
||||
%% --------------------------------------------------------------
|
||||
%% Compile a string into a module and returns the binary
|
||||
compile_string(Mod, Str) ->
|
||||
Fname = Mod ++ ".erl",
|
||||
{ok, Fd} = open_ram_file(Fname),
|
||||
file:write(Fd, Str),
|
||||
file:position(Fd, 0),
|
||||
case epp_dodger:parse(Fd) of
|
||||
{ok, Tree} ->
|
||||
Forms = revert_tree(Tree),
|
||||
close_ram_file(Fd),
|
||||
Forms;
|
||||
Error ->
|
||||
close_ram_file(Fd),
|
||||
Error
|
||||
end.
|
||||
|
||||
open_ram_file(Fname) ->
|
||||
ram_file_io_server:start(self(), Fname, [read,write]).
|
||||
|
||||
close_ram_file(Fd) ->
|
||||
file:close(Fd).
|
||||
|
||||
revert_tree(Tree) ->
|
||||
[erl_syntax:revert(T) || T <- Tree].
|
||||
|
||||
load_logger(Forms, Mod, Loglevel) ->
|
||||
Fname = Mod ++ ".erl",
|
||||
case compile:forms(Forms, [binary, {d,'LOGLEVEL',Loglevel}]) of
|
||||
{ok, M, Bin} ->
|
||||
code:load_binary(M, Fname, Bin);
|
||||
Error ->
|
||||
io:format("Error ~p~n", [Error])
|
||||
end.
|
||||
|
||||
%% --------------------------------------------------------------
|
||||
%% Code of the ejabberd logger, dynamically compiled and loaded
|
||||
%% This allows to dynamically change log level while keeping a
|
||||
%% very efficient code.
|
||||
ejabberd_logger_src(Loglevel) ->
|
||||
L = integer_to_list(Loglevel),
|
||||
"-module(ejabberd_logger).
|
||||
-author('mickael.remond@process-one.net').
|
||||
-svn('$Revision: 685 $ ').
|
||||
|
||||
-export([debug_msg/4,
|
||||
info_msg/4,
|
||||
warning_msg/4,
|
||||
error_msg/4,
|
||||
critical_msg/4]).
|
||||
|
||||
%% Helper functions
|
||||
debug_msg(Module, Line, Format, Args) when " ++ L ++ " >= 5 ->
|
||||
notify(info_msg,
|
||||
\"D(~p:~p:~p) : \"++Format++\"~n\",
|
||||
[self(), Module, Line]++Args);
|
||||
debug_msg(_,_,_,_) -> ok.
|
||||
|
||||
info_msg(Module, Line, Format, Args) when " ++ L ++ " >= 4 ->
|
||||
notify(info_msg,
|
||||
\"I(~p:~p:~p) : \"++Format++\"~n\",
|
||||
[self(), Module, Line]++Args);
|
||||
info_msg(_,_,_,_) -> ok.
|
||||
|
||||
warning_msg(Module, Line, Format, Args) when " ++ L ++ " >= 3 ->
|
||||
notify(error,
|
||||
\"W(~p:~p:~p) : \"++Format++\"~n\",
|
||||
[self(), Module, Line]++Args);
|
||||
warning_msg(_,_,_,_) -> ok.
|
||||
|
||||
error_msg(Module, Line, Format, Args) when " ++ L ++ " >= 2 ->
|
||||
notify(error,
|
||||
\"E(~p:~p:~p) : \"++Format++\"~n\",
|
||||
[self(), Module, Line]++Args);
|
||||
error_msg(_,_,_,_) -> ok.
|
||||
|
||||
critical_msg(Module, Line, Format, Args) when " ++ L ++ " >= 1 ->
|
||||
notify(error,
|
||||
\"C(~p:~p:~p) : \"++Format++\"~n\",
|
||||
[self(), Module, Line]++Args);
|
||||
critical_msg(_,_,_,_) -> ok.
|
||||
|
||||
%% Distribute the message to the Erlang error logger
|
||||
notify(Type, Format, Args) ->
|
||||
LoggerMsg = {Type, group_leader(), {self(), Format, Args}},
|
||||
gen_event:notify(error_logger, LoggerMsg).
|
||||
".
|
||||
408
src/ram_file_io_server.erl
Normal file
408
src/ram_file_io_server.erl
Normal file
@ -0,0 +1,408 @@
|
||||
%% ``The contents of this file are subject to the Erlang Public License,
|
||||
%% Version 1.1, (the "License"); you may not use this file except in
|
||||
%% compliance with the License. You should have received a copy of the
|
||||
%% Erlang Public License along with this software. If not, it can be
|
||||
%% retrieved via the world wide web at http://www.erlang.org/.
|
||||
%%
|
||||
%% Software distributed under the License is distributed on an "AS IS"
|
||||
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
|
||||
%% the License for the specific language governing rights and limitations
|
||||
%% under the License.
|
||||
%%
|
||||
%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
|
||||
%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
|
||||
%% AB. All Rights Reserved.''
|
||||
%%
|
||||
%% $Id$
|
||||
%%
|
||||
%% This file is mostly copied from Erlang file_io_server.erl
|
||||
%% See: http://www.erlang.org/ml-archive/erlang-questions/200607/msg00080.html
|
||||
%% for details on ram_file_io_server.erl (Erlang OTP R11B-2)
|
||||
-module(ram_file_io_server).
|
||||
|
||||
%% A simple file server for io to one file instance per server instance.
|
||||
|
||||
-export([format_error/1]).
|
||||
-export([start/3, start_link/3]).
|
||||
|
||||
-record(state, {handle,owner,mref,buf,read_mode}).
|
||||
|
||||
-define(PRIM_FILE, ram_file).
|
||||
-define(READ_SIZE_LIST, 128).
|
||||
-define(READ_SIZE_BINARY, (8*1024)).
|
||||
|
||||
-define(eat_message(M, T), receive M -> M after T -> timeout end).
|
||||
|
||||
%%%-----------------------------------------------------------------
|
||||
%%% Exported functions
|
||||
|
||||
format_error({_Line, ?MODULE, Reason}) ->
|
||||
io_lib:format("~w", [Reason]);
|
||||
format_error({_Line, Mod, Reason}) ->
|
||||
Mod:format_error(Reason);
|
||||
format_error(ErrorId) ->
|
||||
erl_posix_msg:message(ErrorId).
|
||||
|
||||
start(Owner, FileName, ModeList)
|
||||
when pid(Owner), list(FileName), list(ModeList) ->
|
||||
do_start(spawn, Owner, FileName, ModeList).
|
||||
|
||||
start_link(Owner, FileName, ModeList)
|
||||
when pid(Owner), list(FileName), list(ModeList) ->
|
||||
do_start(spawn_link, Owner, FileName, ModeList).
|
||||
|
||||
%%%-----------------------------------------------------------------
|
||||
%%% Server starter, dispatcher and helpers
|
||||
|
||||
do_start(Spawn, Owner, FileName, ModeList) ->
|
||||
Self = self(),
|
||||
Ref = make_ref(),
|
||||
Pid =
|
||||
erlang:Spawn(
|
||||
fun() ->
|
||||
%% process_flag(trap_exit, true),
|
||||
{ReadMode,Opts} =
|
||||
case lists:member(binary, ModeList) of
|
||||
true ->
|
||||
{binary,ModeList};
|
||||
false ->
|
||||
{list,[binary|ModeList]}
|
||||
end,
|
||||
case ?PRIM_FILE:open(FileName, Opts) of
|
||||
{error, Reason} = Error ->
|
||||
Self ! {Ref, Error},
|
||||
exit(Reason);
|
||||
{ok, Handle} ->
|
||||
%% XXX must I handle R6 nodes here?
|
||||
M = erlang:monitor(process, Owner),
|
||||
Self ! {Ref, ok},
|
||||
server_loop(
|
||||
#state{handle = Handle,
|
||||
owner = Owner,
|
||||
mref = M,
|
||||
buf = <<>>,
|
||||
read_mode = ReadMode})
|
||||
end
|
||||
end),
|
||||
Mref = erlang:monitor(process, Pid),
|
||||
receive
|
||||
{Ref, {error, _Reason} = Error} ->
|
||||
erlang:demonitor(Mref),
|
||||
receive {'DOWN', Mref, _, _, _} -> ok after 0 -> ok end,
|
||||
Error;
|
||||
{Ref, ok} ->
|
||||
erlang:demonitor(Mref),
|
||||
receive
|
||||
{'DOWN', Mref, _, _, Reason} ->
|
||||
{error, Reason}
|
||||
after 0 ->
|
||||
{ok, Pid}
|
||||
end;
|
||||
{'DOWN', Mref, _, _, Reason} ->
|
||||
{error, Reason}
|
||||
end.
|
||||
|
||||
server_loop(#state{mref = Mref} = State) ->
|
||||
receive
|
||||
{file_request, From, ReplyAs, Request} when pid(From) ->
|
||||
case file_request(Request, State) of
|
||||
{reply, Reply, NewState} ->
|
||||
file_reply(From, ReplyAs, Reply),
|
||||
server_loop(NewState);
|
||||
{error, Reply, NewState} ->
|
||||
%% error is the same as reply, except that
|
||||
%% it breaks the io_request_loop further down
|
||||
file_reply(From, ReplyAs, Reply),
|
||||
server_loop(NewState);
|
||||
{stop, Reason, Reply, _NewState} ->
|
||||
file_reply(From, ReplyAs, Reply),
|
||||
exit(Reason)
|
||||
end;
|
||||
{io_request, From, ReplyAs, Request} when pid(From) ->
|
||||
case io_request(Request, State) of
|
||||
{reply, Reply, NewState} ->
|
||||
io_reply(From, ReplyAs, Reply),
|
||||
server_loop(NewState);
|
||||
{error, Reply, NewState} ->
|
||||
%% error is the same as reply, except that
|
||||
%% it breaks the io_request_loop further down
|
||||
io_reply(From, ReplyAs, Reply),
|
||||
server_loop(NewState);
|
||||
{stop, Reason, Reply, _NewState} ->
|
||||
io_reply(From, ReplyAs, Reply),
|
||||
exit(Reason)
|
||||
end;
|
||||
{'DOWN', Mref, _, _, Reason} ->
|
||||
exit(Reason);
|
||||
_ ->
|
||||
server_loop(State)
|
||||
end.
|
||||
|
||||
file_reply(From, ReplyAs, Reply) ->
|
||||
From ! {file_reply, ReplyAs, Reply}.
|
||||
|
||||
io_reply(From, ReplyAs, Reply) ->
|
||||
From ! {io_reply, ReplyAs, Reply}.
|
||||
|
||||
%%%-----------------------------------------------------------------
|
||||
%%% file requests
|
||||
|
||||
file_request({pread,At,Sz},
|
||||
#state{handle=Handle,buf=Buf,read_mode=ReadMode}=State) ->
|
||||
case position(Handle, At, Buf) of
|
||||
{ok,_Offs} ->
|
||||
case ?PRIM_FILE:read(Handle, Sz) of
|
||||
{ok,Bin} when ReadMode==list ->
|
||||
std_reply({ok,binary_to_list(Bin)}, State);
|
||||
Reply ->
|
||||
std_reply(Reply, State)
|
||||
end;
|
||||
Reply ->
|
||||
std_reply(Reply, State)
|
||||
end;
|
||||
file_request({pwrite,At,Data},
|
||||
#state{handle=Handle,buf=Buf}=State) ->
|
||||
case position(Handle, At, Buf) of
|
||||
{ok,_Offs} ->
|
||||
std_reply(?PRIM_FILE:write(Handle, Data), State);
|
||||
Reply ->
|
||||
std_reply(Reply, State)
|
||||
end;
|
||||
file_request(sync,
|
||||
#state{handle=Handle}=State) ->
|
||||
case ?PRIM_FILE:sync(Handle) of
|
||||
{error,_}=Reply ->
|
||||
{stop,normal,Reply,State};
|
||||
Reply ->
|
||||
{reply,Reply,State}
|
||||
end;
|
||||
file_request(close,
|
||||
#state{handle=Handle}=State) ->
|
||||
{stop,normal,?PRIM_FILE:close(Handle),State#state{buf= <<>>}};
|
||||
file_request({position,At},
|
||||
#state{handle=Handle,buf=Buf}=State) ->
|
||||
std_reply(position(Handle, At, Buf), State);
|
||||
file_request(truncate,
|
||||
#state{handle=Handle}=State) ->
|
||||
case ?PRIM_FILE:truncate(Handle) of
|
||||
{error,_Reason}=Reply ->
|
||||
{stop,normal,Reply,State#state{buf= <<>>}};
|
||||
Reply ->
|
||||
{reply,Reply,State}
|
||||
end;
|
||||
file_request(Unknown,
|
||||
#state{}=State) ->
|
||||
Reason = {request, Unknown},
|
||||
{error,{error,Reason},State}.
|
||||
|
||||
std_reply({error,_}=Reply, State) ->
|
||||
{error,Reply,State#state{buf= <<>>}};
|
||||
std_reply(Reply, State) ->
|
||||
{reply,Reply,State#state{buf= <<>>}}.
|
||||
|
||||
%%%-----------------------------------------------------------------
|
||||
%%% I/O request
|
||||
|
||||
io_request({put_chars,Chars}, % binary(Chars) new in R9C
|
||||
#state{buf= <<>>}=State) ->
|
||||
put_chars(Chars, State);
|
||||
io_request({put_chars,Chars}, % binary(Chars) new in R9C
|
||||
#state{handle=Handle,buf=Buf}=State) ->
|
||||
case position(Handle, cur, Buf) of
|
||||
{error,_}=Reply ->
|
||||
{stop,normal,Reply,State#state{buf= <<>>}};
|
||||
_ ->
|
||||
put_chars(Chars, State#state{buf= <<>>})
|
||||
end;
|
||||
io_request({put_chars,Mod,Func,Args},
|
||||
#state{}=State) ->
|
||||
case catch apply(Mod, Func, Args) of
|
||||
Chars when list(Chars); binary(Chars) ->
|
||||
io_request({put_chars,Chars}, State);
|
||||
_ ->
|
||||
{error,{error,Func},State}
|
||||
end;
|
||||
io_request({get_until,_Prompt,Mod,Func,XtraArgs},
|
||||
#state{}=State) ->
|
||||
get_chars(io_lib, get_until, {Mod, Func, XtraArgs}, State);
|
||||
io_request({get_chars,_Prompt,N}, % New in R9C
|
||||
#state{}=State) ->
|
||||
get_chars(N, State);
|
||||
io_request({get_chars,_Prompt,Mod,Func,XtraArg}, % New in R9C
|
||||
#state{}=State) ->
|
||||
get_chars(Mod, Func, XtraArg, State);
|
||||
io_request({get_line,_Prompt}, % New in R9C
|
||||
#state{}=State) ->
|
||||
get_chars(io_lib, collect_line, [], State);
|
||||
io_request({setopts, Opts}, % New in R9C
|
||||
#state{}=State) when list(Opts) ->
|
||||
setopts(Opts, State);
|
||||
io_request({requests,Requests},
|
||||
#state{}=State) when list(Requests) ->
|
||||
io_request_loop(Requests, {reply,ok,State});
|
||||
io_request(Unknown,
|
||||
#state{}=State) ->
|
||||
Reason = {request,Unknown},
|
||||
{error,{error,Reason},State}.
|
||||
|
||||
|
||||
|
||||
%% Process a list of requests as long as the results are ok.
|
||||
|
||||
io_request_loop([], Result) ->
|
||||
Result;
|
||||
io_request_loop([_Request|_Tail],
|
||||
{stop,_Reason,_Reply,_State}=Result) ->
|
||||
Result;
|
||||
io_request_loop([_Request|_Tail],
|
||||
{error,_Reply,_State}=Result) ->
|
||||
Result;
|
||||
io_request_loop([Request|Tail],
|
||||
{reply,_Reply,State}) ->
|
||||
io_request_loop(Tail, io_request(Request, State)).
|
||||
|
||||
|
||||
|
||||
%% I/O request put_chars
|
||||
%%
|
||||
put_chars(Chars, #state{handle=Handle}=State) ->
|
||||
case ?PRIM_FILE:write(Handle, Chars) of
|
||||
{error,_}=Reply ->
|
||||
{stop,normal,Reply,State};
|
||||
Reply ->
|
||||
{reply,Reply,State}
|
||||
end.
|
||||
|
||||
|
||||
%% Process the I/O request get_chars
|
||||
%%
|
||||
get_chars(0, #state{read_mode=ReadMode}=State) ->
|
||||
{reply,cast(<<>>, ReadMode),State};
|
||||
get_chars(N, #state{buf=Buf,read_mode=ReadMode}=State)
|
||||
when integer(N), N > 0, N =< size(Buf) ->
|
||||
{B1,B2} = split_binary(Buf, N),
|
||||
{reply,cast(B1, ReadMode),State#state{buf=B2}};
|
||||
get_chars(N, #state{handle=Handle,buf=Buf,read_mode=ReadMode}=State)
|
||||
when integer(N), N > 0 ->
|
||||
BufSize = size(Buf),
|
||||
NeedSize = N-BufSize,
|
||||
Size = max(NeedSize, ?READ_SIZE_BINARY),
|
||||
case ?PRIM_FILE:read(Handle, Size) of
|
||||
{ok, B} ->
|
||||
if BufSize+size(B) < N ->
|
||||
std_reply(cat(Buf, B, ReadMode), State);
|
||||
true ->
|
||||
{B1,B2} = split_binary(B, NeedSize),
|
||||
{reply,cat(Buf, B1, ReadMode),State#state{buf=B2}}
|
||||
end;
|
||||
eof when BufSize==0 ->
|
||||
{reply,eof,State};
|
||||
eof ->
|
||||
std_reply(cast(Buf, ReadMode), State);
|
||||
{error,Reason}=Error ->
|
||||
{stop,Reason,Error,State#state{buf= <<>>}}
|
||||
end;
|
||||
get_chars(_N, #state{}=State) ->
|
||||
{error,{error,get_chars},State}.
|
||||
|
||||
get_chars(Mod, Func, XtraArg, #state{buf= <<>>}=State) ->
|
||||
get_chars_empty(Mod, Func, XtraArg, start, State);
|
||||
get_chars(Mod, Func, XtraArg, #state{buf=Buf}=State) ->
|
||||
get_chars_apply(Mod, Func, XtraArg, start, State#state{buf= <<>>}, Buf).
|
||||
|
||||
get_chars_empty(Mod, Func, XtraArg, S,
|
||||
#state{handle=Handle,read_mode=ReadMode}=State) ->
|
||||
case ?PRIM_FILE:read(Handle, read_size(ReadMode)) of
|
||||
{ok,Bin} ->
|
||||
get_chars_apply(Mod, Func, XtraArg, S, State, Bin);
|
||||
eof ->
|
||||
get_chars_apply(Mod, Func, XtraArg, S, State, eof);
|
||||
{error,Reason}=Error ->
|
||||
{stop,Reason,Error,State}
|
||||
end.
|
||||
|
||||
get_chars_apply(Mod, Func, XtraArg, S0,
|
||||
#state{read_mode=ReadMode}=State, Data0) ->
|
||||
Data1 = case ReadMode of
|
||||
list when binary(Data0) -> binary_to_list(Data0);
|
||||
_ -> Data0
|
||||
end,
|
||||
case catch Mod:Func(S0, Data1, XtraArg) of
|
||||
{stop,Result,Buf} ->
|
||||
{reply,Result,State#state{buf=cast_binary(Buf)}};
|
||||
{'EXIT',Reason} ->
|
||||
{stop,Reason,{error,err_func(Mod, Func, XtraArg)},State};
|
||||
S1 ->
|
||||
get_chars_empty(Mod, Func, XtraArg, S1, State)
|
||||
end.
|
||||
|
||||
%% Convert error code to make it look as before
|
||||
err_func(io_lib, get_until, {_,F,_}) ->
|
||||
F;
|
||||
err_func(_, F, _) ->
|
||||
F.
|
||||
|
||||
|
||||
|
||||
%% Process the I/O request setopts
|
||||
%%
|
||||
%% setopts
|
||||
setopts(Opts0, State) ->
|
||||
Opts = proplists:substitute_negations([{list,binary}], Opts0),
|
||||
case proplists:get_value(binary, Opts) of
|
||||
true ->
|
||||
{ok,ok,State#state{read_mode=binary}};
|
||||
false ->
|
||||
{ok,ok,State#state{read_mode=list}};
|
||||
_ ->
|
||||
{error,{error,badarg},State}
|
||||
end.
|
||||
|
||||
|
||||
|
||||
%% Concatenate two binaries and convert the result to list or binary
|
||||
cat(B1, B2, binary) ->
|
||||
list_to_binary([B1,B2]);
|
||||
cat(B1, B2, list) ->
|
||||
binary_to_list(B1)++binary_to_list(B2).
|
||||
|
||||
%% Cast binary to list or binary
|
||||
cast(B, binary) ->
|
||||
B;
|
||||
cast(B, list) ->
|
||||
binary_to_list(B).
|
||||
|
||||
%% Convert buffer to binary
|
||||
cast_binary(Binary) when binary(Binary) ->
|
||||
Binary;
|
||||
cast_binary(List) when list(List) ->
|
||||
list_to_binary(List);
|
||||
cast_binary(_EOF) ->
|
||||
<<>>.
|
||||
|
||||
%% Read size for different read modes
|
||||
read_size(binary) ->
|
||||
?READ_SIZE_BINARY;
|
||||
read_size(list) ->
|
||||
?READ_SIZE_LIST.
|
||||
|
||||
max(A, B) when A >= B ->
|
||||
A;
|
||||
max(_, B) ->
|
||||
B.
|
||||
|
||||
%%%-----------------------------------------------------------------
|
||||
%%% ?PRIM_FILE helpers
|
||||
|
||||
%% Compensates ?PRIM_FILE:position/2 for the number of bytes
|
||||
%% we have buffered
|
||||
|
||||
position(Handle, cur, Buf) ->
|
||||
position(Handle, {cur, 0}, Buf);
|
||||
position(Handle, {cur, Offs}, Buf) when list(Buf) ->
|
||||
?PRIM_FILE:position(Handle, {cur, Offs-length(Buf)});
|
||||
position(Handle, {cur, Offs}, Buf) when binary(Buf) ->
|
||||
?PRIM_FILE:position(Handle, {cur, Offs-size(Buf)});
|
||||
position(Handle, At, _Buf) ->
|
||||
?PRIM_FILE:position(Handle, At).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user