Skip to content

Commit e5b1592

Browse files
committed
2nd testing
1 parent 7ceb637 commit e5b1592

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

src/viam/sdk/module/signal_manager.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <memory> //must include for std::unique_ptr
3+
#include <memory> //must include for std::unique_ptr
44

55
namespace viam {
66
namespace sdk {
@@ -23,8 +23,8 @@ class SignalManager {
2323
int wait();
2424

2525
private:
26-
struct Impl; // Forward declaration for pImpl idiom
27-
std::unique_ptr<Impl> pImpl; // Pointer to the implementation
26+
struct Impl; // Forward declaration for pImpl idiom
27+
std::unique_ptr<Impl> pImpl; // Pointer to the implementation
2828
};
2929

3030
} // namespace sdk

src/viam/sdk/module/signal_manager_posix.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
#include <viam/sdk/module/signal_manager.hpp>
22

3-
#include <signal.h>
43
#include <csignal>
54
#include <pthread.h>
5+
#include <signal.h>
66

77
namespace viam {
88
namespace sdk {
99

1010
struct SignalManager::Impl {
11-
sigset_t sigset_;
11+
sigset_t sigset_;
1212
};
1313

14-
SignalManager::SignalManager()
15-
:pImpl(std::make_unique<Impl>()) {
14+
SignalManager::SignalManager() : pImpl(std::make_unique<Impl>()) {
1615
sigemptyset(&(pImpl->sigset_));
1716
sigaddset(&(pImpl->sigset_), SIGINT);
1817
sigaddset(&(pImpl->sigset_), SIGTERM);
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
1+
#include <signal.h>
12
#include <viam/sdk/module/signal_manager.hpp>
2-
#include <signal.h>
3-
#include <windows.h> //this file assumes WIN32
3+
#include <windows.h> //this file assumes WIN32
44

55
#include <stdexcept>
66

77
namespace viam {
88
namespace sdk {
99

10-
struct SignalManager::Impl { //Windows implementation details of SignalManager
11-
static BOOL WINAPI console_handler_routine_(DWORD dwCtrlType){
10+
struct SignalManager::Impl { // Windows implementation details of SignalManager
11+
static BOOL WINAPI console_handler_routine_(DWORD dwCtrlType) {
1212
if (dwCtrlType == CTRL_C_EVENT || dwCtrlType == CTRL_BREAK_EVENT) {
13-
instance_->handle_signal_(SIGINT);
13+
instance_->pImpl->handle_signal_(SIGINT);
1414
return TRUE;
1515
} else if (dwCtrlType == CTRL_CLOSE_EVENT || dwCtrlType == CTRL_LOGOFF_EVENT ||
16-
dwCtrlType == CTRL_SHUTDOWN_EVENT) {
17-
instance_->handle_signal_(SIGTERM);
16+
dwCtrlType == CTRL_SHUTDOWN_EVENT) {
17+
instance_->pImpl->handle_signal_(SIGTERM);
1818
return TRUE;
1919
}
2020
return FALSE;
2121
}
2222

23-
void handle_signal_(int signal){
23+
void handle_signal_(int signal) {
2424
if (signal_event_ != INVALID_HANDLE_VALUE) {
2525
signal_code_ = signal;
2626
SetEvent(signal_event_);
2727
}
2828
}
29-
30-
static SignalManager::Impl* instance_;
29+
30+
static SignalManager* instance_;
3131
HANDLE signal_event_ = INVALID_HANDLE_VALUE;
3232
int signal_code_ = 0;
3333
};
3434

35-
SignalManager::Impl* SignalManager::Impl::instance_ = nullptr;
35+
SignalManager* SignalManager::Impl::instance_ = nullptr;
3636

37-
SignalManager::SignalManager()
38-
:pImpl(std::make_unique<Impl>()) {
39-
SignalManager::Impl::instance_ = this->pImpl;
37+
SignalManager::SignalManager() : pImpl(std::make_unique<Impl>()) {
38+
SignalManager::Impl::instance_ = this;
4039
SetConsoleCtrlHandler(SignalManager::Impl::console_handler_routine_, TRUE);
4140
}
4241

@@ -57,6 +56,5 @@ int SignalManager::wait() {
5756
return static_cast<DWORD>(pImpl->signal_code_);
5857
}
5958

60-
6159
} // namespace sdk
6260
} // namespace viam

0 commit comments

Comments
 (0)