doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed Linux to GNU/Linux and other tidying

Browse Source
This commit is contained in:
Nav
2022-06-01 21:48:27 +01:00
parent ec9068ba42
commit dd204742d3
10 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/SignalHandler/SignalHandler.cpp
View File

@@ -11,16 +11,17 @@ namespace Bloom
void SignalHandler::run() {
try {
this->startup();
auto signalSet = this->getRegisteredSignalSet();
const auto signalSet = this->getRegisteredSignalSet();
int signalNumber = 0;
Logger::debug("SignalHandler ready");
while(Thread::getThreadState() == ThreadState::READY) {
if (sigwait(&signalSet, &signalNumber) == 0) {
if (::sigwait(&signalSet, &signalNumber) == 0) {
Logger::debug("SIGNAL " + std::to_string(signalNumber) + " received");
if (this->handlersMappedBySignalNum.contains(signalNumber)) {
if (this->handlersBySignalNum.contains(signalNumber)) {
// We have a registered handler for this signal.
this->handlersMappedBySignalNum.at(signalNumber)();
this->handlersBySignalNum.at(signalNumber)();
}
}
}
@@ -39,15 +40,15 @@ namespace Bloom
Logger::debug("Starting SignalHandler");
// Block all signal interrupts
auto signalSet = this->getRegisteredSignalSet();
sigprocmask(SIG_SETMASK, &signalSet, NULL);
::sigprocmask(SIG_SETMASK, &signalSet, NULL);
// Register handlers
this->handlersMappedBySignalNum.insert(std::pair(
this->handlersBySignalNum.insert(std::pair(
SIGINT,
std::bind(&SignalHandler::triggerApplicationShutdown, this)
));
this->handlersMappedBySignalNum.insert(std::pair(
this->handlersBySignalNum.insert(std::pair(
SIGTERM,
std::bind(&SignalHandler::triggerApplicationShutdown, this)
));
@@ -58,10 +59,10 @@ namespace Bloom
}
}
sigset_t SignalHandler::getRegisteredSignalSet() const {
sigset_t set = {};
if (sigfillset(&set) == -1) {
throw Exceptions::Exception("sigfillset() failed - error number: " + std::to_string(errno));
::sigset_t SignalHandler::getRegisteredSignalSet() const {
::sigset_t set = {};
if (::sigfillset(&set) == -1) {
throw Exceptions::Exception("::sigfillset() failed - error number: " + std::to_string(errno));
}
return set;

6
src/SignalHandler/SignalHandler.hpp
View File

@@ -27,9 +27,9 @@ namespace Bloom
private:
/**
* Mapping of signal numbers to functions.
* Mapping of signal numbers to handler functions.
*/
std::map<int, std::function<void()>> handlersMappedBySignalNum;
std::map<int, std::function<void()>> handlersBySignalNum;
/**
* We keep record of the number of shutdown signals received. See definition of triggerApplicationShutdown()
@@ -49,7 +49,7 @@ namespace Bloom
*
* @return
*/
[[nodiscard]] sigset_t getRegisteredSignalSet() const;
[[nodiscard]] ::sigset_t getRegisteredSignalSet() const;
/**
* Handler for SIGINT, SIGTERM, etc signals.