Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid calling ejabberd_sm_backend:get_sessions/3 second time when routing presences #4089

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Avoid calling ejabberd_sm_backend:get_sessions/3 second time when routing presences #4089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/ejabberd_sm.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,13 +642,14 @@ do_route_no_resource(<<"presence">>, From, To, Acc, El) ->
Type = mongoose_acc:stanza_type(Acc),
case do_route_no_resource_presence(Type, From, To, Acc, El) of
true ->
PResources = get_user_present_resources(To),
lists:foldl(fun({_, R}, A) ->
NewTo = jid:replace_resource(To, R),
ResourcesPids = get_user_present_resources_and_pids(To),
lists:foldl(fun({Resource, Pid}, Acc1) ->
NewTo = jid:replace_resource(To, Resource),
NewAccParams = #{element => El, from_jid => From, to_jid => NewTo},
A0 = mongoose_acc:update_stanza(NewAccParams, A),
do_route(A0, From, NewTo, El)
end, Acc, PResources);
Acc2 = mongoose_acc:update_stanza(NewAccParams, Acc1),
mongoose_c2s:route(Pid, Acc2),
Acc2
end, Acc, ResourcesPids);
false ->
Acc
end;
Expand Down Expand Up @@ -801,6 +802,13 @@ get_user_present_pids(LUser, LServer) ->
[{S#session.priority, element(2, S#session.sid)} ||
S <- clean_session_list(Ss), is_integer(S#session.priority)].

-spec get_user_present_resources_and_pids(jid:jid()) -> [{Resource :: binary(), pid()}].
get_user_present_resources_and_pids(#jid{luser = LUser, lserver = LServer}) ->
Ss = ejabberd_sm_backend:get_sessions(LUser, LServer),
[{Resource, Pid} ||
#session{usr = {_, _, Resource}, sid = {_, Pid}, priority = Prio}
<- clean_session_list(Ss), is_integer(Prio)].

-spec get_user_present_resources(jid:jid()) -> [{priority(), binary()}].
get_user_present_resources(#jid{luser = LUser, lserver = LServer}) ->
Ss = ejabberd_sm_backend:get_sessions(LUser, LServer),
Expand Down