Skip to content

Initialize pthread mutexes in NSRecursiveLock #2276

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

Merged
merged 1 commit into from
May 19, 2019
Merged

Initialize pthread mutexes in NSRecursiveLock #2276

merged 1 commit into from
May 19, 2019

Conversation

lxbndr
Copy link
Contributor

@lxbndr lxbndr commented May 16, 2019

I was going to suggest a test for NSRecursiveLock fix in #2269, as promised. But test turned out extremely useful from first run. Found that pthread-based implementation is also missing some initialization.

I suppose it will be ok to add this new fix and test in one PR, right?

@compnerd
Copy link
Member

Yeah, having that in a single change is fine.

@compnerd
Copy link
Member

@swift-ci please test

@gottesmm
Copy link
Contributor

Can you make the timeout looser? Maybe 30 seconds. Sometimes these machines get hit really hard.

@lxbndr
Copy link
Contributor Author

lxbndr commented May 16, 2019

Can you make the timeout looser? Maybe 30 seconds. Sometimes these machines get hit really hard.

Sure. I think I need to add better timeout logic then, because current code waits 2 sec unconditionally. I'll change it to wait until all threads finish but not greater than timeout.

@compnerd
Copy link
Member

@swift-ci please test

1 similar comment
@compnerd
Copy link
Member

@swift-ci please test

@lxbndr
Copy link
Contributor Author

lxbndr commented May 18, 2019

I see, Linux build fails. Will look into that, guess I missed something in ifdefs.

@compnerd
Copy link
Member

@swift-ci please test

@compnerd compnerd merged commit 38bc03a into swiftlang:master May 19, 2019
@lxbndr lxbndr deleted the fix-nsrecursivelock-w-test branch May 19, 2019 08:36
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.

3 participants