diff --git a/include/spinscale/puppetApplication.h b/include/spinscale/puppetApplication.h index b9281fa..a004b47 100644 --- a/include/spinscale/puppetApplication.h +++ b/include/spinscale/puppetApplication.h @@ -2,8 +2,6 @@ #define PUPPET_APPLICATION_H #include -#include -#include #include #include #include @@ -22,16 +20,11 @@ public: const std::vector> &threads); ~PuppetApplication() = default; - co::ViralNonPostingInvoker joltAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback); - co::ViralNonPostingInvoker startAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback); - co::ViralNonPostingInvoker pauseAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback); - co::ViralNonPostingInvoker resumeAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback); - co::ViralNonPostingInvoker exitAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback); + co::ViralNonPostingInvoker joltAllPuppetThreadsCReq(); + co::ViralNonPostingInvoker startAllPuppetThreadsCReq(); + co::ViralNonPostingInvoker pauseAllPuppetThreadsCReq(); + co::ViralNonPostingInvoker resumeAllPuppetThreadsCReq(); + co::ViralNonPostingInvoker exitAllPuppetThreadsCReq(); // CPU distribution method void distributeAndPinThreadsAcrossCpus(); @@ -71,8 +64,6 @@ protected: private: co::ViralNonPostingInvoker allPuppetThreadsLifetimeOpCReq( - std::exception_ptr &exceptionPtr, - std::function callback, PuppetThread::ThreadOp threadOp, std::string_view emptyThreadsLogMessage); }; diff --git a/src/puppetApplication.cpp b/src/puppetApplication.cpp index 3522ff0..55ccd20 100644 --- a/src/puppetApplication.cpp +++ b/src/puppetApplication.cpp @@ -63,9 +63,7 @@ void PuppetApplication::addAllPuppetLifetimeInvokersToGroup( } co::ViralNonPostingInvoker -PuppetApplication::joltAllPuppetThreadsCReq( - [[maybe_unused]] std::exception_ptr &exceptionPtr, - [[maybe_unused]] std::function callback) +PuppetApplication::joltAllPuppetThreadsCReq() { if (threadsHaveBeenJolted) { @@ -94,8 +92,6 @@ PuppetApplication::joltAllPuppetThreadsCReq( co::ViralNonPostingInvoker PuppetApplication::allPuppetThreadsLifetimeOpCReq( - [[maybe_unused]] std::exception_ptr &exceptionPtr, - [[maybe_unused]] std::function callback, PuppetThread::ThreadOp threadOp, std::string_view emptyThreadsLogMessage) { @@ -116,39 +112,31 @@ PuppetApplication::allPuppetThreadsLifetimeOpCReq( } co::ViralNonPostingInvoker -PuppetApplication::startAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback) +PuppetApplication::startAllPuppetThreadsCReq() { return allPuppetThreadsLifetimeOpCReq( - exceptionPtr, std::move(callback), PuppetThread::ThreadOp::START, noPuppetThreadsToStartLogMessage); } co::ViralNonPostingInvoker -PuppetApplication::pauseAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback) +PuppetApplication::pauseAllPuppetThreadsCReq() { return allPuppetThreadsLifetimeOpCReq( - exceptionPtr, std::move(callback), PuppetThread::ThreadOp::PAUSE, noPuppetThreadsToPauseLogMessage); } co::ViralNonPostingInvoker -PuppetApplication::resumeAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, std::function callback) +PuppetApplication::resumeAllPuppetThreadsCReq() { return allPuppetThreadsLifetimeOpCReq( - exceptionPtr, std::move(callback), PuppetThread::ThreadOp::RESUME, noPuppetThreadsToResumeLogMessage); } co::ViralNonPostingInvoker -PuppetApplication::exitAllPuppetThreadsCReq( - std::exception_ptr &exceptionPtr, - std::function callback) +PuppetApplication::exitAllPuppetThreadsCReq() { if (componentThreads.empty()) { @@ -157,7 +145,6 @@ PuppetApplication::exitAllPuppetThreadsCReq( } co_await allPuppetThreadsLifetimeOpCReq( - exceptionPtr, std::move(callback), PuppetThread::ThreadOp::EXIT, noPuppetThreadsToExitLogMessage);