mirrors/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-10-06 01:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple improvements to the shutdown procedure

Browse Source
This commit is contained in:
vaxerski
2022-08-28 11:19:08 +02:00
parent 4203a61b69
commit d413388761
7 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Compositor.cpp
View File

@@ -16,6 +16,8 @@ int handleCritSignal(int signo, void* data) {
CCompositor::CCompositor() {
wlr_log_init(WLR_INFO, NULL);
m_iHyprlandPID = getpid();
m_szInstanceSignature = GIT_COMMIT_HASH + std::string("_") + std::to_string(time(NULL));
setenv("HYPRLAND_INSTANCE_SIGNATURE", m_szInstanceSignature.c_str(), true);
@@ -27,6 +29,8 @@ CCompositor::CCompositor() {
Debug::log(LOG, "Instance Signature: %s", m_szInstanceSignature.c_str());
Debug::log(LOG, "Hyprland PID: %i", m_iHyprlandPID);
Debug::log(LOG, "===== SYSTEM INFO: =====");
logSystemInfo();
@@ -236,6 +240,17 @@ void CCompositor::cleanup() {
m_pLastFocus = nullptr;
m_pLastWindow = nullptr;
// accumulate all PIDs for killing, also request closing.
for (auto& w : m_vWindows) {
m_dProcessPIDsOnShutdown.push_back(w->getPID());
closeWindow(w.get());
}
// end threads
g_pEventManager->m_tThread = std::thread();
HyprCtl::tThread = std::thread();
m_vWorkspaces.clear();
m_vWindows.clear();
@@ -254,6 +269,9 @@ void CCompositor::cleanup() {
wl_display_terminate(m_sWLDisplay);
m_bIsShuttingDown = true;
g_pKeybindManager->spawn("sleep 5 && kill -9 " + std::to_string(m_iHyprlandPID)); // this is to prevent that random "freezing"
// the PID should not be reused.
}
void CCompositor::startCompositor() {