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

Remove double fetch of "OSSL_EX_DATA_GLOBAL" for global lock #11152

Closed
wants to merge 2 commits into from
Closed

Remove double fetch of "OSSL_EX_DATA_GLOBAL" for global lock #11152

wants to merge 2 commits into from

Conversation

davxy
Copy link
Contributor

@davxy davxy commented Feb 23, 2020

Fetch once and just pass the global ex_data to the "get_and_lock" static
function.

Removed a redundant null pointer check within the "get_and_lock" static
function (control already performed by the caller).

crypto/ex_data.c Outdated Show resolved Hide resolved
crypto/ex_data.c Outdated Show resolved Hide resolved
crypto/ex_data.c Outdated Show resolved Hide resolved
@davxy
Copy link
Contributor Author

davxy commented Feb 23, 2020

Looks like the CI appears to fail for reasons unrelated to the changes.

Fetch once and just pass the global ex_data to the "get_and_lock" static
function.

Removed a redundant null pointer check within the "get_and_lock" static
function (control already performed by the caller).
@slontis
Copy link
Member

slontis commented Feb 26, 2020

travis error is just a timeout that happens quite a bit

@slontis slontis requested a review from mattcaswell March 4, 2020 06:25
@mattcaswell mattcaswell added approval: done This pull request has the required number of approvals and removed approval: otc review pending labels Mar 4, 2020
@openssl-machine
Copy link
Collaborator

24 hours has passed since 'approval: done' was set, but this PR has failing CI tests. Once the tests pass it will get moved to 'approval: ready to merge' automatically, alternatively please review and set the label manually.

@t8m t8m added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Mar 9, 2020
@t8m
Copy link
Member

t8m commented Mar 9, 2020

The failure is just a timeout.

openssl-machine pushed a commit that referenced this pull request Mar 9, 2020
Fetch once and just pass the global ex_data to the "get_and_lock" static
function.

Removed a redundant null pointer check within the "get_and_lock" static
function (control already performed by the caller).

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from #11152)
@t8m
Copy link
Member

t8m commented Mar 9, 2020

Merged to master as 86cd42f

@t8m t8m closed this Mar 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants