Speedup loading of translation files

A dump of 'translations' ETS table is now stored on disc.
The table is only re-created when new/deleted/modified translation
files are detected; otherwise, the ETS table is restored from
the dump file on startup.
This commit is contained in:
Evgeniy Khramtsov 2017-04-16 00:29:55 +03:00
parent 41fe062a8d
commit b6182e6fe8
1 changed files with 122 additions and 37 deletions

View File

@ -29,13 +29,16 @@
-behaviour(gen_server). -behaviour(gen_server).
-export([start_link/0, load_dir/1, load_file/2, translate/2]). -export([start_link/0, reload/0, translate/2]).
%% gen_server callbacks %% gen_server callbacks
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
terminate/2, code_change/3]). terminate/2, code_change/3]).
-include("ejabberd.hrl"). -include("ejabberd.hrl").
-include("logger.hrl"). -include("logger.hrl").
-include_lib("kernel/include/file.hrl").
-define(ZERO_DATETIME, {{0,0,0}, {0,0,0}}).
-record(state, {}). -record(state, {}).
@ -44,16 +47,7 @@ start_link() ->
init([]) -> init([]) ->
process_flag(trap_exit, true), process_flag(trap_exit, true),
ets:new(translations, [named_table, public]), load(),
Dir = case os:getenv("EJABBERD_MSGS_PATH") of
false ->
case code:priv_dir(ejabberd) of
{error, _} -> ?MSGS_DIR;
Path -> filename:join([Path, "msgs"])
end;
Path -> Path
end,
load_dir(iolist_to_binary(Dir)),
xmpp:set_tr_callback({?MODULE, translate}), xmpp:set_tr_callback({?MODULE, translate}),
{ok, #state{}}. {ok, #state{}}.
@ -73,33 +67,59 @@ terminate(_Reason, _State) ->
code_change(_OldVsn, State, _Extra) -> code_change(_OldVsn, State, _Extra) ->
{ok, State}. {ok, State}.
-spec load_dir(binary()) -> ok. -spec reload() -> ok.
reload() ->
load(true).
load_dir(Dir) -> -spec load() -> ok.
case file:list_dir(Dir) of load() ->
{ok, Files} -> load(false).
MsgFiles = lists:filter(fun (FN) ->
case length(FN) > 4 of -spec load(boolean()) -> ok.
true -> load(ForceCacheRebuild) ->
string:substr(FN, length(FN) - 3) {MsgsDirMTime, MsgsDir} = get_msg_dir(),
== ".msg"; {CacheMTime, CacheFile} = get_cache_file(),
_ -> false {FilesMTime, MsgFiles} = get_msg_files(MsgsDir),
end LastModified = lists:max([MsgsDirMTime, FilesMTime]),
end, if ForceCacheRebuild orelse CacheMTime < LastModified ->
Files), load(MsgFiles, MsgsDir),
lists:foreach(fun (FNS) -> dump_to_file(CacheFile);
FN = list_to_binary(FNS), true ->
LP = ascii_tolower(str:substr(FN, 1, case ets:file2tab(CacheFile) of
byte_size(FN) - 4)), {ok, _} ->
L = case str:tokens(LP, <<".">>) of ok;
[Language] -> Language; {error, {read_error, {file_error, _, enoent}}} ->
[Language, _Project] -> Language load(MsgFiles, MsgsDir);
end, {error, {read_error, {file_error, _, Reason}}} ->
load_file(L, <<Dir/binary, "/", FN/binary>>) ?WARNING_MSG("Failed to read translation cache from ~s: ~s",
end, [CacheFile, file:format_error(Reason)]),
MsgFiles), load(MsgFiles, MsgsDir);
ok; {error, Reason} ->
{error, Reason} -> ?ERROR_MSG("~p", [Reason]) ?WARNING_MSG("Failed to read translation cache from ~s: ~p",
[CacheFile, Reason]),
load(MsgFiles, MsgsDir)
end
end.
-spec load([file:filename()], file:filename()) -> ok.
load(Files, Dir) ->
try ets:new(translations, [named_table, public])
catch _:badarg -> ok
end,
case Files of
[] ->
?WARNING_MSG("No translation files found in ~s, "
"check directory access", [Dir]);
_ ->
ets:delete_all_objects(translations),
?INFO_MSG("Building translation cache, this may take a while", []),
lists:foreach(
fun(File) ->
BaseName = filename:basename(File),
Lang = str:to_lower(filename:rootname(BaseName)),
load_file(iolist_to_binary(Lang), File)
end, Files)
end. end.
load_file(Lang, File) -> load_file(Lang, File) ->
@ -206,3 +226,68 @@ ascii_tolower_s([C | Cs]) when C >= $A, C =< $Z ->
[C + ($a - $A) | ascii_tolower_s(Cs)]; [C + ($a - $A) | ascii_tolower_s(Cs)];
ascii_tolower_s([C | Cs]) -> [C | ascii_tolower_s(Cs)]; ascii_tolower_s([C | Cs]) -> [C | ascii_tolower_s(Cs)];
ascii_tolower_s([]) -> []. ascii_tolower_s([]) -> [].
-spec get_msg_dir() -> {calendar:datetime(), file:filename()}.
get_msg_dir() ->
Dir = case os:getenv("EJABBERD_MSGS_PATH") of
false ->
case code:priv_dir(ejabberd) of
{error, _} -> ?MSGS_DIR;
Path -> filename:join([Path, "msgs"])
end;
Path -> Path
end,
case file:read_file_info(Dir) of
{ok, #file_info{mtime = MTime}} ->
{MTime, Dir};
{error, Reason} ->
?ERROR_MSG("Failed to read directory ~s: ~s",
[Dir, file:format_error(Reason)]),
{?ZERO_DATETIME, Dir}
end.
-spec get_msg_files(file:filename()) -> {calendar:datetime(), [file:filename()]}.
get_msg_files(MsgsDir) ->
Res = filelib:fold_files(
MsgsDir, ".+\\.msg", false,
fun(File, {MTime, Files} = Acc) ->
case file:read_file_info(File) of
{ok, #file_info{mtime = Time}} ->
{lists:max([MTime, Time]), [File|Files]};
{error, Reason} ->
?ERROR_MSG("Failed to read translation file ~s: ~s",
[File, file:format_error(Reason)]),
Acc
end
end, {?ZERO_DATETIME, []}),
case Res of
{_, []} ->
case file:list_dir(MsgsDir) of
{ok, _} -> ok;
{error, Reason} ->
?ERROR_MSG("Failed to read directory ~s: ~s",
[MsgsDir, file:format_error(Reason)])
end;
_ ->
ok
end,
Res.
-spec get_cache_file() -> {calendar:datetime(), file:filename()}.
get_cache_file() ->
MnesiaDir = mnesia:system_info(directory),
CacheFile = filename:join(MnesiaDir, "translations.cache"),
CacheMTime = case file:read_file_info(CacheFile) of
{ok, #file_info{mtime = Time}} -> Time;
{error, _} -> ?ZERO_DATETIME
end,
{CacheMTime, CacheFile}.
-spec dump_to_file(file:filename()) -> ok.
dump_to_file(CacheFile) ->
case ets:tab2file(translations, CacheFile) of
ok -> ok;
{error, Reason} ->
?WARNING_MSG("Failed to create translation cache in ~s: ~p",
[CacheFile, Reason])
end.