diff --git a/core/script_debugger_local.cpp b/core/script_debugger_local.cpp index b385229c5..b76c85d52 100644 --- a/core/script_debugger_local.cpp +++ b/core/script_debugger_local.cpp @@ -276,9 +276,9 @@ struct _ScriptDebuggerLocalProfileInfoSort { } }; -void ScriptDebuggerLocal::profiling_set_frame_times(float p_frame_time, float p_idle_time, float p_physics_time, float p_physics_frame_time) { +void ScriptDebuggerLocal::profiling_set_frame_times(float p_frame_time, float p_process_time, float p_physics_time, float p_physics_frame_time) { frame_time = p_frame_time; - idle_time = p_idle_time; + process_time = p_process_time; physics_time = p_physics_time; physics_frame_time = p_physics_frame_time; } @@ -338,7 +338,7 @@ void ScriptDebuggerLocal::profiling_start() { pinfo.resize(32768); frame_time = 0; physics_time = 0; - idle_time = 0; + process_time = 0; physics_frame_time = 0; } diff --git a/core/script_debugger_local.h b/core/script_debugger_local.h index 41b582a83..8765a9820 100644 --- a/core/script_debugger_local.h +++ b/core/script_debugger_local.h @@ -35,7 +35,7 @@ class ScriptDebuggerLocal : public ScriptDebugger { bool profiling; - float frame_time, idle_time, physics_time, physics_frame_time; + float frame_time, process_time, physics_time, physics_frame_time; uint64_t idle_accum; String target_function; Map options; @@ -57,7 +57,7 @@ public: virtual void profiling_start(); virtual void profiling_end(); - virtual void profiling_set_frame_times(float p_frame_time, float p_idle_time, float p_physics_time, float p_physics_frame_time); + virtual void profiling_set_frame_times(float p_frame_time, float p_process_time, float p_physics_time, float p_physics_frame_time); ScriptDebuggerLocal(); }; diff --git a/core/script_language.h b/core/script_language.h index bb6b6e1a2..347d2583e 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -461,7 +461,7 @@ public: virtual void add_profiling_frame_data(const StringName &p_name, const Array &p_data) = 0; virtual void profiling_start() = 0; virtual void profiling_end() = 0; - virtual void profiling_set_frame_times(float p_frame_time, float p_idle_time, float p_physics_time, float p_physics_frame_time) = 0; + virtual void profiling_set_frame_times(float p_frame_time, float p_process_time, float p_physics_time, float p_physics_frame_time) = 0; ScriptDebugger(); virtual ~ScriptDebugger() { singleton = nullptr; } diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index a759edd76..a268f520e 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -63,7 +63,7 @@ public: int frame_number; float frame_time; - float idle_time; + float process_time; float physics_time; float physics_frame_time; diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index e50c618ed..1c0001237 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1037,7 +1037,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da metric.valid = true; metric.frame_number = p_data[0]; metric.frame_time = p_data[1]; - metric.idle_time = p_data[2]; + metric.process_time = p_data[2]; metric.physics_time = p_data[3]; metric.physics_frame_time = p_data[4]; int frame_data_amount = p_data[6]; @@ -1060,10 +1060,10 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da frame_time.items.push_back(item); - item.name = "Idle Time"; - item.total = metric.idle_time; + item.name = "Process Time"; + item.total = metric.process_time; item.self = item.total; - item.signature = "idle_time"; + item.signature = "process_time"; frame_time.items.push_back(item); diff --git a/scene/debugger/script_debugger_remote.cpp b/scene/debugger/script_debugger_remote.cpp index 7f837c085..3b7bcd5e9 100644 --- a/scene/debugger/script_debugger_remote.cpp +++ b/scene/debugger/script_debugger_remote.cpp @@ -758,11 +758,11 @@ void ScriptDebuggerRemote::_poll_events() { profiler_function_signature_map.clear(); profiling = true; frame_time = 0; - idle_time = 0; + process_time = 0; physics_time = 0; physics_frame_time = 0; - print_line("PROFILING ALRIGHT!"); + print_verbose("Starting profiling."); } else if (command == "stop_profiling") { for (int i = 0; i < ScriptServer::get_language_count(); i++) { @@ -770,7 +770,7 @@ void ScriptDebuggerRemote::_poll_events() { } profiling = false; _send_profiling_data(false); - print_line("PROFILING END!"); + print_verbose("Ending profiling."); } else if (command == "start_network_profiling") { multiplayer->profiling_start(); profiling_network = true; @@ -877,7 +877,7 @@ void ScriptDebuggerRemote::_send_profiling_data(bool p_for_frame) { packet_peer_stream->put_var(Engine::get_singleton()->get_idle_frames()); //total frame time packet_peer_stream->put_var(frame_time); //total frame time - packet_peer_stream->put_var(idle_time); //idle frame time + packet_peer_stream->put_var(process_time); //idle frame time packet_peer_stream->put_var(physics_time); //fixed frame time packet_peer_stream->put_var(physics_frame_time); //fixed frame time @@ -1164,9 +1164,9 @@ void ScriptDebuggerRemote::profiling_end() { //ignores this, uses it via connection } -void ScriptDebuggerRemote::profiling_set_frame_times(float p_frame_time, float p_idle_time, float p_physics_time, float p_physics_frame_time) { +void ScriptDebuggerRemote::profiling_set_frame_times(float p_frame_time, float p_process_time, float p_physics_time, float p_physics_frame_time) { frame_time = p_frame_time; - idle_time = p_idle_time; + process_time = p_process_time; physics_time = p_physics_time; physics_frame_time = p_physics_frame_time; } diff --git a/scene/debugger/script_debugger_remote.h b/scene/debugger/script_debugger_remote.h index afb86aa73..07ec95e51 100644 --- a/scene/debugger/script_debugger_remote.h +++ b/scene/debugger/script_debugger_remote.h @@ -55,7 +55,7 @@ class ScriptDebuggerRemote : public ScriptDebugger { Vector network_profile_info; Map profiler_function_signature_map; - float frame_time, idle_time, physics_time, physics_frame_time; + float frame_time, process_time, physics_time, physics_frame_time; bool profiling; bool profiling_network; @@ -188,7 +188,7 @@ public: virtual void profiling_start(); virtual void profiling_end(); - virtual void profiling_set_frame_times(float p_frame_time, float p_idle_time, float p_physics_time, float p_physics_frame_time); + virtual void profiling_set_frame_times(float p_frame_time, float p_process_time, float p_physics_time, float p_physics_frame_time); virtual void set_skip_breakpoints(bool p_skip_breakpoints);