summaryrefslogtreecommitdiffstats
path: root/patches/0001-Add-thread-affinity-to-wayland-clients.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0001-Add-thread-affinity-to-wayland-clients.patch')
-rw-r--r--patches/0001-Add-thread-affinity-to-wayland-clients.patch254
1 files changed, 0 insertions, 254 deletions
diff --git a/patches/0001-Add-thread-affinity-to-wayland-clients.patch b/patches/0001-Add-thread-affinity-to-wayland-clients.patch
deleted file mode 100644
index 9448c4db0..000000000
--- a/patches/0001-Add-thread-affinity-to-wayland-clients.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From bb2bb0a9f3751156d9537d2daa4507c8b1eff459 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
-Date: Mon, 5 Mar 2012 12:44:37 +0100
-Subject: [PATCH] Add thread affinity to wayland clients
-
-This makes it possible to marshal requests from more than 1 thread in
-wayland clients. However, its not possible to run wl_display_iterate
-from other threads than the thread that made the wl_display.
----
- src/Makefile.am | 2 +
- src/wayland-client.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++---
- src/wayland-client.h | 7 ++++
- 3 files changed, 115 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f93954e..836cb31 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -27,6 +27,8 @@ libwayland_server_la_SOURCES = \
- event-loop.c
-
- libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
-+libwayland_client_la_LDFLAGS = -pthread
-+libwayland_client_la_CFLAGS = -pthread
- libwayland_client_la_SOURCES = \
- wayland-protocol.c \
- wayland-client.c
-diff --git a/src/wayland-client.c b/src/wayland-client.c
-index ecedd99..c385bfe 100644
---- a/src/wayland-client.c
-+++ b/src/wayland-client.c
-@@ -34,6 +34,7 @@
- #include <assert.h>
- #include <fcntl.h>
- #include <sys/poll.h>
-+#include <sys/eventfd.h>
-
- #include "wayland-util.h"
- #include "wayland-os.h"
-@@ -63,6 +64,9 @@ struct wl_display {
- struct wl_proxy proxy;
- struct wl_connection *connection;
- int fd;
-+ int write_notification_event_fd;
-+ pthread_t thread_id;
-+ pthread_mutex_t marshalling_mutex;
- uint32_t mask;
- struct wl_map objects;
- struct wl_list global_listener_list;
-@@ -193,6 +197,11 @@ wl_proxy_marshal(struct wl_proxy *proxy, uint32_t opcode, ...)
- struct wl_closure closure;
- va_list ap;
- int ret;
-+ int write_notification_event_fd;
-+ uint64_t write_notification_value;
-+ ssize_t success;
-+
-+ pthread_mutex_lock(&proxy->display->marshalling_mutex);
-
- va_start(ap, opcode);
- ret = wl_closure_vmarshal(&closure, &proxy->object, opcode, ap,
-@@ -213,6 +222,18 @@ wl_proxy_marshal(struct wl_proxy *proxy, uint32_t opcode, ...)
- wl_closure_print(&closure, &proxy->object, true);
-
- wl_closure_destroy(&closure);
-+
-+ write_notification_event_fd = proxy->display->write_notification_event_fd;
-+ write_notification_value = 1;
-+ success = write(write_notification_event_fd,&write_notification_value,8);
-+ if (success < 0) {
-+ fprintf(stderr,
-+ "Error writing to eventfd %d: %s\n",
-+ write_notification_event_fd,
-+ strerror(errno));
-+ }
-+
-+ pthread_mutex_unlock(&proxy->display->marshalling_mutex);
- }
-
- /* Can't do this, there may be more than one instance of an
-@@ -348,6 +369,7 @@ wl_display_connect(const char *name)
- const char *debug;
- char *connection, *end;
- int flags;
-+ int success;
-
- debug = getenv("WAYLAND_DEBUG");
- if (debug)
-@@ -397,6 +419,21 @@ wl_display_connect(const char *name)
- return NULL;
- }
-
-+ display->write_notification_event_fd = eventfd(0, EFD_CLOEXEC);
-+ if (display->write_notification_event_fd < 0) {
-+ fprintf(stderr, "Failed to create eventfd\n");
-+ }
-+
-+ display->thread_id = pthread_self();
-+ pthread_mutexattr_t mutex_attr;
-+ success = pthread_mutexattr_init(&mutex_attr);
-+ success += pthread_mutexattr_settype(&mutex_attr,PTHREAD_MUTEX_RECURSIVE);
-+ success += pthread_mutex_init(&display->marshalling_mutex, &mutex_attr);
-+ success += pthread_mutexattr_destroy(&mutex_attr);
-+
-+ if (success)
-+ fprintf(stderr, "Threading setup was unsuccessfull\n");
-+
- return display;
- }
-
-@@ -433,6 +470,18 @@ wl_display_get_fd(struct wl_display *display,
- return display->fd;
- }
-
-+WL_EXPORT int
-+wl_display_get_write_notification_fd(struct wl_display *display)
-+{
-+ return display->write_notification_event_fd;
-+}
-+
-+WL_EXPORT pthread_t
-+wl_display_thread(struct wl_display *display)
-+{
-+ return display->thread_id;
-+}
-+
- static void
- sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
- {
-@@ -446,18 +495,47 @@ static const struct wl_callback_listener sync_listener = {
- sync_callback
- };
-
-+static void
-+threaded_sync_callback(void *data, struct wl_callback *callback, uint32_t time)
-+{
-+ fprintf(stderr, "threaded_sync_callback\n");
-+ pthread_cond_t *wait_condition = data;
-+
-+ pthread_cond_broadcast(wait_condition);
-+ wl_callback_destroy(callback);
-+}
-+
-+static const struct wl_callback_listener threaded_sync_listener = {
-+ threaded_sync_callback
-+};
-+
-+
- WL_EXPORT void
- wl_display_roundtrip(struct wl_display *display)
- {
- struct wl_callback *callback;
- int done;
-+ pthread_cond_t wait_cond;
-+ pthread_mutex_t wait_mutex;
-
-- done = 0;
- callback = wl_display_sync(display);
-- wl_callback_add_listener(callback, &sync_listener, &done);
-- wl_display_flush(display);
-- while (!done)
-- wl_display_iterate(display, WL_DISPLAY_READABLE);
-+
-+ if (wl_display_thread(display) == pthread_self()) {
-+ done = 0;
-+ wl_callback_add_listener(callback, &sync_listener, &done);
-+ wl_display_flush(display);
-+ while (!done)
-+ wl_display_iterate(display, WL_DISPLAY_READABLE);
-+ } else {
-+ pthread_mutex_init(&wait_mutex,NULL);
-+ pthread_cond_init(&wait_cond, NULL);
-+ pthread_mutex_lock(&wait_mutex);
-+
-+ wl_callback_add_listener(callback, &threaded_sync_listener, &wait_cond);
-+ pthread_cond_wait(&wait_cond,&wait_mutex);
-+ pthread_cond_destroy(&wait_cond);
-+ pthread_mutex_destroy(&wait_mutex);
-+ }
- }
-
- static void
-@@ -503,6 +581,10 @@ wl_display_iterate(struct wl_display *display, uint32_t mask)
- {
- uint32_t p[2], object;
- int len, opcode, size;
-+ uint64_t write_fd;
-+ ssize_t success;
-+
-+ pthread_mutex_lock(&display->marshalling_mutex);
-
- mask &= display->mask;
- if (mask == 0) {
-@@ -511,6 +593,23 @@ wl_display_iterate(struct wl_display *display, uint32_t mask)
- return;
- }
-
-+ if (mask & WL_DISPLAY_WRITABLE) {
-+ if (pthread_self() != display->thread_id) {
-+ fprintf(stderr,
-+ "wl_display_iterate called with WL_DISPLAY_WRITABLE"
-+ "from another thread than the thead that created "
-+ "wl_display. This will result in events being dispatched"
-+ "in other threads\n");
-+ }
-+ success = read(display->write_notification_event_fd, &write_fd, 8);
-+ if (success < 0) {
-+ fprintf(stderr,
-+ "wl_display_iterate eventfd %d error at read: %s\n",
-+ display->write_notification_event_fd,
-+ strerror(errno));
-+ }
-+ }
-+
- len = wl_connection_data(display->connection, mask);
-
- while (len > 0) {
-@@ -528,6 +627,8 @@ wl_display_iterate(struct wl_display *display, uint32_t mask)
- len -= size;
- }
-
-+ pthread_mutex_unlock(&display->marshalling_mutex);
-+
- if (len < 0) {
- fprintf(stderr, "read error: %m\n");
- exit(EXIT_FAILURE);
-diff --git a/src/wayland-client.h b/src/wayland-client.h
-index 06dc6fe..4053474 100644
---- a/src/wayland-client.h
-+++ b/src/wayland-client.h
-@@ -26,6 +26,9 @@
- #include "wayland-util.h"
- #include "wayland-version.h"
-
-+#include <pthread.h>
-+#define WAYLAND_CLIENT_THREAD_AFFINITY
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -98,6 +101,10 @@ wl_display_get_global(struct wl_display *display,
-
- void wl_log_set_handler_client(wl_log_func_t handler);
-
-+int wl_display_get_write_notification_fd(struct wl_display *display);
-+
-+pthread_t wl_display_thread(struct wl_display *display);
-+
- #ifdef __cplusplus
- }
- #endif
---
-1.7.9.5
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 20:12:00 +0000