birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate profiler categories based on global enum

Browse Source 
(to be supplanted by registered budgets in the future)

Signed-off-by: Jeremy Ong <jcong@amazon.com>
This commit is contained in:
Jeremy Ong
2021-08-17 12:10:57 -06:00
parent d15d40fec6
commit df9b4d4a2f
274 changed files with 1435 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
+4 -4
View File
@@ -706,7 +706,7 @@ namespace ScriptCanvasEditor
bool savedSuccess;
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvasAssetHandler::SaveAssetData");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvasAssetHandler::SaveAssetData");
ScriptCanvasMemoryAsset cloneAsset;
m_sourceAsset->CloneTo(cloneAsset);
@@ -716,14 +716,14 @@ namespace ScriptCanvasEditor
stream.Close();
if (savedSuccess)
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "AssetTracker::SaveAssetPostSourceControl : TempToTargetFileReplacement");
AZ_PROFILE_SCOPE(ScriptCanvas, "AssetTracker::SaveAssetPostSourceControl : TempToTargetFileReplacement");
AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
const bool targetFileExists = fileIO->Exists(m_saveInfo.m_streamName.data());
bool removedTargetFile;
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "AssetTracker::SaveAssetPostSourceControl : TempToTargetFileReplacement : RemoveTarget");
AZ_PROFILE_SCOPE(ScriptCanvas, "AssetTracker::SaveAssetPostSourceControl : TempToTargetFileReplacement : RemoveTarget");
removedTargetFile = fileIO->Remove(m_saveInfo.m_streamName.data());
}
@@ -733,7 +733,7 @@ namespace ScriptCanvasEditor
}
else
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "AssetTracker::SaveAssetPostSourceControl : TempToTargetFileReplacement : RenameTempFile");
AZ_PROFILE_SCOPE(ScriptCanvas, "AssetTracker::SaveAssetPostSourceControl : TempToTargetFileReplacement : RenameTempFile");
AZ::IO::Result renameResult = fileIO->Rename(tempPath.data(), m_saveInfo.m_streamName.data());
if (!renameResult)
{
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.cpp
+2 -2
View File
@@ -103,7 +103,7 @@ namespace ScriptCanvasEditor
void UndoHelper::Undo()
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SceneUndoState* sceneUndoState = m_memoryAsset.GetUndoState();
if (sceneUndoState)
@@ -123,7 +123,7 @@ namespace ScriptCanvasEditor
void UndoHelper::Redo()
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SceneUndoState* sceneUndoState = m_memoryAsset.GetUndoState();
if (sceneUndoState)
Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp
+11 -11
View File
@@ -99,7 +99,7 @@ namespace ScriptCanvasEditor::Nodes
AZStd::pair<ScriptCanvas::Node*, NodeIdPair> CreateAndGetNode(const AZ::Uuid& classId, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, const StyleConfiguration& styleConfiguration, AZStd::function<void(ScriptCanvas::Node*)> onCreateCallback)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIdPair;
ScriptCanvas::Node* node{};
@@ -134,7 +134,7 @@ namespace ScriptCanvasEditor::Nodes
NodeIdPair CreateObjectMethodNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, ScriptCanvas::PropertyStatus propertyStatus)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIds;
ScriptCanvas::Node* node = nullptr;
@@ -161,7 +161,7 @@ namespace ScriptCanvasEditor::Nodes
NodeIdPair CreateObjectMethodOverloadNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasGraphId)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIds;
ScriptCanvas::Node* node = nullptr;
@@ -188,7 +188,7 @@ namespace ScriptCanvasEditor::Nodes
NodeIdPair CreateGlobalMethodNode(AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIds;
ScriptCanvas::Node* node = nullptr;
@@ -215,7 +215,7 @@ namespace ScriptCanvasEditor::Nodes
NodeIdPair CreateEbusWrapperNode(AZStd::string_view busName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIdPair;
ScriptCanvas::Node* node = nullptr;
@@ -241,7 +241,7 @@ namespace ScriptCanvasEditor::Nodes
{
AZ_Assert(assetId.IsValid(), "CreateScriptEventReceiverNode asset Id must be valid");
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIdPair;
AZ::Data::Asset<ScriptEvents::ScriptEventsAsset> asset = AZ::Data::AssetManager::Instance().GetAsset<ScriptEvents::ScriptEventsAsset>(assetId, AZ::Data::AssetLoadBehavior::Default);
@@ -276,7 +276,7 @@ namespace ScriptCanvasEditor::Nodes
{
AZ_Assert(assetId.IsValid(), "CreateScriptEventSenderNode asset Id must be valid");
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIdPair;
AZ::Data::Asset<ScriptEvents::ScriptEventsAsset> asset = AZ::Data::AssetManager::Instance().GetAsset<ScriptEvents::ScriptEventsAsset>(assetId, AZ::Data::AssetLoadBehavior::Default);
@@ -302,7 +302,7 @@ namespace ScriptCanvasEditor::Nodes
NodeIdPair CreateGetVariableNode(const ScriptCanvas::VariableId& variableId, ScriptCanvas::ScriptCanvasId scriptCanvasId)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
const AZ::Uuid k_VariableNodeTypeId = azrtti_typeid<ScriptCanvas::Nodes::Core::GetVariableNode>();
NodeIdPair nodeIds;
@@ -333,7 +333,7 @@ namespace ScriptCanvasEditor::Nodes
NodeIdPair CreateSetVariableNode(const ScriptCanvas::VariableId& variableId, ScriptCanvas::ScriptCanvasId scriptCanvasId)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
const AZ::Uuid k_VariableNodeTypeId = azrtti_typeid<ScriptCanvas::Nodes::Core::SetVariableNode>();
NodeIdPair nodeIds;
@@ -366,7 +366,7 @@ namespace ScriptCanvasEditor::Nodes
{
AZ_Assert(assetId.IsValid(), "CreateFunctionNode source asset Id must be valid");
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIdPair;
AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset> asset = AZ::Data::AssetManager::Instance().GetAsset<ScriptCanvas::SubgraphInterfaceAsset>(assetId, AZ::Data::AssetLoadBehavior::PreLoad);
@@ -394,7 +394,7 @@ namespace ScriptCanvasEditor::Nodes
NodeIdPair CreateAzEventHandlerNode(const AZ::BehaviorMethod& methodWithAzEventReturn, ScriptCanvas::ScriptCanvasId scriptCanvasId,
AZ::EntityId connectingMethodNodeId)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeIdPair nodeIdPair;
// Make sure the method returns an AZ::Event by reference or pointer
Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
+10 -10
View File
@@ -57,7 +57,7 @@ namespace ScriptCanvasEditor::Nodes
// Handles the creation of a node through the node configurations for most nodes.
AZ::EntityId DisplayGeneralScriptCanvasNode(AZ::EntityId, const ScriptCanvas::Node* node, const NodeConfiguration& nodeConfiguration)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
AZ::Entity* graphCanvasEntity = nullptr;
@@ -445,7 +445,7 @@ namespace ScriptCanvasEditor::Nodes
AZ::EntityId DisplayEbusEventNode(AZ::EntityId, const AZStd::string& busName, const AZStd::string& eventName, const ScriptCanvas::EBusEventId& eventId)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
AZ::EntityId graphCanvasNodeId;
@@ -668,7 +668,7 @@ namespace ScriptCanvasEditor::Nodes
AZ::EntityId DisplayScriptEventNode(AZ::EntityId, const AZ::Data::AssetId assetId, const ScriptEvents::Method& methodDefinition)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
AZ::EntityId graphCanvasNodeId;
@@ -1001,7 +1001,7 @@ namespace ScriptCanvasEditor::Nodes
AZ::EntityId DisplayGetVariableNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Nodes::Core::GetVariableNode* variableNode)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeConfiguration nodeConfiguration;
nodeConfiguration.PopulateComponentDescriptors<IconComponent, DynamicSlotComponent, GetVariableNodeDescriptorComponent>();
@@ -1033,7 +1033,7 @@ namespace ScriptCanvasEditor::Nodes
AZ::EntityId DisplaySetVariableNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Nodes::Core::SetVariableNode* variableNode)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
NodeConfiguration nodeConfiguration;
nodeConfiguration.PopulateComponentDescriptors<IconComponent, DynamicSlotComponent, SetVariableNodeDescriptorComponent>();
@@ -1069,7 +1069,7 @@ namespace ScriptCanvasEditor::Nodes
///////////////////
AZ::EntityId DisplayScriptCanvasNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Node* node)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
AZ::EntityId graphCanvasNodeId;
if (azrtti_istypeof<ScriptCanvas::Nodes::Core::SetVariableNode>(node))
@@ -1122,7 +1122,7 @@ namespace ScriptCanvasEditor::Nodes
static void RegisterAndActivateGraphCanvasSlot(AZ::EntityId graphCanvasNodeId, const ScriptCanvas::SlotId& slotId, AZ::Entity* slotEntity)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
if (slotEntity)
{
slotEntity->Init();
@@ -1166,7 +1166,7 @@ namespace ScriptCanvasEditor::Nodes
return AZ::EntityId();
}
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
AZ::Entity* slotEntity = nullptr;
AZ::Uuid typeId = ScriptCanvas::Data::ToAZType(slot.GetDataType());
@@ -1258,7 +1258,7 @@ namespace ScriptCanvasEditor::Nodes::SlotDisplayHelper
{
AZ::EntityId DisplayPropertySlot(AZ::EntityId graphCanvasNodeId, const ScriptCanvas::VisualExtensionSlotConfiguration& propertyConfiguration)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
GraphCanvas::SlotConfiguration graphCanvasConfiguration;
@@ -1284,7 +1284,7 @@ namespace ScriptCanvasEditor::Nodes::SlotDisplayHelper
AZ::EntityId DisplayExtendableSlot(AZ::EntityId graphCanvasNodeId, const ScriptCanvas::VisualExtensionSlotConfiguration& extenderConfiguration)
{
AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
AZ_PROFILE_SCOPE("ScriptCanvas", __FUNCTION__);
GraphCanvas::ExtenderSlotConfiguration graphCanvasConfiguration;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ namespace ScriptCanvas
void EBusHandler::OnEventGenericHook(void* userData, const char* eventName, int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters)
{
AZ_UNUSED(eventName);
AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "EBusEventHandler::OnEvent %s", eventName);
AZ_PROFILE_SCOPE(ScriptCanvas, "EBusEventHandler::OnEvent %s", eventName);
auto handler = reinterpret_cast<EBusHandler*>(userData);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(handler->GetScriptCanvasId(), handler->GetAssetId());
handler->OnEvent(nullptr, eventIndex, result, numParameters, parameters);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
+20 -20
View File
@@ -1022,7 +1022,7 @@ namespace ScriptCanvas
void Node::SetToDefaultValueOfType(const SlotId& slotId)
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::SetToDefaultValueOfType");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::SetToDefaultValueOfType");
Slot* slot = GetSlot(slotId);
@@ -1616,7 +1616,7 @@ namespace ScriptCanvas
Data::Type Node::GetSlotDataType(const SlotId& slotId) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetSlotDataType");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetSlotDataType");
const auto* slot = GetSlot(slotId);
@@ -1631,7 +1631,7 @@ namespace ScriptCanvas
VariableId Node::GetSlotVariableId(const SlotId& slotId) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetSlotVariableId");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetSlotVariableId");
Slot* slot = GetSlot(slotId);
@@ -1645,7 +1645,7 @@ namespace ScriptCanvas
void Node::SetSlotVariableId(const SlotId& slotId, const VariableId& variableId)
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::SetSlotVariableId");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::SetSlotVariableId");
Slot* slot = GetSlot(slotId);
@@ -1664,7 +1664,7 @@ namespace ScriptCanvas
void Node::ClearSlotVariableId(const SlotId& slotId)
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::ResetSlotVariableId");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::ResetSlotVariableId");
SetSlotVariableId(slotId, VariableId());
}
@@ -1861,7 +1861,7 @@ namespace ScriptCanvas
AZStd::vector<const Slot*> Node::GetAllSlotsByDescriptor(const SlotDescriptor& slotDescriptor, bool allowLatentSlots) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetSlotsByType");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetSlotsByType");
AZStd::vector<const Slot*> slots;
@@ -1879,7 +1879,7 @@ namespace ScriptCanvas
AZStd::vector<Endpoint> Node::GetAllEndpointsByDescriptor(const SlotDescriptor& slotDescriptor, bool allowLatentSlots) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetEndpointsByType");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetEndpointsByType");
AZStd::vector<Endpoint> endpoints;
@@ -1898,7 +1898,7 @@ namespace ScriptCanvas
AZStd::vector<SlotId> Node::GetSlotIds(AZStd::string_view slotName) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetSlotIds");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetSlotIds");
auto nameSlotRange = m_slotNameMap.equal_range(slotName);
AZStd::vector<SlotId> result;
@@ -1911,7 +1911,7 @@ namespace ScriptCanvas
Slot* Node::GetSlot(const SlotId& slotId) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetSlot");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetSlot");
if (slotId.IsValid())
{
@@ -1994,7 +1994,7 @@ namespace ScriptCanvas
AZStd::vector<const Slot*> Node::GetAllSlots() const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetAllSlots");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetAllSlots");
const SlotList& slots = GetSlots();
@@ -2011,7 +2011,7 @@ namespace ScriptCanvas
AZStd::vector<Slot*> Node::ModAllSlots()
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::ModAllSlots");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::ModAllSlots");
SlotList& slots = GetSlots();
@@ -2408,7 +2408,7 @@ namespace ScriptCanvas
NodePtrConstList Node::FindConnectedNodesByDescriptor(const SlotDescriptor& slotDescriptor, bool followLatentConnections) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetConnectedNodesByType");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetConnectedNodesByType");
NodePtrConstList connectedNodes;
@@ -2427,7 +2427,7 @@ namespace ScriptCanvas
AZStd::vector<AZStd::pair<const Node*, SlotId>> Node::FindConnectedNodesAndSlotsByDescriptor(const SlotDescriptor& slotDescriptor, bool followLatentConnections) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetConnectedNodesAndSlotsByType");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetConnectedNodesAndSlotsByType");
AZStd::vector<AZStd::pair<const Node*, SlotId>> connectedNodes;
@@ -2593,7 +2593,7 @@ namespace ScriptCanvas
void Node::OnDatumEdited(const Datum* datum)
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::OnDatumChanged");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::OnDatumChanged");
SlotId slotId;
@@ -2788,7 +2788,7 @@ namespace ScriptCanvas
SlotId Node::FindSlotIdForDescriptor(AZStd::string_view slotName, const SlotDescriptor& descriptor) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::FindSlotIdForDescriptor");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::FindSlotIdForDescriptor");
auto slotNameRange = m_slotNameMap.equal_range(slotName);
auto nameSlotIt = AZStd::find_if(slotNameRange.first, slotNameRange.second, [descriptor](const AZStd::pair<AZStd::string, SlotIterator>& nameSlotPair)
@@ -2801,7 +2801,7 @@ namespace ScriptCanvas
int Node::FindSlotIndex(const SlotId& slotId) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::FindSlotIndex");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::FindSlotIndex");
auto slotIdIter = m_slotIdIteratorCache.find(slotId);
@@ -2816,7 +2816,7 @@ namespace ScriptCanvas
bool Node::IsConnected(const Slot& slot) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::IsConnected");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::IsConnected");
return slot.IsVariableReference() || m_graphRequestBus->IsEndpointConnected(slot.GetEndpoint());
}
@@ -2862,7 +2862,7 @@ namespace ScriptCanvas
EndpointsResolved Node::GetConnectedNodes(const Slot& slot) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetConnectedNodes");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetConnectedNodes");
EndpointsResolved connectedNodes;
@@ -2906,7 +2906,7 @@ namespace ScriptCanvas
AZStd::vector<AZStd::pair<Node*, const SlotId>> Node::ModConnectedNodes(const Slot& slot) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::ModConnectedNodes");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::ModConnectedNodes");
AZStd::vector<AZStd::pair<Node*, const SlotId>> connectedNodes;
ModConnectedNodes(slot, connectedNodes);
return connectedNodes;
@@ -3481,7 +3481,7 @@ namespace ScriptCanvas
AZStd::vector<const Slot*> Node::GetSlotsByType(CombinedSlotType slotType) const
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::GetSlotsByType");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::Node::GetSlotsByType");
AZStd::vector<const Slot*> slots;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ namespace ScriptCanvas
void RuntimeComponent::Execute()
{
AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "RuntimeComponent::Execute (%s)", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
AZ_PROFILE_SCOPE(ScriptCanvas, "RuntimeComponent::Execute (%s)", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
AZ_Assert(m_executionState, "RuntimeComponent::Execute called without an execution state");
SC_EXECUTION_TRACE_GRAPH_ACTIVATED(CreateActivationInfo());
SCRIPT_CANVAS_PERFORMANCE_SCOPE_EXECUTION(m_executionState->GetScriptCanvasId(), m_runtimeOverrides.m_runtimeAsset.GetId());
@@ -117,7 +117,7 @@ namespace ScriptCanvas
AZ_Assert(m_runtimeAsset.Get(), "RuntimeComponent::m_runtimeAsset AssetId: %s was valid, but the data was not pre-loaded, so this script will not run", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
#endif
AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "RuntimeComponent::InitializeExecution (%s)", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
AZ_PROFILE_SCOPE(ScriptCanvas, "RuntimeComponent::InitializeExecution (%s)", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
SCRIPT_CANVAS_PERFORMANCE_SCOPE_INITIALIZATION(m_scriptCanvasId, m_runtimeOverrides.m_runtimeAsset.GetId());
m_executionState = ExecutionState::Create(ExecutionStateConfig(m_runtimeOverrides.m_runtimeAsset, *this));
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ namespace ScriptCanvas
void BaseTimer::OnTick(float delta, AZ::ScriptTimePoint)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(GetScriptCanvasId(), GetAssetId());
switch (m_timeUnits)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp
+1 -1
View File
@@ -191,7 +191,7 @@ namespace ScriptCanvas
AZStd::string StringFormatted::ProcessFormat()
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::StringFormatted::ProcessFormat");
AZ_PROFILE_SCOPE(ScriptCanvas, "ScriptCanvas::StringFormatted::ProcessFormat");
AZStd::string text;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ namespace ScriptCanvas
void OperatorMul::Operator(Data::eType type, const ArithmeticOperands& operands, Datum& result)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
switch (type)
{
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ namespace ScriptCanvas
void DelayNodeable::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(GetScriptCanvasId(), GetAssetId());
m_currentTime -= static_cast<float>(deltaTime);
if (m_currentTime <= 0.f)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ namespace ScriptCanvas
void DurationNodeable::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(GetScriptCanvasId(), GetAssetId());
if (m_elapsedTime <= m_duration)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ namespace ScriptCanvas
{
void TimerNodeable::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint time)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(GetScriptCanvasId(), GetAssetId());
double milliseconds = time.GetMilliseconds() - m_start.GetMilliseconds();
double seconds = time.GetSeconds() - m_start.GetSeconds();