[Bf-blender-cvs] [c8a94d6edfa] profiler-editor: simplify naming
Jacques Lucke
noreply at git.blender.org
Sat May 1 13:30:33 CEST 2021
Commit: c8a94d6edfa1b6f74d3aff9afea0f84d6daeabf3
Author: Jacques Lucke
Date: Sat May 1 13:13:38 2021 +0200
Branches: profiler-editor
https://developer.blender.org/rBc8a94d6edfa1b6f74d3aff9afea0f84d6daeabf3
simplify naming
===================================================================
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenlib/BLI_profile.h
M source/blender/blenlib/BLI_profile.hh
M source/blender/blenlib/intern/profile.cc
M source/blender/depsgraph/intern/eval/deg_eval.cc
M source/blender/nodes/geometry/nodes/node_geo_attribute_randomize.cc
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 0ec0b7f0177..971a2154435 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1053,7 +1053,7 @@ struct Mesh *BKE_modifier_modify_mesh(ModifierData *md,
if (mti->dependsOnNormals && mti->dependsOnNormals(md)) {
modwrap_dependsOnNormals(me);
}
- BLI_ProfileTask profile_task;
+ ProfileTask profile_task;
BLI_profile_task_begin_named(&profile_task, md->name);
Mesh *new_mesh = mti->modifyMesh(md, ctx, me);
BLI_profile_task_end(&profile_task);
@@ -1072,7 +1072,7 @@ void BKE_modifier_deform_verts(ModifierData *md,
if (me && mti->dependsOnNormals && mti->dependsOnNormals(md)) {
modwrap_dependsOnNormals(me);
}
- BLI_ProfileTask profile_task;
+ ProfileTask profile_task;
BLI_profile_task_begin_named(&profile_task, md->name);
mti->deformVerts(md, ctx, me, vertexCos, numVerts);
BLI_profile_task_end(&profile_task);
diff --git a/source/blender/blenlib/BLI_profile.h b/source/blender/blenlib/BLI_profile.h
index fb812356b81..1b2aaa2b367 100644
--- a/source/blender/blenlib/BLI_profile.h
+++ b/source/blender/blenlib/BLI_profile.h
@@ -24,9 +24,9 @@ extern "C" {
extern bool bli_profiling_is_enabled;
-typedef struct BLI_ProfileTask {
+typedef struct ProfileTask {
uint64_t id;
-} BLI_ProfileTask;
+} ProfileTask;
#define BLI_PROFILE_DUMMY_ID (~0)
@@ -35,17 +35,17 @@ BLI_INLINE bool BLI_profile_is_enabled(void)
return bli_profiling_is_enabled;
}
-void _bli_profile_task_begin_named(BLI_ProfileTask *task, const char *name);
-void _bli_profile_task_begin_named_subtask(BLI_ProfileTask *task,
+void _bli_profile_task_begin_named(ProfileTask *task, const char *name);
+void _bli_profile_task_begin_named_subtask(ProfileTask *task,
const char *name,
- const BLI_ProfileTask *parent_task);
-void _bli_profile_task_begin_range(BLI_ProfileTask *task,
- const BLI_ProfileTask *parent_task,
+ const ProfileTask *parent_task);
+void _bli_profile_task_begin_range(ProfileTask *task,
+ const ProfileTask *parent_task,
int64_t start,
int64_t one_after_last);
-void _bli_profile_task_end(BLI_ProfileTask *task);
+void _bli_profile_task_end(ProfileTask *task);
-BLI_INLINE void BLI_profile_task_begin_named(BLI_ProfileTask *task, const char *name)
+BLI_INLINE void BLI_profile_task_begin_named(ProfileTask *task, const char *name)
{
if (bli_profiling_is_enabled) {
_bli_profile_task_begin_named(task, name);
@@ -55,9 +55,9 @@ BLI_INLINE void BLI_profile_task_begin_named(BLI_ProfileTask *task, const char *
}
}
-BLI_INLINE void BLI_profile_task_begin_named_subtask(BLI_ProfileTask *task,
+BLI_INLINE void BLI_profile_task_begin_named_subtask(ProfileTask *task,
const char *name,
- const BLI_ProfileTask *parent_task)
+ const ProfileTask *parent_task)
{
if (bli_profiling_is_enabled) {
_bli_profile_task_begin_named_subtask(task, name, parent_task);
@@ -67,8 +67,8 @@ BLI_INLINE void BLI_profile_task_begin_named_subtask(BLI_ProfileTask *task,
}
}
-BLI_INLINE void BLI_profile_task_begin_range(BLI_ProfileTask *task,
- const BLI_ProfileTask *parent_task,
+BLI_INLINE void BLI_profile_task_begin_range(ProfileTask *task,
+ const ProfileTask *parent_task,
const int64_t start,
const int64_t one_after_last)
{
@@ -80,7 +80,7 @@ BLI_INLINE void BLI_profile_task_begin_range(BLI_ProfileTask *task,
}
}
-BLI_INLINE void BLI_profile_task_end(BLI_ProfileTask *task)
+BLI_INLINE void BLI_profile_task_end(ProfileTask *task)
{
if (task->id != BLI_PROFILE_DUMMY_ID) {
_bli_profile_task_end(task);
diff --git a/source/blender/blenlib/BLI_profile.hh b/source/blender/blenlib/BLI_profile.hh
index 89005cb705c..f0a1a63623e 100644
--- a/source/blender/blenlib/BLI_profile.hh
+++ b/source/blender/blenlib/BLI_profile.hh
@@ -20,22 +20,22 @@
namespace blender::profile {
-class ProfileTask {
+class ProfileTaskCPP {
private:
- BLI_ProfileTask task_;
+ ProfileTask task_;
public:
- ProfileTask(const char *name)
+ ProfileTaskCPP(const char *name)
{
BLI_profile_task_begin_named(&task_, name);
}
- ProfileTask(const char *name, const BLI_ProfileTask *parent_task)
+ ProfileTaskCPP(const char *name, const ProfileTask *parent_task)
{
BLI_profile_task_begin_named_subtask(&task_, name, parent_task);
}
- ~ProfileTask()
+ ~ProfileTaskCPP()
{
BLI_profile_task_end(&task_);
}
@@ -43,7 +43,7 @@ class ProfileTask {
} // namespace blender::profile
-#define BLI_PROFILE_SCOPE(name) blender::profile::ProfileTask profile_task((name))
+#define BLI_PROFILE_SCOPE(name) blender::profile::ProfileTaskCPP profile_task((name))
#define BLI_PROFILE_SCOPE_SUBTASK(name, parent_task_ptr) \
- blender::profile::ProfileTask profile_task((name), (parent_task_ptr))
+ blender::profile::ProfileTaskCPP profile_task((name), (parent_task_ptr))
diff --git a/source/blender/blenlib/intern/profile.cc b/source/blender/blenlib/intern/profile.cc
index ea341f00658..1502aac4e27 100644
--- a/source/blender/blenlib/intern/profile.cc
+++ b/source/blender/blenlib/intern/profile.cc
@@ -166,7 +166,7 @@ void ProfileListener::flush_to_all()
} // namespace blender::profile
-static void profile_task_begin_named(BLI_ProfileTask *task, const char *name, uint64_t parent_id)
+static void profile_task_begin_named(ProfileTask *task, const char *name, uint64_t parent_id)
{
ThreadLocalProfileData &local_data = threadlocal_profile_data;
@@ -188,22 +188,22 @@ static void profile_task_begin_named(BLI_ProfileTask *task, const char *name, ui
local_data.queue_begins_named.commit_append();
}
-void _bli_profile_task_begin_named(BLI_ProfileTask *task, const char *name)
+void _bli_profile_task_begin_named(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_named(task, name, parent_id);
}
-void _bli_profile_task_begin_named_subtask(BLI_ProfileTask *task,
+void _bli_profile_task_begin_named_subtask(ProfileTask *task,
const char *name,
- const BLI_ProfileTask *parent_task)
+ const ProfileTask *parent_task)
{
profile_task_begin_named(task, name, parent_task->id);
}
-void _bli_profile_task_begin_range(BLI_ProfileTask *task,
- const BLI_ProfileTask *parent_task,
+void _bli_profile_task_begin_range(ProfileTask *task,
+ const ProfileTask *parent_task,
int64_t start,
int64_t one_after_last)
{
@@ -224,7 +224,7 @@ void _bli_profile_task_begin_range(BLI_ProfileTask *task,
local_data.queue_begins_range.commit_append();
}
-void _bli_profile_task_end(BLI_ProfileTask *task)
+void _bli_profile_task_end(ProfileTask *task)
{
TimePoint time = Clock::now();
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index b085e3e3902..183c11f1cfd 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -96,7 +96,7 @@ struct DepsgraphEvalState {
bool do_stats;
EvaluationStage stage;
bool need_single_thread_pass;
- BLI_ProfileTask profile_task;
+ ProfileTask profile_task;
};
void evaluate_node(const DepsgraphEvalState *state, OperationNode *operation_node)
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_randomize.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_randomize.cc
index c36875f982e..523c66d7b40 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_randomize.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_randomize.cc
@@ -124,14 +124,14 @@ static void randomize_attribute(MutableSpan<T> span,
const uint32_t seed,
const GeometryNodeAttributeRandomizeMode operation)
{
- BLI_ProfileTask profile_task;
+ ProfileTask profile_task;
BLI_profile_task_begin_named(&profile_task, __func__);
/* The operations could be templated too, but it doesn't make the code much shorter. */
switch (operation) {
case GEO_NODE_ATTRIBUTE_RANDOMIZE_REPLACE_CREATE:
parallel_for(span.index_range(), 100, [&](IndexRange range) {
- BLI_ProfileTask subtask;
+ ProfileTask subtask;
BLI_profile_task_begin_range(
&subtask, &profile_task, range.start(), range.one_after_last());
for (const int i : range) {
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 076c2cee084..4d2c1786b16 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -444,7 +444,7 @@ void wm_event_do_notifiers(bContext *C)
return;
}
- BLI_ProfileTask profile_task;
+ ProfileTask profile_task;
BLI_profile_task_begin_named(&profile_task, __func__);
/* Disable? - Keep for now since its used for window level notifiers. */
More information about the Bf-blender-cvs
mailing list