summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVaxry <43317083+vaxerski@users.noreply.github.com>2025-04-06 17:31:58 +0200
committerGitHub <noreply@github.com>2025-04-06 17:31:58 +0200
commit3c128679ee8c86bbbeb5ae38621f6de622525cf1 (patch)
tree08a920819d766099d7a3d7fde9a8f968992c3a2c /src
parente96b8ce4cc5e5856b6da653f1d92af856b5e72c9 (diff)
helpers: Add an async dialog box impl (#9919)
Adds an async dialog box, way safer than our previous local solution for ANR
Diffstat (limited to 'src')
-rw-r--r--src/helpers/AsyncDialogBox.cpp122
-rw-r--r--src/helpers/AsyncDialogBox.hpp45
-rw-r--r--src/managers/ANRManager.cpp73
-rw-r--r--src/managers/ANRManager.hpp34
-rw-r--r--src/managers/eventLoop/EventLoopManager.hpp1
5 files changed, 207 insertions, 68 deletions
diff --git a/src/helpers/AsyncDialogBox.cpp b/src/helpers/AsyncDialogBox.cpp
new file mode 100644
index 00000000..2ca99ab9
--- /dev/null
+++ b/src/helpers/AsyncDialogBox.cpp
@@ -0,0 +1,122 @@
+#include "AsyncDialogBox.hpp"
+#include "./fs/FsUtils.hpp"
+#include <csignal>
+#include "../managers/eventLoop/EventLoopManager.hpp"
+
+using namespace Hyprutils::OS;
+
+SP<CAsyncDialogBox> CAsyncDialogBox::create(const std::string& title, const std::string& description, std::vector<std::string> buttons) {
+ if (!NFsUtils::executableExistsInPath("hyprland-dialog")) {
+ Debug::log(ERR, "CAsyncDialogBox: cannot create, no hyprland-dialog");
+ return nullptr;
+ }
+
+ auto dialog = SP<CAsyncDialogBox>(new CAsyncDialogBox(title, description, buttons));
+
+ dialog->m_selfWeakReference = dialog;
+
+ return dialog;
+}
+
+CAsyncDialogBox::CAsyncDialogBox(const std::string& title, const std::string& description, std::vector<std::string> buttons) :
+ m_title(title), m_description(description), m_buttons(buttons) {
+ ;
+}
+
+static int onFdWrite(int fd, uint32_t mask, void* data) {
+ auto box = (CAsyncDialogBox*)data;
+
+ box->onWrite(fd, mask);
+
+ return 0;
+}
+
+void CAsyncDialogBox::onWrite(int fd, uint32_t mask) {
+ if (mask & WL_EVENT_READABLE) {
+ std::array<char, 1024> buf;
+ int ret = 0;
+
+ // make the FD nonblock for a moment
+ // TODO: can we avoid this without risking a blocking read()?
+ int fdFlags = fcntl(fd, F_GETFL, 0);
+ if (fcntl(fd, F_SETFL, fdFlags | O_NONBLOCK) < 0) {
+ Debug::log(ERR, "CAsyncDialogBox::onWrite: fcntl 1 failed!");
+ return;
+ }
+
+ while ((ret = read(m_pipeReadFd.get(), buf.data(), 1023)) > 0) {
+ m_stdout += std::string_view{(char*)buf.data(), (size_t)ret};
+ }
+
+ // restore the flags (otherwise libwayland wont give us a hangup)
+ if (fcntl(fd, F_SETFL, fdFlags) < 0) {
+ Debug::log(ERR, "CAsyncDialogBox::onWrite: fcntl 2 failed!");
+ return;
+ }
+ }
+
+ if (mask & (WL_EVENT_HANGUP | WL_EVENT_ERROR)) {
+ Debug::log(LOG, "CAsyncDialogBox: dialog {:x} hung up, closed.");
+
+ if (m_onResolution)
+ m_onResolution(m_stdout);
+
+ wl_event_source_remove(m_readEventSource);
+ m_selfReference.reset();
+ return;
+ }
+}
+
+void CAsyncDialogBox::open(std::function<void(std::string)> onResolution) {
+ m_onResolution = onResolution;
+
+ std::string buttonsString = "";
+ for (auto& b : m_buttons) {
+ buttonsString += b + ";";
+ }
+ if (!buttonsString.empty())
+ buttonsString.pop_back();
+
+ CProcess proc("hyprland-dialog", std::vector<std::string>{"--title", m_title, "--text", m_description, "--buttons", buttonsString});
+
+ int outPipe[2];
+ if (pipe(outPipe)) {
+ Debug::log(ERR, "CAsyncDialogBox::open: failed to pipe()");
+ return;
+ }
+
+ m_pipeReadFd = CFileDescriptor(outPipe[0]);
+
+ proc.setStdoutFD(outPipe[1]);
+
+ m_readEventSource = wl_event_loop_add_fd(g_pEventLoopManager->m_sWayland.loop, m_pipeReadFd.get(), WL_EVENT_READABLE, ::onFdWrite, this);
+
+ if (!m_readEventSource) {
+ Debug::log(ERR, "CAsyncDialogBox::open: failed to add read fd to loop");
+ return;
+ }
+
+ m_selfReference = m_selfWeakReference.lock();
+
+ m_dialogPid = proc.pid();
+
+ if (!proc.runAsync()) {
+ Debug::log(ERR, "CAsyncDialogBox::open: failed to run async");
+ wl_event_source_remove(m_readEventSource);
+ return;
+ }
+
+ // close the write fd, only the dialog owns it now
+ close(outPipe[1]);
+}
+
+void CAsyncDialogBox::kill() {
+ if (m_dialogPid <= 0)
+ return;
+
+ ::kill(m_dialogPid, SIGKILL);
+}
+
+bool CAsyncDialogBox::isRunning() const {
+ return m_readEventSource;
+} \ No newline at end of file
diff --git a/src/helpers/AsyncDialogBox.hpp b/src/helpers/AsyncDialogBox.hpp
new file mode 100644
index 00000000..d3cc242c
--- /dev/null
+++ b/src/helpers/AsyncDialogBox.hpp
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "../macros.hpp"
+#include "./memory/Memory.hpp"
+
+#include <vector>
+#include <functional>
+
+#include <hyprutils/os/Process.hpp>
+#include <hyprutils/os/FileDescriptor.hpp>
+
+struct wl_event_source;
+
+class CAsyncDialogBox {
+ public:
+ static SP<CAsyncDialogBox> create(const std::string& title, const std::string& description, std::vector<std::string> buttons);
+
+ CAsyncDialogBox(const CAsyncDialogBox&) = delete;
+ CAsyncDialogBox(CAsyncDialogBox&&) = delete;
+ CAsyncDialogBox& operator=(const CAsyncDialogBox&) = delete;
+ CAsyncDialogBox& operator=(CAsyncDialogBox&&) = delete;
+
+ void open(std::function<void(std::string)> onResolution);
+ void kill();
+ bool isRunning() const;
+
+ void onWrite(int fd, uint32_t mask);
+
+ private:
+ CAsyncDialogBox(const std::string& title, const std::string& description, std::vector<std::string> buttons);
+
+ pid_t m_dialogPid = 0;
+ wl_event_source* m_readEventSource = nullptr;
+ std::function<void(std::string)> m_onResolution;
+ Hyprutils::OS::CFileDescriptor m_pipeReadFd;
+ std::string m_stdout = "";
+
+ const std::string m_title;
+ const std::string m_description;
+ const std::vector<std::string> m_buttons;
+
+ // WARNING: cyclic reference. This will be removed once the event source is removed to avoid dangling pointers
+ SP<CAsyncDialogBox> m_selfReference;
+ WP<CAsyncDialogBox> m_selfWeakReference;
+}; \ No newline at end of file
diff --git a/src/managers/ANRManager.cpp b/src/managers/ANRManager.cpp
index 3debcda8..acdb39b7 100644
--- a/src/managers/ANRManager.cpp
+++ b/src/managers/ANRManager.cpp
@@ -39,8 +39,6 @@ CANRManager::CANRManager() {
}
void CANRManager::onTick() {
- std::erase_if(m_data, [](const auto& e) { return e->isDefunct(); });
-
static auto PENABLEANR = CConfigValue<Hyprlang::INT>("misc:enable_anr_dialog");
static auto PANRTHRESHOLD = CConfigValue<Hyprlang::INT>("misc:anr_missed_pings");
@@ -68,7 +66,7 @@ void CANRManager::onTick() {
continue;
if (data->missedResponses >= *PANRTHRESHOLD) {
- if (!data->isThreadRunning() && !data->dialogThreadSaidWait) {
+ if (!data->isRunning() && !data->dialogSaidWait) {
data->runDialog("Application Not Responding", firstWindow->m_szTitle, firstWindow->m_szClass, data->getPid());
for (const auto& w : g_pCompositor->m_vWindows) {
@@ -81,11 +79,11 @@ void CANRManager::onTick() {
*w->m_notRespondingTint = 0.2F;
}
}
- } else if (data->isThreadRunning())
+ } else if (data->isRunning())
data->killDialog();
if (data->missedResponses == 0)
- data->dialogThreadSaidWait = false;
+ data->dialogSaidWait = false;
data->missedResponses++;
@@ -115,7 +113,7 @@ void CANRManager::onResponse(SP<CXWaylandSurface> pXwaylandSurface) {
void CANRManager::onResponse(SP<CANRManager::SANRData> data) {
data->missedResponses = 0;
- if (data->isThreadRunning())
+ if (data->isRunning())
data->killDialog();
}
@@ -158,64 +156,39 @@ CANRManager::SANRData::SANRData(PHLWINDOW pWindow) :
}
CANRManager::SANRData::~SANRData() {
- if (dialogThread.joinable()) {
+ if (dialogBox && dialogBox->isRunning())
killDialog();
- // dangerous: might lock if the above failed!!
- dialogThread.join();
- }
}
void CANRManager::SANRData::runDialog(const std::string& title, const std::string& appName, const std::string appClass, pid_t dialogWmPID) {
- if (!dialogThreadExited)
+ if (dialogBox && dialogBox->isRunning())
killDialog();
- // dangerous: might lock if the above failed!!
- if (dialogThread.joinable())
- dialogThread.join();
-
- dialogThreadExited = false;
- dialogThreadSaidWait = false;
- dialogThread = std::thread([title, appName, appClass, dialogWmPID, this]() {
- SP<CProcess> proc = makeShared<CProcess>("hyprland-dialog",
- std::vector<std::string>{"--title", title, "--text",
- std::format("Application {} with class of {} is not responding.\nWhat do you want to do with it?",
- appName.empty() ? "unknown" : appName, appClass.empty() ? "unknown" : appClass),
- "--buttons", "Terminate;Wait"});
-
- dialogProc = proc;
- proc->runSync();
-
- dialogThreadExited = true;
-
- if (proc->stdOut().empty())
- return;
-
- if (proc->stdOut().starts_with("Terminate"))
- kill(dialogWmPID, SIGKILL);
- if (proc->stdOut().starts_with("Wait"))
- dialogThreadSaidWait = true;
+ dialogBox = CAsyncDialogBox::create(title,
+ std::format("Application {} with class of {} is not responding.\nWhat do you want to do with it?", appName.empty() ? "unknown" : appName,
+ appClass.empty() ? "unknown" : appClass),
+ std::vector<std::string>{"Terminate", "Wait"});
+
+ dialogBox->open([dialogWmPID, this](std::string result) {
+ if (result.starts_with("Terminate"))
+ ::kill(dialogWmPID, SIGKILL);
+ else if (result.starts_with("Wait"))
+ dialogSaidWait = true;
+ else
+ Debug::log(ERR, "CANRManager::SANRData::runDialog: lambda: unrecognized result: {}", result);
});
}
-bool CANRManager::SANRData::isThreadRunning() {
- if (dialogThread.native_handle() == 0)
- return false;
- if (dialogThreadExited)
- return false;
- return pthread_kill(dialogThread.native_handle(), 0) != ESRCH;
+bool CANRManager::SANRData::isRunning() {
+ return dialogBox && dialogBox->isRunning();
}
void CANRManager::SANRData::killDialog() {
- if (!dialogProc)
+ if (!dialogBox)
return;
- if (!dialogProc->pid()) {
- Debug::log(ERR, "ANR: cannot kill dialogProc, as it doesn't have a pid.");
- dialogProc = nullptr;
- return;
- }
-
- kill(dialogProc->pid(), SIGKILL);
+ dialogBox->kill();
+ dialogBox = nullptr;
}
bool CANRManager::SANRData::fitsWindow(PHLWINDOW pWindow) const {
diff --git a/src/managers/ANRManager.hpp b/src/managers/ANRManager.hpp
index 4d838f57..f5c0085b 100644
--- a/src/managers/ANRManager.hpp
+++ b/src/managers/ANRManager.hpp
@@ -7,8 +7,7 @@
#include <hyprutils/os/FileDescriptor.hpp>
#include "./eventLoop/EventLoopTimer.hpp"
#include "../helpers/signal/Signal.hpp"
-#include <atomic>
-#include <thread>
+#include "../helpers/AsyncDialogBox.hpp"
#include <vector>
class CXDGWMBase;
@@ -32,22 +31,21 @@ class CANRManager {
SANRData(PHLWINDOW pWindow);
~SANRData();
- WP<CXWaylandSurface> xwaylandSurface;
- WP<CXDGWMBase> xdgBase;
-
- int missedResponses = 0;
- std::thread dialogThread;
- SP<Hyprutils::OS::CProcess> dialogProc;
- std::atomic<bool> dialogThreadExited = false;
- std::atomic<bool> dialogThreadSaidWait = false;
-
- void runDialog(const std::string& title, const std::string& appName, const std::string appClass, pid_t dialogWmPID);
- bool isThreadRunning();
- void killDialog();
- bool isDefunct() const;
- bool fitsWindow(PHLWINDOW pWindow) const;
- pid_t getPid() const;
- void ping();
+ WP<CXWaylandSurface> xwaylandSurface;
+ WP<CXDGWMBase> xdgBase;
+
+ int missedResponses = 0;
+
+ bool dialogSaidWait = false;
+ SP<CAsyncDialogBox> dialogBox;
+
+ void runDialog(const std::string& title, const std::string& appName, const std::string appClass, pid_t dialogWmPID);
+ bool isRunning();
+ void killDialog();
+ bool isDefunct() const;
+ bool fitsWindow(PHLWINDOW pWindow) const;
+ pid_t getPid() const;
+ void ping();
};
void onResponse(SP<SANRData> data);
diff --git a/src/managers/eventLoop/EventLoopManager.hpp b/src/managers/eventLoop/EventLoopManager.hpp
index ebeb2160..f240dae9 100644
--- a/src/managers/eventLoop/EventLoopManager.hpp
+++ b/src/managers/eventLoop/EventLoopManager.hpp
@@ -68,6 +68,7 @@ class CEventLoopManager {
wl_event_source* m_configWatcherInotifySource = nullptr;
friend class CSyncTimeline;
+ friend class CAsyncDialogBox;
};
inline UP<CEventLoopManager> g_pEventLoopManager;