MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 07:23:53 +01:00
Code Issues Releases Wiki Activity

modules/client/sync/rooms/state: Move hero scan count to conf item; dedup constant.

Browse source
This commit is contained in:
Jason Volk 2021-01-04 02:45:22 -08:00
parent 668e265623
commit a5ddaf0a41
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/client/sync/rooms/state.cc
View file

@ -25,6 +25,8 @@ namespace ircd::m::sync
static bool room_invite_state_linear(data &); static bool room_invite_state_linear(data &);
static bool room_state_linear(data &); static bool room_state_linear(data &);
static const size_t MEMBER_SCAN_MAX {32};
extern conf::item<size_t> member_scan_max;
extern conf::item<bool> lazyload_members_enable; extern conf::item<bool> lazyload_members_enable;
extern conf::item<bool> crazyload_historical_members; extern conf::item<bool> crazyload_historical_members;
@ -276,6 +278,13 @@ ircd::m::sync::_room_state_polylog(data &data)
return room_state_polylog_events(data); return room_state_polylog_events(data);
} }
decltype(ircd::m::sync::member_scan_max)
ircd::m::sync::member_scan_max
{
{ "name", "ircd.client.sync.rooms.state.members.scan.max" },
{ "default", 12L },
};
decltype(ircd::m::sync::lazyload_members_enable) decltype(ircd::m::sync::lazyload_members_enable)
ircd::m::sync::lazyload_members_enable ircd::m::sync::lazyload_members_enable
{ {
@ -411,14 +420,14 @@ ircd::m::sync::room_state_polylog_events(data &data)
bool bool
ircd::m::sync::room_state_phased_prefetch(data &data) ircd::m::sync::room_state_phased_prefetch(data &data)
{ {
static const size_t &member_scan_max const size_t configured_count
{ {
24 std::min(size_t(room::events::viewport_size), size_t(member_scan_max))
}; };
static const size_t &member_max const size_t member_count
{ {
std::min(size_t(room::events::viewport_size), member_scan_max) std::min(configured_count, MEMBER_SCAN_MAX)
}; };
const std::pair<string_view, string_view> state_keys[] const std::pair<string_view, string_view> state_keys[]
@ -446,7 +455,7 @@ ircd::m::sync::room_state_phased_prefetch(data &data)
}; };
// Prefetch the senders of the recent room events // Prefetch the senders of the recent room events
for(size_t i(0); events && i < member_max; --events, ++i) for(size_t i(0); events && i < member_count; --events, ++i)
m::prefetch(events.event_idx(), "sender"); m::prefetch(events.event_idx(), "sender");
return true; return true;
@ -548,10 +557,14 @@ ircd::m::sync::room_state_phased_member_events(data &data,
json::stack::array &array) json::stack::array &array)
{ {
// The number of recent room events we'll seek senders for. // The number of recent room events we'll seek senders for.
static const size_t &max{24}; //TODO: XXX dedup const size_t configured_count
const size_t &count
{ {
std::min(size_t(room::events::viewport_size), max) std::min(size_t(room::events::viewport_size), size_t(member_scan_max))
};
const size_t count
{
std::min(configured_count, MEMBER_SCAN_MAX)
}; };
m::room::events it m::room::events it
@ -561,8 +574,8 @@ ircd::m::sync::room_state_phased_member_events(data &data,
// Prefetch the senders of the recent room events // Prefetch the senders of the recent room events
size_t i(0), prefetched(0); size_t i(0), prefetched(0);
std::array<event::idx, max> event_idx; std::array<event::idx, MEMBER_SCAN_MAX> event_idx;
assert(count <= max && count <= event_idx.size()); assert(count <= MEMBER_SCAN_MAX && count <= event_idx.size());
for(; it && i < count; --it, ++i) for(; it && i < count; --it, ++i)
{ {
event_idx[i] = it.event_idx(); event_idx[i] = it.event_idx();