Use treap for keeping last voice request timestamps

diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 1d360146844a7e6f858839bd3eee322a7e003cc8..75cff1637417dec025d95b564373066e1142903a 100644 (file)
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -1548,7 +1548,7 @@ remove_online_user(JID, StateData, Reason) ->
                error ->
                    StateData#state.nicks
            end,
-               LastTimes = ?DICT:erase(jlib:jid_remove_resource(LJID),
+               LastTimes = treap:delete(jlib:jid_remove_resource(LJID),
                        StateData#state.last_voice_request_time),
     StateData#state{users = Users, nicks = Nicks,
                last_voice_request_time = LastTimes}.
@@ -3850,15 +3850,15 @@ extract_jid_from_voice_approvement(Els) ->
                end, {error, jid_not_found}, Els).
 
 last_voice_request_time(BareJID, StateData) ->
-       case ?DICT:find(BareJID, StateData#state.last_voice_request_time) of
-       {ok, Value} ->
+       case treap:lookup(BareJID, StateData#state.last_voice_request_time) of
+       {ok, _, Value} ->
                Value;
        error ->
                {0, 0, 0}
        end.
 
 update_voice_request_time(BareJID, StateData) ->
-       NewDict = ?DICT:store(BareJID, erlang:now(), StateData#state.last_voice_request_time),
+       NewDict = treap:insert(BareJID, {0, 0}, erlang:now(), StateData#state.last_voice_request_time),
        StateData#state{last_voice_request_time = NewDict}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/mod_muc/mod_muc_room.hrl b/src/mod_muc/mod_muc_room.hrl
index edfa3f4108abd564bd1968f4d183cfd8760d32bd..b0cbc43c251f13bfb522bbceaf8b8459e66582de 100644 (file)
--- a/src/mod_muc/mod_muc_room.hrl
+++ b/src/mod_muc/mod_muc_room.hrl
@@ -71,7 +71,7 @@
                jid,
                config = #config{},
                users = ?DICT:new(),
-               last_voice_request_time = ?DICT:new(),
+               last_voice_request_time = treap:empty(),
                robots = ?DICT:new(),
                nicks = ?DICT:new(),
                affiliations = ?DICT:new(),