1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "IMPORT: plock: export the uninlined version of the lock wait function"

Browse Source 
This reverts commit 5496d06b2b1ea276ffb6aec78ffca177b88d89cd.

It breaks the build on Windows which apparently doesn't support the weak
attribute well on functions. It's not big deal anyway, playing with build
options while debugging still works though it's less easy to use.
This commit is contained in:
Willy Tarreau 2025-02-07 19:51:15 +01:00
parent b957e2f3ef
commit ae540e3d9c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/import/plock.h
View File

@ -114,11 +114,11 @@ static unsigned long __pl_wait_unlock_long(const unsigned long *lock, const unsi
}
# if defined(PLOCK_INLINE_EBO)
__attribute__((unused,always_inline,no_instrument_function)) static inline
__attribute__((unused,always_inline,no_instrument_function)) inline
# else
__attribute__((unused,noinline,no_instrument_function,weak))
__attribute__((unused,noinline,no_instrument_function))
# endif
unsigned long pl_wait_unlock_long(const unsigned long *lock, const unsigned long mask)
static unsigned long pl_wait_unlock_long(const unsigned long *lock, const unsigned long mask)
{
return __pl_wait_unlock_long(lock, mask);
}
@ -183,11 +183,11 @@ static unsigned int __pl_wait_unlock_int(const unsigned int *lock, const unsigne
}
# if defined(PLOCK_INLINE_EBO)
__attribute__((unused,always_inline,no_instrument_function)) static inline
__attribute__((unused,always_inline,no_instrument_function)) inline
# else
__attribute__((unused,noinline,no_instrument_function,weak))
__attribute__((unused,noinline,no_instrument_function))
# endif
unsigned int pl_wait_unlock_int(const unsigned int *lock, const unsigned int mask)
static unsigned int pl_wait_unlock_int(const unsigned int *lock, const unsigned int mask)
{
return __pl_wait_unlock_int(lock, mask);
}