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.

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

Refactor colibri handling in JitsiMeetConferenceImpl. #843

Merged
merged 42 commits into from
Dec 15, 2021

Conversation

bgrozev
Copy link
Member

@bgrozev bgrozev commented Nov 24, 2021

The goal is to abstract away all the colibri-related logic in JitsiMeetConferenceImpl, so that it can later be replaced with a colibri2 implementation.

@bgrozev bgrozev marked this pull request as draft November 24, 2021 17:21
@codecov
Copy link

codecov bot commented Nov 24, 2021

Codecov Report

Merging #843 (7b13508) into master (e53bdf8) will decrease coverage by 0.37%.
The diff coverage is 41.54%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #843      +/-   ##
============================================
- Coverage     45.82%   45.45%   -0.38%     
- Complexity      785      788       +3     
============================================
  Files           112      115       +3     
  Lines          6965     7078     +113     
  Branches        968      970       +2     
============================================
+ Hits           3192     3217      +25     
- Misses         3346     3445      +99     
+ Partials        427      416      -11     
Impacted Files Coverage Δ
src/main/java/org/jitsi/jicofo/FocusManager.java 43.78% <0.00%> (ø)
src/main/java/org/jitsi/jicofo/bridge/Bridge.java 85.36% <ø> (ø)
...g/jitsi/jicofo/conference/JitsiMeetConference.java 0.00% <ø> (ø)
...ence/UnsupportedFeatureConfigurationException.java 0.00% <ø> (ø)
...icofo/conference/colibri/v1/ColibriConference.java 33.33% <ø> (ø)
...o/conference/colibri/v1/ColibriConferenceImpl.java 55.28% <ø> (ø)
...fo/conference/colibri/v1/OctoChannelAllocator.java 0.00% <0.00%> (ø)
.../jicofo/conference/colibri/v1/OctoParticipant.java 0.00% <0.00%> (ø)
...va/org/jitsi/jicofo/jigasi/TranscriberManager.java 22.05% <0.00%> (+1.22%) ⬆️
...g/jitsi/protocol/xmpp/util/TransportSignaling.java 0.00% <ø> (ø)
... and 20 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e53bdf8...7b13508. Read the comment docs.

src/main/java/org/jitsi/jicofo/bridge/BridgeSelector.java Outdated Show resolved Hide resolved
/**
* Get a stream of those bridges which are operational.
*/
private fun operationalBridges(): List<BridgeSession> = synchronized(syncRoot) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is always called from inside synchronized(syncRoot) so you shouldn't need to synchronize again.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather aquire the lock twice, the performance impact should be minimal.

@bgrozev bgrozev marked this pull request as ready for review December 13, 2021 23:04
@bgrozev bgrozev changed the title [WIP] Refactor colibri handling in JitsiMeetConferenceImpl. Refactor colibri handling in JitsiMeetConferenceImpl. Dec 13, 2021
@bgrozev bgrozev merged commit 027fcc2 into jitsi:master Dec 15, 2021
@bgrozev bgrozev deleted the secure-octo/ColibriSessionManager branch January 25, 2023 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants