[Bf-blender-cvs] [b9d8f34e355] profiler-editor: deduplicate code
Jacques Lucke
noreply at git.blender.org
Thu Apr 29 11:30:50 CEST 2021
Commit: b9d8f34e355ef34f65db9ac44bd0ae0b24c2fa93
Author: Jacques Lucke
Date: Thu Apr 29 10:55:03 2021 +0200
Branches: profiler-editor
https://developer.blender.org/rBb9d8f34e355ef34f65db9ac44bd0ae0b24c2fa93
deduplicate code
===================================================================
M source/blender/blenlib/intern/profile.cc
===================================================================
diff --git a/source/blender/blenlib/intern/profile.cc b/source/blender/blenlib/intern/profile.cc
index 53a54085106..c8ff6130729 100644
--- a/source/blender/blenlib/intern/profile.cc
+++ b/source/blender/blenlib/intern/profile.cc
@@ -159,16 +159,16 @@ void ProfileListener::flush_to_all()
} // namespace blender::profile
-void _bli_profile_task_begin(BLI_ProfileTask *task, const char *name)
+static void profile_task_begin(BLI_ProfileTask *task, const char *name, uint64_t parent_id)
{
ThreadLocalProfileData &local_data = threadlocal_profile_data;
const uint64_t id = local_data.get_next_unique_id();
- const uint64_t parent_id = local_data.id_stack.peek_default(0);
local_data.id_stack.push(id);
task->id = id;
ProfileTaskBegin *task_begin = local_data.queue_begins.prepare_append();
+
task_begin->id = id;
task_begin->name = name;
task_begin->parent_id = parent_id;
@@ -178,25 +178,18 @@ void _bli_profile_task_begin(BLI_ProfileTask *task, const char *name)
local_data.queue_begins.commit_append();
}
+void _bli_profile_task_begin(BLI_ProfileTask *task, const char *name)
+{
+ ThreadLocalProfileData &local_data = threadlocal_profile_data;
+ const uint64_t parent_id = local_data.id_stack.peek_default(0);
+ profile_task_begin(task, name, parent_id);
+}
+
void _bli_profile_task_begin_subtask(BLI_ProfileTask *task,
const char *name,
const BLI_ProfileTask *parent_task)
{
- ThreadLocalProfileData &local_data = threadlocal_profile_data;
-
- const uint64_t id = local_data.get_next_unique_id();
- const uint64_t parent_id = parent_task->id;
- local_data.id_stack.push(id);
- task->id = id;
-
- ProfileTaskBegin *task_begin = local_data.queue_begins.prepare_append();
- task_begin->id = id;
- task_begin->name = name;
- task_begin->parent_id = parent_id;
- task_begin->thread_id = local_data.thread_id;
- task_begin->time = Clock::now();
-
- local_data.queue_begins.commit_append();
+ profile_task_begin(task, name, parent_task->id);
}
void _bli_profile_task_end(BLI_ProfileTask *task)
More information about the Bf-blender-cvs
mailing list