hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 07:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Unload plugins on compositor cleanup (#1662)

Browse source
This commit is contained in:
Stanisław Zagórowski 2023-03-01 00:11:49 +01:00 committed by GitHub
parent 07b98952bc
commit 5c93f6947a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Compositor.cpp
View file

@ -285,6 +285,10 @@ void CCompositor::cleanup() {
m_bIsShuttingDown = true; m_bIsShuttingDown = true;
// unload all remaining plugins while the compositor is
// still in a normal working state.
g_pPluginSystem->unloadAllPlugins();
m_pLastFocus = nullptr; m_pLastFocus = nullptr;
m_pLastWindow = nullptr; m_pLastWindow = nullptr;

8
src/plugins/PluginSystem.cpp
View file

@ -1,6 +1,7 @@
#include "PluginSystem.hpp" #include "PluginSystem.hpp"
#include <dlfcn.h> #include <dlfcn.h>
#include <ranges>
#include "../Compositor.hpp" #include "../Compositor.hpp"
CPluginSystem::CPluginSystem() { CPluginSystem::CPluginSystem() {
@ -113,6 +114,11 @@ void CPluginSystem::unloadPlugin(const CPlugin* plugin, bool eject) {
std::erase_if(m_vLoadedPlugins, [&](const auto& other) { return other->m_pHandle == plugin->m_pHandle; }); std::erase_if(m_vLoadedPlugins, [&](const auto& other) { return other->m_pHandle == plugin->m_pHandle; });
} }
void CPluginSystem::unloadAllPlugins() {
for (auto& p : m_vLoadedPlugins | std::views::reverse)
unloadPlugin(p.get(), false); // Unload remaining plugins gracefully
}
CPlugin* CPluginSystem::getPluginByPath(const std::string& path) { CPlugin* CPluginSystem::getPluginByPath(const std::string& path) {
for (auto& p : m_vLoadedPlugins) { for (auto& p : m_vLoadedPlugins) {
if (p->path == path) if (p->path == path)
@ -136,4 +142,4 @@ std::vector<CPlugin*> CPluginSystem::getAllPlugins() {
for (size_t i = 0; i < m_vLoadedPlugins.size(); ++i) for (size_t i = 0; i < m_vLoadedPlugins.size(); ++i)
results[i] = m_vLoadedPlugins[i].get(); results[i] = m_vLoadedPlugins[i].get();
return results; return results;
} }

3
src/plugins/PluginSystem.hpp
View file

@ -29,6 +29,7 @@ class CPluginSystem {
CPlugin* loadPlugin(const std::string& path); CPlugin* loadPlugin(const std::string& path);
void unloadPlugin(const CPlugin* plugin, bool eject = false); void unloadPlugin(const CPlugin* plugin, bool eject = false);
void unloadAllPlugins();
CPlugin* getPluginByPath(const std::string& path); CPlugin* getPluginByPath(const std::string& path);
CPlugin* getPluginByHandle(HANDLE handle); CPlugin* getPluginByHandle(HANDLE handle);
std::vector<CPlugin*> getAllPlugins(); std::vector<CPlugin*> getAllPlugins();
@ -41,4 +42,4 @@ class CPluginSystem {
jmp_buf m_jbPluginFaultJumpBuf; jmp_buf m_jbPluginFaultJumpBuf;
}; };
inline std::unique_ptr<CPluginSystem> g_pPluginSystem; inline std::unique_ptr<CPluginSystem> g_pPluginSystem;