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

Fix CondVar::TimedWait for Windows #12815

Closed
wants to merge 4 commits into from
Closed

Conversation

eniac1024
Copy link
Contributor

Based on microsoft/STL#369
They fixed the issue in std::condition_variable_any but not in std::condition_variable, which is currently used in rocksdb repo. So we need to implement the work around regardless of _MSVC_STL_UPDATE.

@facebook-github-bot
Copy link
Contributor

Hi @eniac1024!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@facebook-github-bot
Copy link
Contributor

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

Copy link
Contributor

@ajkr ajkr left a comment

Choose a reason for hiding this comment

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

What does "for vs2019" mean in the title? The description and code appear to generalize the workaround to non-vs2019.

port/win/port_win.cc Outdated Show resolved Hide resolved
@eniac1024 eniac1024 changed the title Fix CondVar::TimedWait for vs2019 Fix CondVar::TimedWait for Windows Jul 2, 2024
@eniac1024
Copy link
Contributor Author

eniac1024 commented Jul 2, 2024

What does "for vs2019" mean in the title? The description and code appear to generalize the workaround to non-vs2019.

You're right, it's a generalized workaround, and the title was confusing. This issue started when compiling with VS2019 (which upticked the STL version). Everything was working fine with previous VS version.

Copy link
Contributor

@ajkr ajkr left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@facebook-github-bot
Copy link
Contributor

@ajkr has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@cbi42
Copy link
Member

cbi42 commented Jul 8, 2024

CI complains about code format. Need to run make format.

@facebook-github-bot
Copy link
Contributor

@eniac1024 has updated the pull request. You must reimport the pull request before landing.

@ajkr
Copy link
Contributor

ajkr commented Jul 9, 2024

CI complains about code format. Need to run make format.

Done

@facebook-github-bot
Copy link
Contributor

@ajkr has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@ajkr merged this pull request in 62b62cf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants