[Bf-blender-cvs] [6eade7afa17] soc-2020-info-editor: Rename clog time functions
Mateusz Grzeliński
noreply at git.blender.org
Tue Aug 4 14:14:11 CEST 2020
Commit: 6eade7afa1779e701b02ae19815c02fdd89d1ae3
Author: Mateusz Grzeliński
Date: Tue Aug 4 13:44:03 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB6eade7afa1779e701b02ae19815c02fdd89d1ae3
Rename clog time functions
===================================================================
M source/blender/blenkernel/intern/lib_id.c
M source/blender/blenlib/PIL_time_utildefines.h
M source/blender/modifiers/intern/MOD_decimate.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index c5c3d9866fe..9c1d49e31c9 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -77,8 +77,18 @@
#include "atomic_ops.h"
+#define CLOG_DO_TIMEIT
#include "PIL_time_utildefines.h"
+#ifdef CLOG_DO_TIMEIT
+# define CLOG_TIMEIT(log_ref, log_level, ...) CLOG_VERBOSE(log_ref, log_level, __VA_ARGS__)
+#else
+# define CLOG_TIMEIT(log_ref, log_level, ...) \
+ { \
+ } \
+ void(0)
+#endif // CLOG_DO_TIMEIT
+
static CLG_LogRef LOG = {.identifier = "bke.lib_id"};
/* Empty shell mostly, but needed for read code. */
@@ -1832,12 +1842,12 @@ void BKE_library_make_local(Main *bmain,
GSet *done_ids = BLI_gset_ptr_new(__func__);
- CLOG_DEBUG_TIMEIT_START(&LOG, 0, make_local);
+ CLOG_TIMEIT_START(&LOG, 0, make_local);
BKE_main_relations_create(bmain, 0);
- CLOG_DEBUG(&LOG, 0, "Pre-compute current ID relations: Done.");
- CLOG_DEBUG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Pre-compute current ID relations: Done.");
+ CLOG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
/* Step 1: Detect data-blocks to make local. */
for (int a = set_listbasepointers(bmain, lbarray); a--;) {
@@ -1892,8 +1902,8 @@ void BKE_library_make_local(Main *bmain,
}
}
- CLOG_DEBUG(&LOG, 0, "Step 1: Detect data-blocks to make local: Done.");
- CLOG_DEBUG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Step 1: Detect data-blocks to make local: Done.");
+ CLOG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
/* Step 2: Check which data-blocks we can directly make local
* (because they are only used by already, or future, local data),
@@ -1909,8 +1919,8 @@ void BKE_library_make_local(Main *bmain,
/* Next step will most likely add new IDs, better to get rid of this mapping now. */
BKE_main_relations_free(bmain);
- CLOG_DEBUG(&LOG, 0, "Step 2: Check which data-blocks we can directly make local: Done.");
- CLOG_DEBUG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Step 2: Check which data-blocks we can directly make local: Done.");
+ CLOG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
/* Step 3: Make IDs local, either directly (quick and simple), or using generic process,
* which involves more complex checks and might instead
@@ -1961,8 +1971,8 @@ void BKE_library_make_local(Main *bmain,
}
}
- CLOG_DEBUG(&LOG, 0, "Step 3: Make IDs local: Done.");
- CLOG_DEBUG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Step 3: Make IDs local: Done.");
+ CLOG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
/* At this point, we are done with directly made local IDs.
* Now we have to handle duplicated ones, since their
@@ -1996,8 +2006,8 @@ void BKE_library_make_local(Main *bmain,
}
}
- CLOG_DEBUG(&LOG, 0, "Step 4: Remap local usages of old (linked) ID to new (local) ID: Done.");
- CLOG_DEBUG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Step 4: Remap local usages of old (linked) ID to new (local) ID: Done.");
+ CLOG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
/* Step 5: proxy 'remapping' hack. */
for (LinkNode *it = copied_ids; it; it = it->next) {
@@ -2050,8 +2060,8 @@ void BKE_library_make_local(Main *bmain,
}
}
- CLOG_DEBUG(&LOG, 0, "Step 5: Proxy 'remapping' hack: Done.");
- CLOG_DEBUG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Step 5: Proxy 'remapping' hack: Done.");
+ CLOG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
/* This is probably more of a hack than something we should do here, but...
* Issue is, the whole copying + remapping done in complex cases above may leave pose-channels
@@ -2067,14 +2077,14 @@ void BKE_library_make_local(Main *bmain,
}
}
- CLOG_DEBUG(&LOG, 0, "Hack: Forcefully rebuild armature object poses: Done.");
- CLOG_DEBUG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Hack: Forcefully rebuild armature object poses: Done.");
+ CLOG_TIMEIT_VALUE_PRINT(&LOG, 0, make_local);
BKE_main_id_clear_newpoins(bmain);
BLI_memarena_free(linklist_mem);
- CLOG_DEBUG(&LOG, 0, "Cleanup and finish: Done.");
- CLOG_DEBUG_TIMEIT_END(&LOG, 0, make_local);
+ CLOG_TIMEIT(&LOG, 0, "Cleanup and finish: Done.");
+ CLOG_TIMEIT_END(&LOG, 0, make_local);
}
/**
diff --git a/source/blender/blenlib/PIL_time_utildefines.h b/source/blender/blenlib/PIL_time_utildefines.h
index 7e8b5bfd61b..85ad0d00ecb 100644
--- a/source/blender/blenlib/PIL_time_utildefines.h
+++ b/source/blender/blenlib/PIL_time_utildefines.h
@@ -128,10 +128,10 @@
} \
(void)0
-/* CLOG function family, available only in debug builds (?) */
-#ifdef DEBUG
+/** CLOG profiling function family */
+#ifdef CLOG_DO_TIMEIT
-# define CLOG_DEBUG_TIMEIT_START(log_ref, level, var) \
+# define CLOG_TIMEIT_START(log_ref, level, var) \
{ \
double _clog_debug_timeit_##var = PIL_check_seconds_timer(); \
CLOG_DEBUG(log_ref, level, "time start (" #var ")"); \
@@ -141,18 +141,18 @@
/**
* \return the time since TIMEIT_START was called.
*/
-# define CLOG_DEBUG_TIMEIT_VALUE(var) \
+# define CLOG_TIMEIT_VALUE(var) \
(float)(PIL_check_seconds_timer() - _clog_debug_timeit_##var)
-# define CLOG_DEBUG_TIMEIT_VALUE_PRINT(log_ref, level, var) \
+# define CLOG_TIMEIT_VALUE_PRINT(log_ref, level, var) \
{ \
- CLOG_DEBUG(log_ref, level, "time update (" #var "): %.6f", CLOG_DEBUG_TIMEIT_VALUE(var)); \
+ CLOG_DEBUG(log_ref, level, "time update (" #var "): %.6f", CLOG_TIMEIT_VALUE(var)); \
} \
(void)0
-# define CLOG_DEBUG_TIMEIT_END(log_ref, level, var) \
+# define CLOG_TIMEIT_END(log_ref, level, var) \
} \
- CLOG_DEBUG(log_ref, level, "time end (" #var "): %.6f", CLOG_DEBUG_TIMEIT_VALUE(var)); \
+ CLOG_DEBUG(log_ref, level, "time end (" #var "): %.6f", CLOG_TIMEIT_VALUE(var)); \
} \
(void)0
@@ -161,7 +161,7 @@
* but additionally add elapsed time to an averaged static value,
* useful to get sensible timing of code running fast and often.
*/
-# define CLOG_DEBUG_TIMEIT_START_AVERAGED(log_ref, level, var) \
+# define CLOG_TIMEIT_START_AVERAGED(log_ref, level, var) \
{ \
static float _clog_debug_sum_##var = 0.0f; \
static float _clog_debug_num_##var = 0.0f; \
@@ -170,12 +170,12 @@
{ \
(void)0
-# define CLOG_DEBUG_TIMEIT_AVERAGED_VALUE(var) \
+# define CLOG_TIMEIT_AVERAGED_VALUE(var) \
(_clog_debug_num##var ? (_clog_debug_sum_##var / _clog_debug_num_##var) : 0.0f)
-# define CLOG_DEBUG_TIMEIT_END_AVERAGED(log_ref, level, var) \
+# define CLOG_TIMEIT_END_AVERAGED(log_ref, level, var) \
} \
- const float _clog_debug_delta_##var = CLOG_DEBUG_TIMEIT_VALUE(var); \
+ const float _clog_debug_delta_##var = CLOG_TIMEIT_VALUE(var); \
_clog_debug_sum_##var += _clog_debug_delta_##var; \
_clog_debug_num_##var++; \
CLOG_DEBUG(log_ref, level, "time end (" #var "): %.6f", _clog_debug_delta_##var); \
@@ -192,23 +192,23 @@
* Given some function/expression:
* TIMEIT_BENCH(some_function(), some_unique_description);
*/
-# define CLOG_DEBUG_TIMEIT_BENCH(log_ref, level, expr, id) \
+# define CLOG_TIMEIT_BENCH(log_ref, level, expr, id) \
{ \
- CLOG_DEBUG_TIMEIT_START(log_ref, level, id); \
+ CLOG_TIMEIT_START(log_ref, level, id); \
(expr); \
- CLOG_DEBUG_TIMEIT_END(log_ref, level, id); \
+ CLOG_TIMEIT_END(log_ref, level, id); \
} \
(void)0
-# define CLOG_DEBUG_TIMEIT_BLOCK_INIT(log_ref, id) double _clog_debug_timeit_var_##id = 0
+# define CLOG_TIMEIT_BLOCK_INIT(log_ref, id) double _clog_debug_timeit_var_##id = 0
-# define CLOG_DEBUG_TIMEIT_BLOCK_START(id) \
+# define CLOG_TIMEIT_BLOCK_START(id) \
{ \
double _clog_debug_timeit_block_start_##id = PIL_check_seconds_timer(); \
{ \
(void)0
-# define CLOG_DEBUG_TIMEIT_BLOCK_END(id) \
+# define CLOG_TIMEIT_BLOCK_END(id) \
} \
_clog_debug_timeit_var_##id += (PIL_check_seconds_timer() - \
_clog_debug_timeit_block_start_##id); \
@@ -222,48 +222,48 @@
(void)0
#else
-# define CLOG_DEBUG_TIMEIT_START(log_ref, level, var) \
+# define CLOG_TIMEIT_START(log_ref, level, var) \
{ \
{ \
(void)0
-# define CLOG_DEBUG_TIMEIT_VALUE(var) \
+# define CLOG_TIMEIT_VALUE(var) \
do { \
} while (false)
-# define CLOG_DEBUG_TIMEIT_VALUE_PRINT(log_ref, level, var) {}(void)0
+# define CLOG_TIMEIT_VALUE_PRINT(log_ref, level, var) {}(void)0
-# define CLOG_DEBUG_TIMEIT_END(log_ref, level, var) \
+# define CLOG_TIMEIT_END(log_ref, level, var) \
} \
} \
(void)0
-# define CLOG_DEBUG_TIMEIT_START_AVERAGED(log_ref, level, var) \
+# define CLOG_TIMEIT_START_AVERAGED(log_ref, level, var) \
{ \
{ \
(void)0
-# define CLOG_DEBUG_TIMEIT_AVERAGED_VALUE(var) \
+# define CLOG_TIMEIT_AVERAGED_VALUE(var) \
do { \
} while (false)
-# define CLOG_DEBUG_TIMEIT_END_AVERAGED(log_ref, level, var) \
+# define CLOG_TIMEIT_END_AVERAGED(log_ref, level, var) \
} \
} \
(void)0
-# define CLOG_DEBUG_TIMEIT_BENCH(log_ref, level, expr, id) {}(void)0
+# define CLOG_TIMEIT_BENCH(log_ref, level, expr, id) {}(void)0
-# define CLOG_DEBUG_TIMEIT_BLOCK_INIT(log_ref, id) \
+# define CLOG_TIMEIT_BLOCK_INIT(log_ref, id) \
do { \
} while (false)
-# define CLOG_DEBUG_TIMEIT_BLOCK_START(id) \
+# define CLOG_TIMEIT_BLOCK_START(id) \
{ \
{ \
(void)0
-# define CLOG_DEBUG_TIMEIT_BLOCK_END(id) \
+# define CLOG_TIMEIT_BLOCK_END(id) \
} \
} \
(void)0
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index a173b766fbf..4f0577618e9 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -51,11 +51,13 @@
#include "bmesh_tools.h"
#include "PIL_time.h"
-#include "PIL_time_utildefines.h"
#include "MOD_ui_common.h"
#include "MOD_util.h"
+// #define CLOG_DO_TIMEIT
+#include "PIL_time_utilde
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list