2093820aba
If Xwayland has crashed, the Workspace will block stacking order updates and start destroying all X11 clients. Once stacking order updates are unblocked, the Workspace will mark the X stacking order as dirty and create a new Xcb::Tree object. We don't want to create that Xcb::Tree object because accessing it after the XCB connection has been shut down will lead to a crash. BUG: 427688 FIXED-IN: 5.20.1
122 lines
4.1 KiB
C++
122 lines
4.1 KiB
C++
/*
|
|
SPDX-FileCopyrightText: 2020 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
|
|
|
SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
|
|
#include "kwin_wayland_test.h"
|
|
#include "composite.h"
|
|
#include "main.h"
|
|
#include "platform.h"
|
|
#include "scene.h"
|
|
#include "screens.h"
|
|
#include "wayland_server.h"
|
|
#include "workspace.h"
|
|
#include "x11client.h"
|
|
#include "xwl/xwayland.h"
|
|
|
|
#include <xcb/xcb_icccm.h>
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
struct XcbConnectionDeleter
|
|
{
|
|
static inline void cleanup(xcb_connection_t *pointer)
|
|
{
|
|
xcb_disconnect(pointer);
|
|
}
|
|
};
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_xwayland_server_restart-0");
|
|
|
|
class XwaylandServerRestartTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void testRestart();
|
|
};
|
|
|
|
void XwaylandServerRestartTest::initTestCase()
|
|
{
|
|
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
|
|
QVERIFY(applicationStartedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
|
|
|
|
KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
|
|
KConfigGroup xwaylandGroup = config->group("Xwayland");
|
|
xwaylandGroup.writeEntry(QStringLiteral("XwaylandCrashPolicy"), QStringLiteral("Restart"));
|
|
xwaylandGroup.sync();
|
|
kwinApp()->setConfig(config);
|
|
|
|
kwinApp()->start();
|
|
QVERIFY(applicationStartedSpy.wait());
|
|
QCOMPARE(screens()->count(), 2);
|
|
QCOMPARE(screens()->geometry(0), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(screens()->geometry(1), QRect(1280, 0, 1280, 1024));
|
|
waylandServer()->initWorkspace();
|
|
}
|
|
|
|
static void kwin_safe_kill(QProcess *process)
|
|
{
|
|
// The SIGKILL signal must be sent when the event loop is spinning.
|
|
QTimer::singleShot(1, process, &QProcess::kill);
|
|
}
|
|
|
|
void XwaylandServerRestartTest::testRestart()
|
|
{
|
|
// This test verifies that the Xwayland server will be restarted after a crash.
|
|
|
|
Xwl::Xwayland *xwayland = static_cast<Xwl::Xwayland *>(XwaylandInterface::self());
|
|
|
|
// Pretend that the Xwayland process has crashed by sending a SIGKILL to it.
|
|
QSignalSpy startedSpy(xwayland, &Xwl::Xwayland::started);
|
|
QVERIFY(startedSpy.isValid());
|
|
kwin_safe_kill(xwayland->process());
|
|
QVERIFY(startedSpy.wait());
|
|
QCOMPARE(startedSpy.count(), 1);
|
|
|
|
// Check that the compositor still accepts new X11 clients.
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
const QRect rect(0, 0, 100, 200);
|
|
xcb_window_t window = xcb_generate_id(c.data());
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, window, rootWindow(),
|
|
rect.x(), rect.y(), rect.width(), rect.height(), 0,
|
|
XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints;
|
|
memset(&hints, 0, sizeof(hints));
|
|
xcb_icccm_size_hints_set_position(&hints, 1, rect.x(), rect.y());
|
|
xcb_icccm_size_hints_set_size(&hints, 1, rect.width(), rect.height());
|
|
xcb_icccm_size_hints_set_min_size(&hints, rect.width(), rect.height());
|
|
xcb_icccm_set_wm_normal_hints(c.data(), window, &hints);
|
|
xcb_map_window(c.data(), window);
|
|
xcb_flush(c.data());
|
|
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client = windowCreatedSpy.last().first().value<X11Client *>();
|
|
QVERIFY(client);
|
|
QCOMPARE(client->windowId(), window);
|
|
QVERIFY(client->isDecorated());
|
|
|
|
// Render a frame to ensure that the compositor doesn't crash.
|
|
Compositor::self()->addRepaintFull();
|
|
QSignalSpy frameRenderedSpy(Compositor::self()->scene(), &Scene::frameRendered);
|
|
QVERIFY(frameRenderedSpy.wait());
|
|
|
|
// Destroy the test window.
|
|
xcb_destroy_window(c.data(), window);
|
|
xcb_flush(c.data());
|
|
QVERIFY(Test::waitForWindowDestroyed(client));
|
|
}
|
|
|
|
} // namespace KWin
|
|
|
|
WAYLANDTEST_MAIN(KWin::XwaylandServerRestartTest)
|
|
#include "xwaylandserver_restart_test.moc"
|