diff options
| author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-10-23 13:29:41 +0300 |
|---|---|---|
| committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-11-03 13:13:34 +0000 |
| commit | 302d4ffb8549214eb4028dc3e47ec4ee4e12ffbd (patch) | |
| tree | e07afdfbb1bd77a6af579b8dfedf49c174378a04 /src/client/qwaylandintegration.cpp | |
| parent | 183a6a0effdf1332ec445e5d1626b99d550c79a8 (diff) | |
client: Remove the event thread
If the compositor sends events to us while the main thread is blocked
the socket notifier in the events thread would keep sending out the
activated() signal, but no events would actually be read until the
main thread starts to run again. That causes the event thread to keep
queueing new events, and so allocating memory, potentially forever.
This patch fixes the issue in maybe a bit radical way, that is by removing
the event thread. The socket notifier now runs in the main thread so it
will block if the events are not being read.
Nowadays there is no real reason to keep the event thread around, as every
thread that needs to receive wayland events can dispatch them on its own,
we don't need a central dispatcher thread anymore.
Change-Id: Ib7885e4b038b82719d78d193f465618a72cbe6af
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 82df8a30a..39fff533d 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -54,6 +54,7 @@ #include <qpa/qplatformcursor.h> #include <QtGui/QSurfaceFormat> #include <QtGui/QOpenGLContext> +#include <QSocketNotifier> #include <qpa/qplatforminputcontextfactory_p.h> #include <qpa/qplatformaccessibility.h> @@ -201,6 +202,10 @@ void QWaylandIntegration::initialize() QAbstractEventDispatcher *dispatcher = QGuiApplicationPrivate::eventDispatcher; QObject::connect(dispatcher, SIGNAL(aboutToBlock()), mDisplay, SLOT(flushRequests())); QObject::connect(dispatcher, SIGNAL(awake()), mDisplay, SLOT(flushRequests())); + + int fd = wl_display_get_fd(mDisplay->wl_display()); + QSocketNotifier *sn = new QSocketNotifier(fd, QSocketNotifier::Read, mDisplay); + QObject::connect(sn, SIGNAL(activated(int)), mDisplay, SLOT(flushRequests())); } QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const |