Small adaptation and formatting
This commit is contained in:
Sergey Kovalev
@ -18,174 +18,178 @@ using boost::asio::steady_timer;
|
||||
using boost::asio::ip::tcp;
|
||||
|
||||
namespace Slic3r {
|
||||
namespace Utils {
|
||||
namespace Utils {
|
||||
|
||||
void TCPConsole::transmit_next_command()
|
||||
{
|
||||
if (cmd_queue_.empty()) {
|
||||
io_context_.stop();
|
||||
return;
|
||||
}
|
||||
void TCPConsole::transmit_next_command()
|
||||
{
|
||||
if (cmd_queue_.empty()) {
|
||||
io_context_.stop();
|
||||
return;
|
||||
}
|
||||
|
||||
std::string cmd = cmd_queue_.front();
|
||||
cmd_queue_.pop_front();
|
||||
std::string cmd = cmd_queue_.front();
|
||||
cmd_queue_.pop_front();
|
||||
|
||||
BOOST_LOG_TRIVIAL(debug) << boost::format("TCPConsole: transmitting '%3%' to %1%:%2%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% cmd;
|
||||
BOOST_LOG_TRIVIAL(debug) << boost::format("TCPConsole: transmitting '%3%' to %1%:%2%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% cmd;
|
||||
|
||||
auto data = boost::asio::buffer(cmd + newline_);
|
||||
auto data = boost::asio::buffer(cmd + newline_);
|
||||
|
||||
boost::asio::async_write(
|
||||
socket_,
|
||||
data,
|
||||
boost::bind(&TCPConsole::handle_write, this, _1, _2)
|
||||
);
|
||||
}
|
||||
|
||||
void TCPConsole::wait_next_line()
|
||||
{
|
||||
boost::asio::async_read_until(
|
||||
socket_,
|
||||
recv_buffer_,
|
||||
newline_,
|
||||
boost::bind(&TCPConsole::handle_read, this, _1, _2)
|
||||
);
|
||||
}
|
||||
|
||||
// TODO: Use std::optional here
|
||||
std::string TCPConsole::extract_next_line()
|
||||
{
|
||||
char linebuf[1024];
|
||||
|
||||
std::istream is(&recv_buffer_);
|
||||
is.getline(linebuf, sizeof(linebuf));
|
||||
if (is.good()) {
|
||||
return linebuf;
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
void TCPConsole::handle_read(
|
||||
const boost::system::error_code& ec,
|
||||
std::size_t bytes_transferred)
|
||||
{
|
||||
error_code_ = ec;
|
||||
|
||||
if (ec) {
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't read from %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% ec.message();
|
||||
|
||||
io_context_.stop();
|
||||
} else {
|
||||
std::string line = extract_next_line();
|
||||
boost::trim(line);
|
||||
|
||||
BOOST_LOG_TRIVIAL(debug) << boost::format("TCPConsole: received '%3%' from %1%:%2%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% line;
|
||||
|
||||
boost::to_lower(line);
|
||||
|
||||
if (line == done_string_) {
|
||||
transmit_next_command();
|
||||
} else {
|
||||
wait_next_line();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TCPConsole::handle_write(
|
||||
const boost::system::error_code& ec,
|
||||
std::size_t)
|
||||
{
|
||||
error_code_ = ec;
|
||||
if (ec) {
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't write to %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% ec.message();
|
||||
|
||||
io_context_.stop();
|
||||
} else {
|
||||
wait_next_line();
|
||||
}
|
||||
}
|
||||
|
||||
void TCPConsole::handle_connect(const boost::system::error_code& ec)
|
||||
{
|
||||
error_code_ = ec;
|
||||
|
||||
if (ec) {
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't connect to %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% ec.message();
|
||||
|
||||
io_context_.stop();
|
||||
} else {
|
||||
BOOST_LOG_TRIVIAL(info) << boost::format("TCPConsole: connected to %1%:%2%")
|
||||
% host_name_
|
||||
% port_name_;
|
||||
|
||||
|
||||
transmit_next_command();
|
||||
}
|
||||
}
|
||||
|
||||
bool TCPConsole::run_queue()
|
||||
{
|
||||
try {
|
||||
// TODO: Add more resets and initializations after previous run
|
||||
|
||||
auto endpoints = resolver_.resolve(host_name_, port_name_);
|
||||
|
||||
socket_.async_connect(endpoints->endpoint(),
|
||||
boost::bind(&TCPConsole::handle_connect, this, _1)
|
||||
);
|
||||
|
||||
// TODO: Add error and timeout processing
|
||||
io_context_.restart();
|
||||
while (!io_context_.stopped()) {
|
||||
BOOST_LOG_TRIVIAL(debug) << ".\n";
|
||||
if (error_code_) {
|
||||
io_context_.stop();
|
||||
boost::asio::async_write(
|
||||
socket_,
|
||||
data,
|
||||
boost::bind(&TCPConsole::handle_write, this, _1, _2)
|
||||
);
|
||||
}
|
||||
io_context_.run_for(boost::asio::chrono::milliseconds(100));
|
||||
|
||||
void TCPConsole::wait_next_line()
|
||||
{
|
||||
boost::asio::async_read_until(
|
||||
socket_,
|
||||
recv_buffer_,
|
||||
newline_,
|
||||
boost::bind(&TCPConsole::handle_read, this, _1, _2)
|
||||
);
|
||||
}
|
||||
|
||||
// TODO: Use std::optional here
|
||||
std::string TCPConsole::extract_next_line()
|
||||
{
|
||||
char linebuf[1024];
|
||||
|
||||
std::istream is(&recv_buffer_);
|
||||
is.getline(linebuf, sizeof(linebuf));
|
||||
if (is.good()) {
|
||||
return linebuf;
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
void TCPConsole::handle_read(
|
||||
const boost::system::error_code& ec,
|
||||
std::size_t bytes_transferred)
|
||||
{
|
||||
error_code_ = ec;
|
||||
|
||||
if (ec) {
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't read from %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% ec.message();
|
||||
|
||||
io_context_.stop();
|
||||
}
|
||||
else {
|
||||
std::string line = extract_next_line();
|
||||
boost::trim(line);
|
||||
|
||||
BOOST_LOG_TRIVIAL(debug) << boost::format("TCPConsole: received '%3%' from %1%:%2%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% line;
|
||||
|
||||
boost::to_lower(line);
|
||||
|
||||
if (line == done_string_) {
|
||||
transmit_next_command();
|
||||
}
|
||||
else {
|
||||
wait_next_line();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TCPConsole::handle_write(
|
||||
const boost::system::error_code& ec,
|
||||
std::size_t)
|
||||
{
|
||||
error_code_ = ec;
|
||||
if (ec) {
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't write to %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% ec.message();
|
||||
|
||||
io_context_.stop();
|
||||
}
|
||||
else {
|
||||
wait_next_line();
|
||||
}
|
||||
}
|
||||
|
||||
void TCPConsole::handle_connect(const boost::system::error_code& ec)
|
||||
{
|
||||
error_code_ = ec;
|
||||
|
||||
if (ec) {
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Can't connect to %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% ec.message();
|
||||
|
||||
io_context_.stop();
|
||||
}
|
||||
else {
|
||||
BOOST_LOG_TRIVIAL(info) << boost::format("TCPConsole: connected to %1%:%2%")
|
||||
% host_name_
|
||||
% port_name_;
|
||||
|
||||
|
||||
transmit_next_command();
|
||||
}
|
||||
}
|
||||
|
||||
bool TCPConsole::run_queue()
|
||||
{
|
||||
try {
|
||||
// TODO: Add more resets and initializations after previous run
|
||||
|
||||
auto endpoints = resolver_.resolve(host_name_, port_name_);
|
||||
|
||||
socket_.async_connect(endpoints->endpoint(),
|
||||
boost::bind(&TCPConsole::handle_connect, this, _1)
|
||||
);
|
||||
|
||||
// TODO: Add error and timeout processing
|
||||
io_context_.restart();
|
||||
while (!io_context_.stopped()) {
|
||||
BOOST_LOG_TRIVIAL(debug) << ".\n";
|
||||
if (error_code_) {
|
||||
io_context_.stop();
|
||||
}
|
||||
io_context_.run_for(boost::asio::chrono::milliseconds(100));
|
||||
}
|
||||
|
||||
// Socket is not closed automatically by boost
|
||||
socket_.close();
|
||||
|
||||
if (error_code_) {
|
||||
// We expect that message is logged in handler
|
||||
return false;
|
||||
}
|
||||
|
||||
// It's expected to have empty queue after successful exchange
|
||||
if (!cmd_queue_.empty()) {
|
||||
BOOST_LOG_TRIVIAL(error) << "TCPConsole: command queue is not empty after end of exchange";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch (std::exception& e)
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Exception while talking with %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% e.what();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Socket is not closed automatically by boost
|
||||
socket_.close();
|
||||
|
||||
if (error_code_) {
|
||||
// We expect that message is logged in handler
|
||||
return false;
|
||||
}
|
||||
|
||||
// It's expected to have empty queue after successful exchange
|
||||
if (!cmd_queue_.empty()) {
|
||||
BOOST_LOG_TRIVIAL(error) << "TCPConsole: command queue is not empty after end of exchange";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch (std::exception& e)
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("TCPConsole: Exception while talking with %1%:%2%: %3%")
|
||||
% host_name_
|
||||
% port_name_
|
||||
% e.what();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user