vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Explicitly destroy plugins 

A plugin may need to access kwinApp() or kwinApp()->platform() during
tear down, but the problem is that plugins are destroyed after the
kwinApp() object. The plugin manager must be destroyed explicitly while
the application is still valid to ensure that no crash will occur
during compositor teardown.
icc-effect-5.26.4
Vlad Zahorodnii 2020-11-26 20:41:20 +02:00
parent 02c3dfb84b
commit 3a7bce693e
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autotests/integration/kwin_wayland_test.cpp
View File

@ -79,6 +79,7 @@ WaylandTestApplication::~WaylandTestApplication()
if (effects) {
static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects();
}
destroyPlugins();
delete m_xwayland;
m_xwayland = nullptr;
destroyWorkspace();
@ -131,7 +132,7 @@ void WaylandTestApplication::performStartup()
// try creating the Wayland Backend
createInput();
createBackend();
PluginManager::create(this);
createPlugins();
}
void WaylandTestApplication::createBackend()

11
main.cpp
View File

@ -17,6 +17,7 @@
#include "input.h"
#include "logind.h"
#include "options.h"
#include "pluginmanager.h"
#include "screens.h"
#include "screenlockerwatcher.h"
#include "sm.h"
@ -296,6 +297,11 @@ void Application::createOptions()
options = new Options;
}
void Application::createPlugins()
{
PluginManager::create(this);
}
void Application::installNativeX11EventFilter()
{
installNativeEventFilter(m_eventFilter.data());
@ -316,6 +322,11 @@ void Application::destroyCompositor()
delete Compositor::self();
}
void Application::destroyPlugins()
{
delete PluginManager::self();
}
void Application::updateX11Time(xcb_generic_event_t *event)
{
xcb_timestamp_t time = XCB_TIME_CURRENT_TIME;

2
main.h
View File

@ -210,10 +210,12 @@ protected:
void createWorkspace();
void createAtoms();
void createOptions();
void createPlugins();
void installNativeX11EventFilter();
void removeNativeX11EventFilter();
void destroyWorkspace();
void destroyCompositor();
void destroyPlugins();
/**
* Inheriting classes should use this method to set the X11 root window
* before accessing any X11 specific code pathes.

4
main_wayland.cpp
View File

@ -14,7 +14,6 @@
// kwin
#include "platform.h"
#include "effects.h"
#include "pluginmanager.h"
#include "tabletmodemanager.h"
#include "wayland_server.h"
@ -129,6 +128,7 @@ ApplicationWayland::~ApplicationWayland()
if (effects) {
static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects();
}
destroyPlugins();
delete m_xwayland;
m_xwayland = nullptr;
destroyWorkspace();
@ -158,7 +158,7 @@ void ApplicationWayland::performStartup()
InputMethod::create(this);
createBackend();
TabletModeManager::create(this);
PluginManager::create(this);
createPlugins();
}
void ApplicationWayland::createBackend()

4
main_x11.cpp
View File

@ -13,7 +13,6 @@
#include <config-kwin.h>
#include "platform.h"
#include "pluginmanager.h"
#include "sm.h"
#include "workspace.h"
#include "xcbutils.h"
@ -191,6 +190,7 @@ void ApplicationX11::setReplace(bool replace)
void ApplicationX11::lostSelection()
{
sendPostedEvents();
destroyPlugins();
destroyCompositor();
destroyWorkspace();
// Remove windowmanager privileges
@ -249,7 +249,7 @@ void ApplicationX11::performStartup()
connect(platform(), &Platform::screensQueried, this,
[this] {
createWorkspace();
PluginManager::create(this);
createPlugins();
Xcb::sync(); // Trigger possible errors, there's still a chance to abort