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

Don't reentrantly lock the stream id #250

Merged
merged 2 commits into from May 7, 2019
Merged

Conversation

@Manishearth
Copy link
Member

Manishearth commented May 7, 2019

fixes #249

r? @jdm or @ferjm

fixes #249
.ok_or("Does not currently support non-gstreamer streams")?;
stream.insert_capsfilter();
{
let stream =

This comment has been minimized.

@Manishearth

Manishearth May 7, 2019

Author Member

This does mean we end up locking twice. I could alternatively pass down the &mut GstreamerMediaStream to link_stream directly, but that gets uglier

@Manishearth
Copy link
Member Author

Manishearth commented May 7, 2019

The second commit is optional, it avoids double-locking but the code is a bit more complicated

@jdm
Copy link
Member

jdm commented May 7, 2019

@bors-servo r+
The complexity seems reasonable to me.

@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2019

📌 Commit da8f238 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2019

Testing commit da8f238 with merge 645c159...

bors-servo added a commit that referenced this pull request May 7, 2019
Don't reentrantly lock the stream id

fixes #249

r? @jdm or @ferjm
@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2019

☀️ Test successful - checks-travis
Approved by: jdm
Pushing 645c159 to master...

@bors-servo bors-servo merged commit da8f238 into servo:master May 7, 2019
2 checks passed
2 checks passed
Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
@Manishearth Manishearth deleted the Manishearth:media-deadlock branch May 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.