GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add automatic profiler events for Visual Script methods invocation

Browse Source
This commit is contained in:
Wojtek Figat
2021-05-04 00:30:49 +02:00
parent e4de83f2ed
commit 2c51f79c0a
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Engine/Content/Assets/VisualScript.cpp
View File

@@ -17,6 +17,7 @@
#include "Engine/Serialization/MemoryWriteStream.h" #include "Engine/Serialization/MemoryWriteStream.h"
#include "Engine/Serialization/Serialization.h" #include "Engine/Serialization/Serialization.h"
#include "Engine/Serialization/JsonWriter.h" #include "Engine/Serialization/JsonWriter.h"
#include "Engine/Profiler/ProfilerCPU.h"
#include "Engine/Utilities/StringConverter.h" #include "Engine/Utilities/StringConverter.h"
#include "FlaxEngine.Gen.h" #include "FlaxEngine.Gen.h"
@@ -1329,6 +1330,7 @@ Asset::LoadResult VisualScript::load()
{ {
case GRAPH_NODE_MAKE_TYPE(16, 3): case GRAPH_NODE_MAKE_TYPE(16, 3):
{ {
// Override method
auto& method = _methods.AddOne(); auto& method = _methods.AddOne();
method.Script = this; method.Script = this;
method.Node = &node; method.Node = &node;
@@ -1342,6 +1344,7 @@ Asset::LoadResult VisualScript::load()
} }
case GRAPH_NODE_MAKE_TYPE(16, 6): case GRAPH_NODE_MAKE_TYPE(16, 6):
{ {
// Function
auto& method = _methods.AddOne(); auto& method = _methods.AddOne();
method.Script = this; method.Script = this;
method.Node = &node; method.Node = &node;
@@ -1380,6 +1383,17 @@ Asset::LoadResult VisualScript::load()
} }
} }
} }
#if COMPILE_WITH_PROFILER
for (auto& method : _methods)
{
const StringView assetName(StringUtils::GetFileNameWithoutExtension(GetPath()));
method.ProfilerName.Resize(assetName.Length() + 2 + method.Name.Length());
StringUtils::ConvertUTF162ANSI(assetName.Get(), method.ProfilerName.Get(), assetName.Length());
method.ProfilerName.Get()[assetName.Length()] = ':';
method.ProfilerName.Get()[assetName.Length() + 1] = ':';
Platform::MemoryCopy(method.ProfilerName.Get() + assetName.Length() + 2, method.Name.Get(), method.Name.Length());
}
#endif
// Setup fields list // Setup fields list
_fields.Resize(Graph.Parameters.Count()); _fields.Resize(Graph.Parameters.Count());
@@ -2284,6 +2298,7 @@ VisualScriptingBinaryModule* VisualScripting::GetBinaryModule()
Variant VisualScripting::Invoke(VisualScript::Method* method, ScriptingObject* instance, Span<Variant> parameters) Variant VisualScripting::Invoke(VisualScript::Method* method, ScriptingObject* instance, Span<Variant> parameters)
{ {
CHECK_RETURN(method && method->Script->IsLoaded(), Variant::Zero); CHECK_RETURN(method && method->Script->IsLoaded(), Variant::Zero);
PROFILE_CPU_NAMED(*method->ProfilerName);
// Add to the calling stack // Add to the calling stack
ScopeContext scope; ScopeContext scope;

3
Source/Engine/Content/Assets/VisualScript.h
View File

@@ -115,6 +115,9 @@ public:
MethodFlags MethodFlags; MethodFlags MethodFlags;
ScriptingTypeMethodSignature Signature; ScriptingTypeMethodSignature Signature;
Array<StringAnsi, InlinedAllocation<16>> ParamNames; Array<StringAnsi, InlinedAllocation<16>> ParamNames;
#if COMPILE_WITH_PROFILER
StringAnsi ProfilerName;
#endif
}; };
struct Field struct Field