MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-07-03 09:18:19 +02:00
Code Issues Releases Wiki Activity

modules/client/sync: Minor cleanup of condition statements.

Browse source
This commit is contained in:
Jason Volk 2019-07-12 14:02:42 -07:00
parent 393e4f32de
commit 6b54ab902e
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/client/sync.cc
View file

@ -266,17 +266,17 @@ ircd::m::sync::handle_get(client &client,
const bool should_longpoll const bool should_longpoll
{ {
// longpoll can be disabled by a conf item (for developers). // longpoll can be disabled by a conf item (for developers).
longpoll_enable && longpoll_enable
// polylog-phased sync and longpoll are totally exclusive. // polylog-phased sync and longpoll are totally exclusive.
!data.phased && && !data.phased
// initial_sync cannot hang on a longpoll otherwise bad things clients // initial_sync cannot hang on a longpoll otherwise bad things clients
!initial_sync && && !initial_sync
// When the since token is in advance of the vm sequence number // When the since token is in advance of the vm sequence number
// there's no events to consider for a sync. // there's no events to consider for a sync.
range.first > vm::sequence::retired && range.first > vm::sequence::retired
}; };
// Determine if linear sync mode should be used. If this is not used, and // Determine if linear sync mode should be used. If this is not used, and
@ -284,23 +284,25 @@ ircd::m::sync::handle_get(client &client,
const bool should_linear const bool should_linear
{ {
// There is a conf item (for developers) to force polylog mode. // There is a conf item (for developers) to force polylog mode.
!polylog_only && !polylog_only
// polylog-phased sync and linear are totally exclusive. // polylog-phased sync and linear are totally exclusive.
!data.phased && && !data.phased
// If longpoll was already determined there's no need for linear // If longpoll was already determined there's no need for linear
!should_longpoll && && !should_longpoll
// The primary condition for a linear sync is the number of events // The primary condition for a linear sync is the number of events
// in the range being considered by the sync. That threshold is // in the range being considered by the sync. That threshold is
// supplied by a conf item. // supplied by a conf item.
range.second - range.first <= size_t(linear_delta_max) && range.second - range.first <= size_t(linear_delta_max)
}; };
// Logical convenience boolean // Determine if polylog sync mode should be used.
const bool should_polylog const bool should_polylog
{ {
// Polylog mode is only used when neither of the other two modes
// are determined.
!should_longpoll && !should_linear !should_longpoll && !should_linear
}; };