Make getLocalSdpInfo async #1441
Merged
Conversation
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
jcague
approved these changes
Jul 25, 2019
| @@ -178,6 +178,7 @@ bool WebRtcConnection::createOfferSync(bool video_enabled, bool audio_enabled, b | |||
|
|
|||
| boost::future<void> WebRtcConnection::addMediaStream(std::shared_ptr<MediaStream> media_stream) { | |||
| return asyncTask([media_stream] (std::shared_ptr<WebRtcConnection> connection) { | |||
| boost::mutex::scoped_lock lock(connection->update_state_mutex_); | |||
There was a problem hiding this comment.
why do we need this lock here?
There was a problem hiding this comment.
I added it for consistency with addMediaStream.
| boost::mutex::scoped_lock lock(mutex); | ||
| if (!future_async_) { | ||
| return; | ||
| } | ||
| futures.push(persistent); | ||
| ResultPair result_pair(persistent, result); |
| v8::Local<v8::Promise::Resolver> resolver = Nan::New(*persistent); | ||
| resolver->Resolve(Nan::GetCurrentContext(), Nan::New("").ToLocalChecked()); | ||
| ResultVariant r = obj->futures.front().second; | ||
| if (boost::get<std::string>(&r) != nullptr) { |
There was a problem hiding this comment.
would it be possible to do it with void instead?
| } else if (boost::get<std::shared_ptr<erizo::SdpInfo>>(&r) != nullptr) { | ||
| std::shared_ptr<erizo::SdpInfo> sdp_info = boost::get<std::shared_ptr<erizo::SdpInfo>>(r); | ||
| v8::Local<v8::Object> instance = ConnectionDescription::NewInstance(); | ||
| ConnectionDescription* description = ObjectWrap::Unwrap<ConnectionDescription>(instance); |
There was a problem hiding this comment.
do we need to do this object persistent or something similar to avoid having issues with the garbage collector?
There was a problem hiding this comment.
I've kept the fuctionality exactly the same as we had. I'm not 100% sure it's the best way to do this, though. We will have to keep an eye on it
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR addresses race conditions when getting and handling SdpInfo by making it run as an
asyncTaskin erizo. This involves also implementing a mechanism to return values when promises are resolved from ErizoAPI.[] It needs and includes Unit Tests
Changes in Client or Server public APIs
[] It includes documentation for these changes in
/doc.