Skip to content

Commit 9406e21

Browse files
AndreaCataniaAndreaCatania
committed
Removed legacy code.
1 parent 203482b commit 9406e21

4 files changed

Lines changed: 32 additions & 54 deletions

File tree

‎core/scene_synchronizer_debugger.cpp‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -469,24 +469,6 @@ void SceneSynchronizerDebugger::notify_are_inputs_different_result(
469469
#endif
470470
}
471471

472-
void SceneSynchronizerDebugger::debug_print(NS::NetworkInterface *p_network_interface, const String &p_message, bool p_silent) {
473-
#ifdef DEBUG_ENABLED
474-
print(
475-
NS::PrintMessageType::INFO,
476-
std::string(p_message.utf8()),
477-
p_network_interface ? p_network_interface->get_owner_name() : "GLOBAL");
478-
#endif
479-
}
480-
481-
void SceneSynchronizerDebugger::debug_warning(NS::NetworkInterface *p_network_interface, const String &p_message, bool p_silent) {
482-
#ifdef DEBUG_ENABLED
483-
print(
484-
NS::PrintMessageType::WARNING,
485-
std::string(p_message.utf8()),
486-
p_network_interface ? p_network_interface->get_owner_name() : "GLOBAL");
487-
#endif
488-
}
489-
490472
void SceneSynchronizerDebugger::print(NS::PrintMessageType p_level, const std::string &p_message, const std::string &p_object_name, bool p_force_print_to_log) {
491473
#ifdef DEBUG_ENABLED
492474

‎core/scene_synchronizer_debugger.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ class SceneSynchronizerDebugger {
114114
void notify_input_sent_to_server(int p_peer, uint32_t p_frame_index, uint32_t p_input_index);
115115
void notify_are_inputs_different_result(int p_peer, uint32_t p_other_frame_index, bool p_is_similar);
116116

117-
void debug_print(NS::NetworkInterface *p_network_interface, const String &p_message, bool p_silent = false);
118-
void debug_warning(NS::NetworkInterface *p_network_interface, const String &p_message, bool p_silent = false);
119-
120117
void print(
121118
NS::PrintMessageType p_level,
122119
const std::string &p_message,

‎register_types.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ void initialize_network_synchronizer_module(ModuleInitializationLevel p_level) {
8383
GLOBAL_DEF("NetworkSynchronizer/log_debug_nodes_relevancy_update", false);
8484
GLOBAL_DEF("NetworkSynchronizer/debugger/dump_enabled", false);
8585
GLOBAL_DEF("NetworkSynchronizer/debugger/dump_classes", Array());
86-
GLOBAL_DEF("NetworkSynchronizer/debugger/log_debug_fps_warnings", true);
8786
} else if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
8887
#ifdef DEBUG_ENABLED
8988
List<String> args = OS::get_singleton()->get_cmdline_args();

‎scene_synchronizer.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ void NoNetSynchronizer::process(double p_delta) {
16431643

16441644
const int sub_process_count = fetch_sub_processes_count(p_delta);
16451645
for (int i = 0; i < sub_process_count; i++) {
1646-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "NoNetSynchronizer::process", true);
1646+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "NoNetSynchronizer::process", scene_synchronizer->get_network_interface().get_owner_name());
16471647

16481648
const uint32_t frame_index = frame_count;
16491649
frame_count += 1;
@@ -1709,7 +1709,7 @@ void ServerSynchronizer::clear() {
17091709
}
17101710

17111711
void ServerSynchronizer::process(double p_delta) {
1712-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "ServerSynchronizer::process", true);
1712+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "ServerSynchronizer::process", scene_synchronizer->get_network_interface().get_owner_name());
17131713

17141714
if (objects_relevancy_update_timer >= scene_synchronizer->objects_relevancy_update_time) {
17151715
scene_synchronizer->update_objects_relevancy();
@@ -1972,37 +1972,38 @@ uint64_t ServerSynchronizer::sync_group_get_user_data(SyncGroupId p_group_id) co
19721972
}
19731973

19741974
void ServerSynchronizer::sync_group_debug_print() {
1975-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "");
1976-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "|-----------------------");
1977-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| Sync groups");
1978-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "|-----------------------");
1975+
SceneSynchronizerDebugger::singleton()->print(INFO, "ServerSynchronizer::process", scene_synchronizer->get_network_interface().get_owner_name());
1976+
SceneSynchronizerDebugger::singleton()->print(INFO, "", scene_synchronizer->get_network_interface().get_owner_name());
1977+
SceneSynchronizerDebugger::singleton()->print(INFO, "|-----------------------", scene_synchronizer->get_network_interface().get_owner_name());
1978+
SceneSynchronizerDebugger::singleton()->print(INFO, "| Sync groups", scene_synchronizer->get_network_interface().get_owner_name());
1979+
SceneSynchronizerDebugger::singleton()->print(INFO, "|-----------------------", scene_synchronizer->get_network_interface().get_owner_name());
19791980

19801981
for (int g = 0; g < int(sync_groups.size()); ++g) {
19811982
NS::SyncGroup &group = sync_groups[g];
19821983

1983-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| [Group " + itos(g) + "#]");
1984-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| Listening peers");
1984+
SceneSynchronizerDebugger::singleton()->print(INFO, "| [Group " + std::to_string(g) + "#]", scene_synchronizer->get_network_interface().get_owner_name());
1985+
SceneSynchronizerDebugger::singleton()->print(INFO, "| Listening peers", scene_synchronizer->get_network_interface().get_owner_name());
19851986
for (int peer : group.get_listening_peers()) {
1986-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| |- " + itos(peer));
1987+
SceneSynchronizerDebugger::singleton()->print(INFO, "| |- " + std::to_string(peer), scene_synchronizer->get_network_interface().get_owner_name());
19871988
}
19881989

19891990
const LocalVector<NS::SyncGroup::SimulatedObjectInfo> &realtime_node_info = group.get_simulated_sync_objects();
1990-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "|");
1991-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| [Realtime nodes]");
1991+
SceneSynchronizerDebugger::singleton()->print(INFO, "|", scene_synchronizer->get_network_interface().get_owner_name());
1992+
SceneSynchronizerDebugger::singleton()->print(INFO, "| [Realtime nodes]", scene_synchronizer->get_network_interface().get_owner_name());
19921993
for (auto info : realtime_node_info) {
1993-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| |- " + String(info.od->object_name.c_str()));
1994+
SceneSynchronizerDebugger::singleton()->print(INFO, "| |- " + info.od->object_name, scene_synchronizer->get_network_interface().get_owner_name());
19941995
}
19951996

1996-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "|");
1997+
SceneSynchronizerDebugger::singleton()->print(INFO, "|", scene_synchronizer->get_network_interface().get_owner_name());
19971998

19981999
const LocalVector<NS::SyncGroup::TrickledObjectInfo> &trickled_node_info = group.get_trickled_sync_objects();
1999-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| [Trickled nodes (UR: Update Rate)]");
2000+
SceneSynchronizerDebugger::singleton()->print(INFO, "| [Trickled nodes (UR: Update Rate)]", scene_synchronizer->get_network_interface().get_owner_name());
20002001
for (auto info : trickled_node_info) {
2001-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "| |- [UR: " + rtos(info.update_rate) + "] " + info.od->object_name.c_str());
2002+
SceneSynchronizerDebugger::singleton()->print(INFO, "| |- [UR: " + std::to_string(info.update_rate) + "] " + info.od->object_name.c_str(), scene_synchronizer->get_network_interface().get_owner_name());
20022003
}
20032004
}
2004-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "|-----------------------");
2005-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "");
2005+
SceneSynchronizerDebugger::singleton()->print(INFO, "|-----------------------", scene_synchronizer->get_network_interface().get_owner_name());
2006+
SceneSynchronizerDebugger::singleton()->print(INFO, "", scene_synchronizer->get_network_interface().get_owner_name());
20062007
}
20072008

20082009
// This function MUST be processed with a fixed delta time.
@@ -2487,12 +2488,11 @@ void ClientSynchronizer::clear() {
24872488
void ClientSynchronizer::process(double p_delta) {
24882489
NS_PROFILE
24892490

2490-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "ClientSynchronizer::process", true);
2491+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "ClientSynchronizer::process", scene_synchronizer->get_network_interface().get_owner_name());
24912492

24922493
#ifdef DEBUG_ENABLED
24932494
if make_unlikely (p_delta > (scene_synchronizer->get_fixed_frame_delta() + (scene_synchronizer->get_fixed_frame_delta() * 0.2))) {
2494-
const bool silent = !ProjectSettings::get_singleton()->get_setting("NetworkSynchronizer/debugger/log_debug_fps_warnings");
2495-
SceneSynchronizerDebugger::singleton()->debug_warning(&scene_synchronizer->get_network_interface(), "Current FPS is " + itos(Engine::get_singleton()->get_frames_per_second()) + ", but the minimum required FPS is " + itos(scene_synchronizer->get_frames_per_seconds()) + ", the client is unable to generate enough inputs for the server.", silent);
2495+
SceneSynchronizerDebugger::singleton()->print(WARNING, "Current FPS is " + std::to_string(p_delta > 0.0001 ? 1.0 / p_delta : 0.0) + ", but the minimum required FPS is " + std::to_string(scene_synchronizer->get_frames_per_seconds()) + ", the client is unable to generate enough inputs for the server.", scene_synchronizer->get_network_interface().get_owner_name());
24962496
}
24972497
#endif
24982498

@@ -2518,7 +2518,7 @@ void ClientSynchronizer::receive_snapshot(DataBuffer &p_snapshot) {
25182518
// incremental update so the last received data is always needed to fully
25192519
// reconstruct it.
25202520

2521-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "The Client received the server snapshot.", true);
2521+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "The Client received the server snapshot.", scene_synchronizer->get_network_interface().get_owner_name());
25222522

25232523
// Parse server snapshot.
25242524
const bool success = parse_snapshot(p_snapshot);
@@ -2630,13 +2630,13 @@ void ClientSynchronizer::store_controllers_snapshot(
26302630
// Put the parsed snapshot into the queue.
26312631

26322632
if (p_snapshot.input_id == FrameIndex::NONE) {
2633-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "The Client received the server snapshot WITHOUT `input_id`.", true);
2633+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "The Client received the server snapshot WITHOUT `input_id`.", scene_synchronizer->get_network_interface().get_owner_name());
26342634
// The controller node is not registered so just assume this snapshot is the most up-to-date.
26352635
last_received_server_snapshot.emplace(Snapshot::make_copy(p_snapshot));
26362636
last_received_server_snapshot_index = p_snapshot.input_id;
26372637

26382638
} else {
2639-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "The Client received the server snapshot: " + uitos(p_snapshot.input_id.id), true);
2639+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "The Client received the server snapshot: " + p_snapshot.input_id, scene_synchronizer->get_network_interface().get_owner_name());
26402640
ENSURE_MSG(
26412641
last_received_server_snapshot_index == FrameIndex::NONE ||
26422642
last_received_server_snapshot_index <= p_snapshot.input_id,
@@ -2667,7 +2667,7 @@ void ClientSynchronizer::process_received_server_state() {
26672667

26682668
if (last_received_server_snapshot->input_id == FrameIndex::NONE) {
26692669
// The server last received snapshot is a no input snapshot. Just assume it's the most up-to-date.
2670-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "The client received a \"no input\" snapshot, so the client is setting it right away assuming is the most updated one.", true);
2670+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "The client received a \"no input\" snapshot, so the client is setting it right away assuming is the most updated one.", scene_synchronizer->get_network_interface().get_owner_name());
26712671

26722672
apply_snapshot(*last_received_server_snapshot, NetEventFlag::SYNC_RECOVER, 0, nullptr);
26732673
last_received_server_snapshot.reset();
@@ -3119,15 +3119,15 @@ void ClientSynchronizer::process_simulation(double p_delta) {
31193119
#endif
31203120

31213121
if (sub_ticks == 0) {
3122-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "No sub ticks: this is not bu a bug; it's the lag compensation algorithm.", true);
3122+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "No sub ticks: this is not bu a bug; it's the lag compensation algorithm.", scene_synchronizer->get_network_interface().get_owner_name());
31233123
}
31243124

31253125
while (sub_ticks > 0) {
31263126
#ifdef NS_PROFILING_ENABLED
31273127
std::string sub_perf_info = "Fixed delta: " + std::to_string(scene_synchronizer->get_fixed_frame_delta()) + " remaining ticks: " + std::to_string(sub_ticks);
31283128
NS_PROFILE_NAMED_WITH_INFO("PROCESS", sub_perf_info)
31293129
#endif
3130-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "ClientSynchronizer::process::sub_process " + itos(sub_ticks), true);
3130+
SceneSynchronizerDebugger::singleton()->print(VERBOSE, "ClientSynchronizer::process::sub_process " + std::to_string(sub_ticks), scene_synchronizer->get_network_interface().get_owner_name());
31313131
SceneSynchronizerDebugger::singleton()->scene_sync_process_start(scene_synchronizer);
31323132

31333133
// Process the scene.
@@ -3417,21 +3417,21 @@ void ClientSynchronizer::receive_trickled_sync_data(const Vector<uint8_t> &p_dat
34173417
}
34183418

34193419
// Fetch the `node_id`.
3420-
ObjectNetId node_id = ObjectNetId::NONE;
3420+
ObjectNetId object_id = ObjectNetId::NONE;
34213421
if (future_epoch_buffer.read_bool()) {
34223422
remaining_size = future_epoch_buffer.size() - future_epoch_buffer.get_bit_offset();
34233423
if (remaining_size < future_epoch_buffer.get_uint_size(DataBuffer::COMPRESSION_LEVEL_2)) {
34243424
// buffer entirely consumed, nothing else to do.
34253425
break;
34263426
}
34273427

3428-
node_id.id = future_epoch_buffer.read_uint(DataBuffer::COMPRESSION_LEVEL_2);
3428+
object_id.id = future_epoch_buffer.read_uint(DataBuffer::COMPRESSION_LEVEL_2);
34293429
} else {
34303430
if (remaining_size < future_epoch_buffer.get_uint_size(DataBuffer::COMPRESSION_LEVEL_3)) {
34313431
// buffer entirely consumed, nothing else to do.
34323432
break;
34333433
}
3434-
node_id.id = future_epoch_buffer.read_uint(DataBuffer::COMPRESSION_LEVEL_3);
3434+
object_id.id = future_epoch_buffer.read_uint(DataBuffer::COMPRESSION_LEVEL_3);
34353435
}
34363436

34373437
remaining_size = future_epoch_buffer.size() - future_epoch_buffer.get_bit_offset();
@@ -3443,16 +3443,16 @@ void ClientSynchronizer::receive_trickled_sync_data(const Vector<uint8_t> &p_dat
34433443

34443444
remaining_size = future_epoch_buffer.size() - future_epoch_buffer.get_bit_offset();
34453445
if (remaining_size < buffer_bit_count) {
3446-
SceneSynchronizerDebugger::singleton()->print(ERROR, "The function `receive_trickled_sync_data` failed applying the epoch because the received buffer is malformed. The node with ID `" + node_id + "` reported that the sub buffer size is `" + std::to_string(buffer_bit_count) + "` but the main-buffer doesn't have so many bits.", scene_synchronizer->get_network_interface().get_owner_name());
3446+
SceneSynchronizerDebugger::singleton()->print(ERROR, "The function `receive_trickled_sync_data` failed applying the epoch because the received buffer is malformed. The node with ID `" + object_id + "` reported that the sub buffer size is `" + std::to_string(buffer_bit_count) + "` but the main-buffer doesn't have so many bits.", scene_synchronizer->get_network_interface().get_owner_name());
34473447
break;
34483448
}
34493449

34503450
const int current_offset = future_epoch_buffer.get_bit_offset();
34513451
const int expected_bit_offset_after_apply = current_offset + buffer_bit_count;
34523452

3453-
NS::ObjectData *od = scene_synchronizer->get_object_data(node_id, false);
3453+
NS::ObjectData *od = scene_synchronizer->get_object_data(object_id, false);
34543454
if (od == nullptr) {
3455-
SceneSynchronizerDebugger::singleton()->debug_print(&scene_synchronizer->get_network_interface(), "The function `receive_trickled_sync_data` is skiplatency the node with ID `" + itos(node_id.id) + "` as it was not found locally.");
3455+
SceneSynchronizerDebugger::singleton()->print(INFO, "The function `receive_trickled_sync_data` is skiplatency the node with ID `" + object_id + "` as it was not found locally.", scene_synchronizer->get_network_interface().get_owner_name());
34563456
future_epoch_buffer.seek(expected_bit_offset_after_apply);
34573457
continue;
34583458
}

0 commit comments

Comments
 (0)