Alex
6672e924df
The niri IPC worker slept 1ms per event and never reconnected. Under an event burst the per-event cap back-pressures the socket, niri fills its send buffer and drops the stream; read_line then returns false, the detached thread exits and the module freezes permanently. Remove the per-event sleep so events drain as fast as they arrive, and wrap the socket setup and read loop in a reconnect loop that backs off and re-establishes the stream on drop. A running_ flag lets the thread exit cleanly on teardown. Fixes #5117.
57 lines
1.5 KiB
C++
57 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include <atomic>
|
|
#include <list>
|
|
#include <mutex>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::niri {
|
|
|
|
class EventHandler {
|
|
public:
|
|
virtual void onEvent(const Json::Value& ev) = 0;
|
|
virtual ~EventHandler() = default;
|
|
};
|
|
|
|
class IPC {
|
|
public:
|
|
IPC();
|
|
~IPC();
|
|
|
|
void registerForIPC(const std::string& ev, EventHandler* ev_handler);
|
|
void unregisterForIPC(EventHandler* handler);
|
|
|
|
static Json::Value send(const Json::Value& request);
|
|
|
|
// The data members are only safe to access while dataMutex_ is locked.
|
|
std::lock_guard<std::mutex> lockData() { return std::lock_guard(dataMutex_); }
|
|
const std::vector<Json::Value>& workspaces() const { return workspaces_; }
|
|
const std::vector<Json::Value>& windows() const { return windows_; }
|
|
const std::vector<std::string>& keyboardLayoutNames() const { return keyboardLayoutNames_; }
|
|
unsigned keyboardLayoutCurrent() const { return keyboardLayoutCurrent_; }
|
|
|
|
private:
|
|
void startIPC();
|
|
static int connectToSocket();
|
|
void parseIPC(const std::string&);
|
|
|
|
std::mutex dataMutex_;
|
|
std::vector<Json::Value> workspaces_;
|
|
std::vector<Json::Value> windows_;
|
|
std::vector<std::string> keyboardLayoutNames_;
|
|
unsigned keyboardLayoutCurrent_;
|
|
|
|
util::JsonParser parser_;
|
|
std::mutex callbackMutex_;
|
|
std::list<std::pair<std::string, EventHandler*>> callbacks_;
|
|
|
|
std::atomic<bool> running_{true};
|
|
};
|
|
|
|
inline std::unique_ptr<IPC> gIPC;
|
|
|
|
}; // namespace waybar::modules::niri
|