diff --git a/applications/vision/src/main.cpp b/applications/vision/src/main.cpp index cc52052f648b99d54ccd7fddfba0e94d1d420982..149dceba5578b5b07733e4526d33e4ff234b44bf 100644 --- a/applications/vision/src/main.cpp +++ b/applications/vision/src/main.cpp @@ -24,6 +24,7 @@ #include <ftl/display.hpp> #include <ftl/rgbd_streamer.hpp> #include <ftl/net/universe.hpp> +#include <ftl/net/slave.hpp> #include <nlohmann/json.hpp> #include "opencv2/imgproc.hpp" @@ -80,7 +81,7 @@ void disparityToDepth(const cv::Mat &disparity, cv::Mat &depth, const cv::Mat &q static void run(ftl::Configurable *root) { Universe *net = ftl::create<Universe>(root, "net"); - LOG(INFO) << "Net started."; + ftl::net::Slave slave(net, root); auto paths = root->get<vector<string>>("paths"); string file = ""; diff --git a/components/net/cpp/CMakeLists.txt b/components/net/cpp/CMakeLists.txt index c7e8bb34119a6b2f70b5a34b6e4b7e4911fe465f..ef4a7aaba9b8657e6be07fc2c693ae8aa5cc594e 100644 --- a/components/net/cpp/CMakeLists.txt +++ b/components/net/cpp/CMakeLists.txt @@ -9,6 +9,7 @@ add_library(ftlnet src/dispatcher.cpp src/universe.cpp src/ws_internal.cpp + src/slave.cpp ) target_include_directories(ftlnet PUBLIC diff --git a/components/net/cpp/include/ftl/net/slave.hpp b/components/net/cpp/include/ftl/net/slave.hpp new file mode 100644 index 0000000000000000000000000000000000000000..d973f6aefca9c1d2ec55d3e29a8c79ef397b5833 --- /dev/null +++ b/components/net/cpp/include/ftl/net/slave.hpp @@ -0,0 +1,19 @@ +#ifndef _FTL_NET_SLAVE_HPP_ +#define _FTL_NET_SLAVE_HPP_ + +#include <ftl/net/universe.hpp> +#include <ftl/configurable.hpp> + +namespace ftl { +namespace net { + +class Slave { + public: + Slave(Universe *, ftl::Configurable *); + ~Slave(); +}; + +} +} + +#endif // _FTL_NET_SLAVE_HPP_ diff --git a/components/net/cpp/src/slave.cpp b/components/net/cpp/src/slave.cpp new file mode 100644 index 0000000000000000000000000000000000000000..77394adc73b97b6abdd114ca41d9909d2ecd1c38 --- /dev/null +++ b/components/net/cpp/src/slave.cpp @@ -0,0 +1,29 @@ +#include <ftl/net/slave.hpp> +#include <loguru.hpp> + +using ftl::Configurable; +using ftl::net::Universe; +using ftl::net::Slave; + +static void netLog(void* user_data, const loguru::Message& message) { + Universe *net = (Universe*)user_data; + net->publish("log", message.preamble, message.message); +} + +Slave::Slave(Universe *net, ftl::Configurable *root) { + net->bind("restart", []() { + LOG(WARNING) << "Remote restart..."; + exit(1); + }); + + net->bind("shutdown", []() { + LOG(WARNING) << "Remote shutdown..."; + exit(0); + }); + + loguru::add_callback("net_log", netLog, net, loguru::Verbosity_INFO); +} + +Slave::~Slave() { + +}