AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtDBus: Resolve libdbus functions in a thread-safe way

Browse Source 
Use atomic pointers.

While at it, declare the function type with `using` instead
of a typedef for better readability, do the declaration
locally so that less preprocessor concatenation is needed,
use reinterpret_cast instead of C-style cast.

Change-Id: I5ed0d35b7ddfdd62ef6c12403fe7052019453f34
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ievgenii Meshcheriakov 2023-09-06 11:56:24 +02:00
parent bfdefa81f8
commit 37af09adf0
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/dbus/qdbus_symbols_p.h
View File

@ -27,6 +27,8 @@
# include "dbus_minimal_p.h"
#endif
#include <atomic>
#ifdef interface
# undef interface
#endif
@ -114,28 +116,34 @@ template <> struct TraceReturn<void> { typedef void Type; };
# define DEBUGRET(ret)
# endif
# define DEFINEFUNC(ret, func, args, argcall, funcret) \
typedef ret (* _q_PTR_##func) args; \
static inline ret q_##func args \
{ \
static _q_PTR_##func ptr; \
DEBUGCALL(#func, argcall); \
if (!ptr) \
ptr = (_q_PTR_##func) qdbus_resolve_me(#func); \
funcret DEBUGRET(ret) ptr argcall; \
# define DEFINEFUNC(ret, func, args, argcall, funcret) \
static inline ret q_##func args \
{ \
using func_ptr = ret (*) args; \
static std::atomic<func_ptr> atomic_ptr; \
func_ptr ptr = atomic_ptr.load(std::memory_order_relaxed); \
DEBUGCALL(#func, argcall); \
if (!ptr) { \
ptr = reinterpret_cast<func_ptr>(qdbus_resolve_me(#func)); \
atomic_ptr.store(ptr, std::memory_order_relaxed); \
} \
funcret DEBUGRET(ret) ptr argcall; \
}
# define DEFINEFUNC_CONDITIONALLY(ret, func, args, argcall, funcret, failret) \
typedef ret (* _q_PTR_##func) args; \
static inline ret q_##func args \
{ \
static _q_PTR_##func ptr; \
DEBUGCALL(#func, argcall); \
if (!ptr) \
ptr = (_q_PTR_##func) qdbus_resolve_conditionally(#func); \
if (!ptr) \
failret; \
funcret DEBUGRET(ret) ptr argcall; \
# define DEFINEFUNC_CONDITIONALLY(ret, func, args, argcall, funcret, failret) \
static inline ret q_##func args \
{ \
using func_ptr = ret (*) args; \
static std::atomic<func_ptr> atomic_ptr; \
func_ptr ptr = atomic_ptr.load(std::memory_order_relaxed); \
DEBUGCALL(#func, argcall); \
if (!ptr) { \
ptr = reinterpret_cast<func_ptr>(qdbus_resolve_conditionally(#func)); \
atomic_ptr.store(ptr, std::memory_order_relaxed); \
} \
if (!ptr) \
failret; \
funcret DEBUGRET(ret) ptr argcall; \
}
#else // defined QT_LINKED_LIBDBUS