Skip to content

S
skiko
Unverified Commit 59642ebe authored by Alexander Maryanovsky's avatar Alexander Maryanovsky Committed by GitHub
Browse files
Options

Make getCurrentSystemTheme on Linux thread-safe (#1203)

parent a761cea6
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 80 deletions
skiko/src/awtMain/cpp/linux/theme.cc
View file @ 59642ebe
...@@ -5,33 +5,32 @@ ...@@ -5,33 +5,32 @@
#include "jni_helpers.h" #include "jni_helpers.h"
static dbus_bool_t initDbusThreads(void* lib) {
auto func = (dbus_bool_t(*)()) dlsym(lib, "dbus_threads_init_default");
if (func) return func();
return false;
}
static void* loadLibDbus() { static void* loadLibDbus() {
static void* result = nullptr; static void* dlOpenResult = dlopen("libdbus-1.so", RTLD_LAZY | RTLD_LOCAL);
if (result != nullptr) return result; static bool initSuccess = dlOpenResult && initDbusThreads(dlOpenResult);
result = dlopen("libdbus-1.so", RTLD_LAZY | RTLD_LOCAL); if (initSuccess) {
return result; return dlOpenResult;
} else {
return nullptr;
}
} }
static DBusMessage* dbus_message_new_method_call_dynamic(const char *bus_name, const char *path, const char *iface, const char *method) { static DBusMessage* dbus_message_new_method_call_dynamic(const char *bus_name, const char *path, const char *iface, const char *method) {
typedef DBusMessage* (*dbus_message_new_method_call_t)(const char*, const char*, const char*, const char*); typedef DBusMessage* (*dbus_message_new_method_call_t)(const char*, const char*, const char*, const char*);
static dbus_message_new_method_call_t func = nullptr; static dbus_message_new_method_call_t func = (dbus_message_new_method_call_t) dlsym(loadLibDbus(), "dbus_message_new_method_call");
if(!func) { if (!func) return nullptr;
void* lib = loadLibDbus();
if(!lib) return nullptr;
func = (dbus_message_new_method_call_t) dlsym(lib, "dbus_message_new_method_call");
}
if(!func) return nullptr;
return func(bus_name, path, iface, method); return func(bus_name, path, iface, method);
} }
static dbus_bool_t dbus_message_append_args_dynamic(DBusMessage *message, int first_arg_type, ...) { static dbus_bool_t dbus_message_append_args_dynamic(DBusMessage *message, int first_arg_type, ...) {
typedef dbus_bool_t (*dbus_message_append_args_valist_t)(DBusMessage *, int, va_list); typedef dbus_bool_t (*dbus_message_append_args_valist_t)(DBusMessage *, int, va_list);
static dbus_message_append_args_valist_t func = nullptr; static dbus_message_append_args_valist_t func = (dbus_message_append_args_valist_t) dlsym(loadLibDbus(), "dbus_message_append_args_valist");
if (!func) {
void *lib = loadLibDbus();
if (!lib) return false;
func = (dbus_message_append_args_valist_t) dlsym(lib, "dbus_message_append_args_valist");
}
if (!func) return false; if (!func) return false;
va_list var_args; va_list var_args;
va_start(var_args, first_arg_type); va_start(var_args, first_arg_type);
...@@ -42,112 +41,67 @@ static dbus_bool_t dbus_message_append_args_dynamic(DBusMessage *message, int fi ...@@ -42,112 +41,67 @@ static dbus_bool_t dbus_message_append_args_dynamic(DBusMessage *message, int fi
static DBusMessage* dbus_connection_send_with_reply_and_block_dynamic(DBusConnection *connection, DBusMessage *message, int timeout_milliseconds, DBusError *error) { static DBusMessage* dbus_connection_send_with_reply_and_block_dynamic(DBusConnection *connection, DBusMessage *message, int timeout_milliseconds, DBusError *error) {
typedef DBusMessage* (*dbus_connection_send_with_reply_and_block_t)(DBusConnection*, DBusMessage*, int, DBusError*); typedef DBusMessage* (*dbus_connection_send_with_reply_and_block_t)(DBusConnection*, DBusMessage*, int, DBusError*);
static dbus_connection_send_with_reply_and_block_t func = nullptr; static dbus_connection_send_with_reply_and_block_t func = (dbus_connection_send_with_reply_and_block_t) dlsym(loadLibDbus(), "dbus_connection_send_with_reply_and_block");
if(!func) { if (!func) return nullptr;
void* lib = loadLibDbus();
if(!lib) return nullptr;
func = (dbus_connection_send_with_reply_and_block_t) dlsym(lib, "dbus_connection_send_with_reply_and_block");
}
if(!func) return nullptr;
return func(connection, message, timeout_milliseconds, error); return func(connection, message, timeout_milliseconds, error);
} }
static bool dbus_message_unref_dynamic(DBusMessage *message) { static bool dbus_message_unref_dynamic(DBusMessage *message) {
typedef void* (*dbus_message_unref_t)(DBusMessage*); typedef void* (*dbus_message_unref_t)(DBusMessage*);
static dbus_message_unref_t func = nullptr; static dbus_message_unref_t func = (dbus_message_unref_t) dlsym(loadLibDbus(), "dbus_message_unref");
if(!func) { if (!func) return false;
void* lib = loadLibDbus();
if(!lib) return false;
func = (dbus_message_unref_t) dlsym(lib, "dbus_message_unref");
}
if(!func) return false;
func(message); func(message);
return true; return true;
} }
static dbus_bool_t dbus_error_is_set_dynamic(const DBusError *error) { static dbus_bool_t dbus_error_is_set_dynamic(const DBusError *error) {
typedef dbus_bool_t (*dbus_error_is_set_t)(const DBusError*); typedef dbus_bool_t (*dbus_error_is_set_t)(const DBusError*);
static dbus_error_is_set_t func = nullptr; static dbus_error_is_set_t func = (dbus_error_is_set_t) dlsym(loadLibDbus(), "dbus_error_is_set");
if(!func) { if (!func) return true;
void* lib = loadLibDbus();
if(!lib) return true;
func = (dbus_error_is_set_t) dlsym(lib, "dbus_error_is_set");
}
if(!func) return true;
return func(error); return func(error);
} }
static dbus_bool_t dbus_message_iter_init_dynamic(DBusMessage *message, DBusMessageIter *iter) { static dbus_bool_t dbus_message_iter_init_dynamic(DBusMessage *message, DBusMessageIter *iter) {
typedef dbus_bool_t (*dbus_message_iter_init_t)(DBusMessage*, DBusMessageIter*); typedef dbus_bool_t (*dbus_message_iter_init_t)(DBusMessage*, DBusMessageIter*);
static dbus_message_iter_init_t func = nullptr; static dbus_message_iter_init_t func = (dbus_message_iter_init_t) dlsym(loadLibDbus(), "dbus_message_iter_init");
if(!func) { if (!func) return false;
void* lib = loadLibDbus();
if(!lib) return false;
func = (dbus_message_iter_init_t) dlsym(lib, "dbus_message_iter_init");
}
if(!func) return false;
return func(message, iter); return func(message, iter);
} }
static int dbus_message_iter_get_arg_type_dynamic(DBusMessageIter *iter) { static int dbus_message_iter_get_arg_type_dynamic(DBusMessageIter *iter) {
typedef int (*dbus_message_iter_get_arg_type_t)(DBusMessageIter*); typedef int (*dbus_message_iter_get_arg_type_t)(DBusMessageIter*);
static dbus_message_iter_get_arg_type_t func = nullptr; static dbus_message_iter_get_arg_type_t func = (dbus_message_iter_get_arg_type_t) dlsym(loadLibDbus(), "dbus_message_iter_get_arg_type");
if(!func) { if (!func) return -1;
void* lib = loadLibDbus();
if(!lib) return -1;
func = (dbus_message_iter_get_arg_type_t) dlsym(lib, "dbus_message_iter_get_arg_type");
}
if(!func) return -1;
return func(iter); return func(iter);
} }
static bool dbus_message_iter_recurse_dynamic(DBusMessageIter *iter, DBusMessageIter *sub) { static bool dbus_message_iter_recurse_dynamic(DBusMessageIter *iter, DBusMessageIter *sub) {
typedef void (*dbus_message_iter_recurse_t)(DBusMessageIter*, DBusMessageIter*); typedef void (*dbus_message_iter_recurse_t)(DBusMessageIter*, DBusMessageIter*);
static dbus_message_iter_recurse_t func = nullptr; static dbus_message_iter_recurse_t func = (dbus_message_iter_recurse_t) dlsym(loadLibDbus(), "dbus_message_iter_recurse");
if(!func) { if (!func) return false;
void* lib = loadLibDbus();
if(!lib) return false;
func = (dbus_message_iter_recurse_t) dlsym(lib, "dbus_message_iter_recurse");
}
if(!func) return false;
func(iter, sub); func(iter, sub);
return true; return true;
} }
static bool dbus_message_iter_get_basic_dynamic(DBusMessageIter *iter, void *value) { static bool dbus_message_iter_get_basic_dynamic(DBusMessageIter *iter, void *value) {
typedef void (*dbus_message_iter_get_basic_t)(DBusMessageIter*, void*); typedef void (*dbus_message_iter_get_basic_t)(DBusMessageIter*, void*);
static dbus_message_iter_get_basic_t func = nullptr; static dbus_message_iter_get_basic_t func = (dbus_message_iter_get_basic_t) dlsym(loadLibDbus(), "dbus_message_iter_get_basic");
if(!func) { if (!func) return false;
void* lib = loadLibDbus();
if(!lib) return false;
func = (dbus_message_iter_get_basic_t) dlsym(lib, "dbus_message_iter_get_basic");
}
if(!func) return false;
func(iter, value); func(iter, value);
return true; return true;
} }
static DBusConnection* dbus_bus_get_dynamic(DBusBusType type, DBusError *error) { static DBusConnection* dbus_bus_get_dynamic(DBusBusType type, DBusError *error) {
typedef DBusConnection* (*dbus_bus_get_t)(DBusBusType, DBusError*); typedef DBusConnection* (*dbus_bus_get_t)(DBusBusType, DBusError*);
static dbus_bus_get_t func = nullptr; static dbus_bus_get_t func = (dbus_bus_get_t) dlsym(loadLibDbus(), "dbus_bus_get");
if(!func) { if (!func) return nullptr;
void* lib = loadLibDbus();
if(!lib) return nullptr;
func = (dbus_bus_get_t) dlsym(lib, "dbus_bus_get");
}
if(!func) return nullptr;
return func(type, error); return func(type, error);
} }
static bool dbus_error_init_dynamic(DBusError *error) { static bool dbus_error_init_dynamic(DBusError *error) {
typedef void (*dbus_error_init_t)(DBusError*); typedef void (*dbus_error_init_t)(DBusError*);
static dbus_error_init_t func = nullptr; static dbus_error_init_t func = (dbus_error_init_t) dlsym(loadLibDbus(), "dbus_error_init");
if(!func) { if (!func) return false;
void* lib = loadLibDbus();
if(!lib) return false;
func = (dbus_error_init_t) dlsym(lib, "dbus_error_init");
}
if(!func) return false;
func(error); func(error);
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment