Avoid shadowing locks with locks taken in macros #603
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
Y--
approved these changes
Feb 14, 2025
Y--
reviewed
Feb 14, 2025
include/pgduckdb/pgduckdb_utils.hpp
Outdated
| @@ -81,7 +81,7 @@ struct PostgresScopedStackReset { | |||
| template <typename Func, Func func, typename... FuncArgs> | |||
| typename std::invoke_result<Func, FuncArgs...>::type | |||
| __PostgresFunctionGuard__(const char *func_name, FuncArgs... args) { | |||
| std::lock_guard<std::recursive_mutex> lk(pgduckdb::GlobalProcessLock::GetLock()); | |||
| std::lock_guard<std::recursive_mutex> __pg_func_guard_lock(pgduckdb::GlobalProcessLock::GetLock()); | |||
There was a problem hiding this comment.
Let's rename this to lock: this is not a macro but a template
JelteF
force-pushed
the
avoid-shadow-warnings
branch
from
6c3b084 to
39a585b
Compare
JelteF
force-pushed
the
avoid-shadow-warnings
branch
from
39a585b to
a283ba8
Compare
Y--
approved these changes
Feb 14, 2025
|
Just came across this PR, a commonly used technique in macro is to assigned it a unique suffix, this is what I did in ray: |
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.
I got some warnings when using pd_log in certain places. This fixes those. It also changes the name in the
__PostgresFunctionGuard__template tolock, because variables in templates don't shadow variables at invocation.