-
Notifications
You must be signed in to change notification settings - Fork 349
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge queued remote source changes. (#784)
* fix: Synchronize access to queuedRemoteSourceChanges. * fix: Reduce the number queued of source-add/source-removes Merges consecutive source-add or source-remove operations to reduce the number of messages sent. In a large conference in which participants join at a high rate there can be a lot of source-adds queued and it's more efficient to merge them in one message.
- Loading branch information
Showing
2 changed files
with
161 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
src/test/kotlin/org/jitsi/jicofo/conference/AbstractParticipantTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Jicofo, the Jitsi Conference Focus. | ||
| * | ||
| * Copyright @ 2021-Present 8x8, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jitsi.jicofo.conference | ||
|
|
||
| import io.kotest.core.spec.style.ShouldSpec | ||
| import io.kotest.matchers.shouldBe | ||
| import org.jitsi.jicofo.AbstractParticipant | ||
| import org.jitsi.jicofo.conference.AddOrRemove.Add | ||
| import org.jitsi.jicofo.conference.AddOrRemove.Remove | ||
| import org.jitsi.jicofo.conference.source.ConferenceSourceMap | ||
| import org.jitsi.jicofo.conference.source.EndpointSourceSet | ||
| import org.jitsi.jicofo.conference.source.Source | ||
| import org.jitsi.utils.MediaType.AUDIO | ||
| import org.jitsi.utils.logging2.LoggerImpl | ||
| import org.jxmpp.jid.impl.JidCreate | ||
|
|
||
| class AbstractParticipantTest : ShouldSpec() { | ||
| init { | ||
| val jid1 = JidCreate.from("jid1") | ||
| val s1 = ConferenceSourceMap(jid1 to EndpointSourceSet(Source(1, AUDIO))).unmodifiable | ||
|
|
||
| val jid2 = JidCreate.from("jid2") | ||
| val s2 = ConferenceSourceMap(jid2 to EndpointSourceSet(Source(2, AUDIO))).unmodifiable | ||
| val s2new = ConferenceSourceMap( | ||
| jid2 to EndpointSourceSet( | ||
| setOf( | ||
| Source(2, AUDIO), | ||
| Source(222, AUDIO) | ||
| ) | ||
| ) | ||
| ).unmodifiable | ||
|
|
||
| val jid3 = JidCreate.from("jid3") | ||
| val s3 = ConferenceSourceMap(jid3 to EndpointSourceSet(Source(3, AUDIO))).unmodifiable | ||
|
|
||
| val participant = TestParticipant() | ||
|
|
||
| context("Queueing remote sources") { | ||
| participant.queueRemoteSourcesToAdd(s1) | ||
| participant.queuedRemoteSourceChanges.size shouldBe 1 | ||
| participant.queuedRemoteSourceChanges[0].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[0].sources.toMap() shouldBe s1.toMap() | ||
|
|
||
| // Consecutive source-adds should be merged. | ||
| participant.queueRemoteSourcesToAdd(s2) | ||
| participant.queuedRemoteSourceChanges.size shouldBe 1 | ||
| participant.queuedRemoteSourceChanges[0].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[0].sources.toMap() shouldBe | ||
| s1.copy().apply { add(s2) }.toMap() | ||
|
|
||
| // Consecutive source-adds should be merged. | ||
| participant.queueRemoteSourcesToAdd(s2new) | ||
| participant.queuedRemoteSourceChanges.size shouldBe 1 | ||
| participant.queuedRemoteSourceChanges[0].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[0].sources.toMap() shouldBe | ||
| s1.copy().apply { add(s2); add(s2new) }.toMap() | ||
|
|
||
| // A source-remove after a series of source-adds should be a new entry. | ||
| participant.queueRemoteSourcesToRemove(s2new) | ||
| participant.queuedRemoteSourceChanges.size shouldBe 2 | ||
| participant.queuedRemoteSourceChanges[0].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[0].sources.toMap() shouldBe | ||
| s1.copy().apply { add(s2); add(s2new) }.toMap() | ||
| participant.queuedRemoteSourceChanges[1].action shouldBe Remove | ||
| participant.queuedRemoteSourceChanges[1].sources.toMap() shouldBe s2new.toMap() | ||
|
|
||
| // A source-add following source-remove should be a new entry. | ||
| participant.queueRemoteSourcesToAdd(s3) | ||
| participant.queuedRemoteSourceChanges.size shouldBe 3 | ||
| participant.queuedRemoteSourceChanges[0].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[0].sources.toMap() shouldBe | ||
| s1.copy().apply { add(s2); add(s2new) }.toMap() | ||
| participant.queuedRemoteSourceChanges[1].action shouldBe Remove | ||
| participant.queuedRemoteSourceChanges[1].sources.toMap() shouldBe s2new.toMap() | ||
| participant.queuedRemoteSourceChanges[2].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[2].sources.toMap() shouldBe s3.toMap() | ||
|
|
||
| // Consecutive source-adds should be merged. | ||
| participant.queueRemoteSourcesToAdd(s1) | ||
| participant.queuedRemoteSourceChanges.size shouldBe 3 | ||
| participant.queuedRemoteSourceChanges[0].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[0].sources.toMap() shouldBe | ||
| s1.copy().apply { add(s2); add(s2new) }.toMap() | ||
| participant.queuedRemoteSourceChanges[1].action shouldBe Remove | ||
| participant.queuedRemoteSourceChanges[1].sources.toMap() shouldBe s2new.toMap() | ||
| participant.queuedRemoteSourceChanges[2].action shouldBe Add | ||
| participant.queuedRemoteSourceChanges[2].sources.toMap() shouldBe | ||
| s3.copy().apply { add(s1) }.toMap() | ||
|
|
||
| participant.clearQueuedRemoteSourceChanges() | ||
| participant.queuedRemoteSourceChanges shouldBe emptyList() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class TestParticipant : AbstractParticipant(LoggerImpl("AbstractParticipantTest")) { | ||
| override fun getSources() = ConferenceSourceMap() | ||
| override fun isSessionEstablished() = true | ||
| } |