eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

network changes

Browse Source
This commit is contained in:
milek7
2019-04-03 01:28:46 +02:00
parent 1b5c3ef306
commit 4344ec192a
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EU07.cpp
View File

@@ -41,5 +41,5 @@ int main( int argc, char *argv[] )
{ {
ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) );
} }
std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults
} }

1
application.cpp
View File

@@ -338,6 +338,7 @@ eu07_application::release_python_lock() {
void void
eu07_application::exit() { eu07_application::exit() {
m_network.reset();
SafeDelete( simulation::Train ); SafeDelete( simulation::Train );
SafeDelete( simulation::Region ); SafeDelete( simulation::Region );

1
network/backend/asio.cpp
View File

@@ -11,6 +11,7 @@ network::tcp::connection::connection(asio::io_context &io_ctx, bool client, size
network::tcp::connection::~connection() network::tcp::connection::~connection()
{ {
m_socket.shutdown(m_socket.shutdown_both);
m_socket.close(); m_socket.close();
} }

6
network/network.cpp
View File

@@ -188,13 +188,14 @@ std::tuple<double, double, command_queue::commands_map> network::client::get_nex
consume_counter += speed; consume_counter += speed;
} }
if (size > MAX_BUFFER_SIZE || consume_counter > mult) { float last_rcv_diff = std::chrono::duration_cast<std::chrono::duration<float>>(now - last_rcv).count();
if (size > MAX_BUFFER_SIZE || consume_counter > mult || last_rcv_diff > 3.0f) {
if (consume_counter > mult) { if (consume_counter > mult) {
consume_counter = std::clamp(consume_counter - mult, -MAX_BUFFER_SIZE, MAX_BUFFER_SIZE); consume_counter = std::clamp(consume_counter - mult, -MAX_BUFFER_SIZE, MAX_BUFFER_SIZE);
} }
delta_queue.pop(); delta_queue.pop();
last_update = now;
return std::make_tuple(entry.dt, entry.sync, entry.commands); return std::make_tuple(entry.dt, entry.sync, entry.commands);
} else { } else {
@@ -246,6 +247,7 @@ void network::client::handle_message(std::shared_ptr<connection> conn, const mes
auto delta = dynamic_cast<const frame_info&>(msg); auto delta = dynamic_cast<const frame_info&>(msg);
delta_queue.push(delta); delta_queue.push(delta);
last_rcv = std::chrono::high_resolution_clock::now();
} }
} }

2
network/network.h
View File

@@ -90,7 +90,7 @@ namespace network
float jitteriness = 1.0f; float jitteriness = 1.0f;
float consume_counter = 0.0f; float consume_counter = 0.0f;
std::chrono::high_resolution_clock::time_point last_update; std::chrono::high_resolution_clock::time_point last_rcv;
std::chrono::high_resolution_clock::time_point last_frame; std::chrono::high_resolution_clock::time_point last_frame;
std::chrono::high_resolution_clock::duration frame_time; std::chrono::high_resolution_clock::duration frame_time;