3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-24 18:41:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add timeout/errors management, multiple fixes

Browse source
This commit is contained in:
Sergey Kovalev 2020-12-29 04:50:52 +07:00
parent bb928f6ef7
commit fbe90b5534
4 changed files with 68 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/slic3r/Utils/TCPConsole.hpp
View file

@ -4,6 +4,7 @@
#include <string>
#include <list>
#include <boost/system/error_code.hpp>
#include <boost/system/system_error.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/streambuf.hpp>
@ -19,6 +20,15 @@ namespace Slic3r {
TCPConsole(const std::string& host_name, const std::string& port_name);
~TCPConsole() {}
void set_defaults()
{
newline_ = "\n";
done_string_ = "ok";
connect_timeout_ = boost::chrono::milliseconds(5000);
write_timeout_ = boost::chrono::milliseconds(10000);
read_timeout_ = boost::chrono::milliseconds(10000);
}
void set_line_delimiter(const std::string& newline) {
newline_ = newline;
}
@ -52,10 +62,16 @@ namespace Slic3r {
void wait_next_line();
std::string extract_next_line();
void set_deadline_in(boost::chrono::steady_clock::duration);
bool is_deadline_over();
std::string host_name_;
std::string port_name_;
std::string newline_;
std::string done_string_;
boost::chrono::steady_clock::duration connect_timeout_;
boost::chrono::steady_clock::duration write_timeout_;
boost::chrono::steady_clock::duration read_timeout_;
std::list<std::string> cmd_queue_;
@ -63,8 +79,11 @@ namespace Slic3r {
tcp::resolver resolver_;
tcp::socket socket_;
boost::asio::streambuf recv_buffer_;
std::string send_buffer_;
bool is_connected_;
boost::system::error_code error_code_;
boost::chrono::steady_clock::time_point deadline_;
};
} // Utils