Commit: 6a1f35104fa8495daa1fd03f498fbea345de1636
Author: Mateusz Grzeliński
Date: Fri Aug 7 13:25:08 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB6a1f35104fa8495daa1fd03f498fbea345de1636
Merge branch 'master' into soc-2020-info-editor
# Conflicts:
# source/blender/blenkernel/BKE_DerivedMesh.h
# source/blender/blenkernel/intern/DerivedMesh.c
# source/blender/blenkernel/intern/anim_data.c
# source/blender/blenlib/PIL_time_utildefines.h
# source/blender/editors/space_info/info_intern.h
# source/blender/windowmanager/intern/wm_event_system.c
# source/blender/windowmanager/intern/wm_files.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_DerivedMesh.h
index 2d656cb1c9d,76c610fb5bd..d672c960e3f
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@@ -380,9 -379,8 +379,8 @@@ void DM_calc_loop_tangents(DerivedMesh
/* debug only */
#ifndef NDEBUG
-char *DM_debug_info(DerivedMesh *dm);
+char *DM_debug_sprintfN(DerivedMesh *dm);
void DM_debug_print(DerivedMesh *dm);
- char *DM_debug_sprintfN_cdlayers(CustomData *data);
bool DM_is_valid(DerivedMesh *dm);
#endif
diff --cc source/blender/blenkernel/intern/CCGSubSurf_inline.h
index 8b2b7d8936b,8aa1fede57d..6c97b2c6b09
--- a/source/blender/blenkernel/intern/CCGSubSurf_inline.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf_inline.h
@@@ -18,12 -18,8 +18,11 @@@
* \ingroup bke
*/
- #ifndef __CCGSUBSURF_INLINE_H__
- #define __CCGSUBSURF_INLINE_H__
+ #pragma once
+/* defined in CCGSubSurf_util.c */
+extern struct CLG_LogRef *BKE_LOG_SUBSURF_DUMP_COORDS;
+
BLI_INLINE int ccg_gridsize(int level)
{
BLI_assert(level > 0);
diff --cc source/blender/blenkernel/intern/CCGSubSurf_intern.h
index f6423804c41,82ca22e193a..d0345f9613e
--- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h
@@@ -281,8 -280,8 +280,6 @@@ void ccgSubSurf_converter_free(struct O
/* * CCGSubSurf_util.c * */
-#ifdef DUMP_RESULT_GRIDS
void ccgSubSurf__dumpCoords(CCGSubSurf *ss);
-#endif
#include "CCGSubSurf_inline.h"
-
- #endif /* __CCGSUBSURF_INTERN_H__ */
diff --cc source/blender/blenlib/PIL_time_utildefines.h
index 8d640cc7425,d404a8b2b8a..39b6b9dcd74
--- a/source/blender/blenlib/PIL_time_utildefines.h
+++ b/source/blender/blenlib/PIL_time_utildefines.h
@@@ -127,95 -126,3 +126,94 @@@
fflush(stdout); \
} \
(void)0
+
+/** CLOG profiling function family */
+#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 ")"); \
+ { \
+ (void)0
+
+/**
+ * \return the time since TIMEIT_START was called.
+ */
+#define CLOG_TIMEIT_VALUE(var) (float)(PIL_check_seconds_timer() -
_clog_debug_timeit_##var)
+
+#define CLOG_TIMEIT_VALUE_PRINT(log_ref, level, var) \
+ { \
+ CLOG_DEBUG(log_ref, level, "time update (" #var "): %.6f",
CLOG_TIMEIT_VALUE(var)); \
+ } \
+ (void)0
+
+#define CLOG_TIMEIT_END(log_ref, level, var) \
+ } \
+ CLOG_DEBUG(log_ref, level, "time end (" #var "): %.6f",
CLOG_TIMEIT_VALUE(var)); \
+ } \
+ (void)0
+
+/**
+ * _AVERAGED variants do same thing as their basic counterpart,
+ * but additionally add elapsed time to an averaged static value,
+ * useful to get sensible timing of code running fast and often.
+ */
+#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; \
+ double _clog_debug_timeit_##var = PIL_check_seconds_timer(); \
+ CLOG_DEBUG(log_ref, level, "time start (" #var ")"); \
+ { \
+ (void)0
+
+#define CLOG_TIMEIT_AVERAGED_VALUE(var) \
+ (_clog_debug_num##var ? (_clog_debug_sum_##var / _clog_debug_num_##var) :
0.0f)
+
+#define CLOG_TIMEIT_END_AVERAGED(log_ref, level, 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); \
+ CLOG_DEBUG(log_ref, \
+ level, \
+ "time averaged (" #var "): %.6f (total: %.6f, in %d runs)", \
+ (_clog_debug_sum_##var / _clog_debug_num_##var), \
+ _clog_debug_sum_##var, \
+ (int)_clog_debug_num_##var); \
+ } \
+ (void)0
+
+/**
+ * Given some function/expression:
+ * TIMEIT_BENCH(some_function(), some_unique_description);
+ */
+#define CLOG_TIMEIT_BENCH(log_ref, level, expr, id) \
+ { \
+ CLOG_TIMEIT_START(log_ref, level, id); \
+ (expr); \
+ CLOG_TIMEIT_END(log_ref, level, id); \
+ } \
+ (void)0
+
+#define CLOG_TIMEIT_BLOCK_INIT(log_ref, id) double
_clog_debug_timeit_var_##id = 0
+
+#define CLOG_TIMEIT_BLOCK_START(id) \
+ { \
+ double _clog_debug_timeit_block_start_##id = PIL_check_seconds_timer(); \
+ { \
+ (void)0
+
+#define CLOG_TIMEIT_BLOCK_END(id) \
+ } \
+ _clog_debug_timeit_var_##id += (PIL_check_seconds_timer() - \
+ _clog_debug_timeit_block_start_##id); \
+ } \
+ (void)0
+
+#define CLOG_TIMEIT_BLOCK_STATS(log_ref, level, id) \
+ { \
+ CLOG_DEBUG(log_ref, level, "%s time (in seconds): %f", #id,
_clog_debug_timeit_var_##id); \
+ } \
+ (void)0
+
- #endif /* __PIL_TIME_UTILDEFINES_H__ */
diff --cc source/blender/editors/space_info/info_intern.h
index 630028c5e44,a19ebe5ef04..d3301ff2651
--- a/source/blender/editors/space_info/info_intern.h
+++ b/source/blender/editors/space_info/info_intern.h
@@@ -21,11 -21,8 +21,10 @@@
* \ingroup spinfo
*/
- #ifndef __INFO_INTERN_H__
- #define __INFO_INTERN_H__
+ #pragma once
+#include "DNA_windowmanager_types.h"
+
/* internal exports only */
struct ReportList;
@@@ -69,8 -64,3 +68,6 @@@ void INFO_OT_select_box(struct wmOperat
void INFO_OT_report_replay(struct wmOperatorType *ot);
void INFO_OT_report_delete(struct wmOperatorType *ot);
void INFO_OT_report_copy(struct wmOperatorType *ot);
+
+#define IS_REPORT_VISIBLE(report, report_mask, search_string) \
+ (info_filter_text(report, search_string) && ((report)->type & report_mask))
-
- #endif /* __INFO_INTERN_H__ */
diff --cc source/blender/editors/space_info/textview.h
index 04e41a1d8ce,7520dbce191..06411f6339b
--- a/source/blender/editors/space_info/textview.h
+++ b/source/blender/editors/space_info/textview.h
@@@ -18,11 -18,10 +18,10 @@@
* \ingroup spinfo
*/
- #ifndef __TEXTVIEW_H__
- #define __TEXTVIEW_H__
+ #pragma once
enum eTextViewContext_LineFlag {
- TVC_LINE_FG = (1 << 0),
+ TVC_LINE_FG_SIMPLE = (1 << 0),
TVC_LINE_BG = (1 << 1),
TVC_LINE_ICON = (1 << 2),
TVC_LINE_ICON_FG = (1 << 3),
diff --cc source/blender/windowmanager/intern/wm_event_system.c
index f7acdd490d9,0941dd49d23..9a8805b3641
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -2408,13 -2434,11 +2408,11 @@@ static int wm_handlers_do_keymap_with_k
}
break;
}
+ if (action & WM_HANDLER_HANDLED) {
- CLOG_INFO(WM_LOG_HANDLERS, 2, "handled - and pass on! '%s'",
kmi->idname);
++ CLOG_VERBOSE(WM_LOG_HANDLERS, 2, "handled - and pass on! '%s'",
kmi->idname);
+ }
else {
- if (action & WM_HANDLER_HANDLED) {
- CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " handled - and pass on!
'%s'", kmi->idname);
- }
- else {
- CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " un-handled '%s'",
kmi->idname);
- }
- CLOG_INFO(WM_LOG_HANDLERS, 2, "un-handled '%s'", kmi->idname);
++ CLOG_VERBOSE(WM_LOG_HANDLERS, 2, "un-handled '%s'", kmi->idname);
}
}
}
@@@ -2458,16 -2485,18 +2456,14 @@@ static int wm_handlers_do_keymap_with_g
CTX_wm_gizmo_group_set(C, NULL);
if (action & WM_HANDLER_BREAK) {
- if (G.debug & (G_DEBUG_EVENTS | G_DEBUG_HANDLERS)) {
- printf("%s: handled - and pass on! '%s'\n", __func__,
kmi->idname);
- }
+ CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " handled - and pass on! '%s'",
kmi->idname);
break;
}
+ if (action & WM_HANDLER_HANDLED) {
- if (G.debug & (G_DEBUG_EVENTS | G_DEBUG_HANDLERS)) {
- printf("%s: handled - and pass on! '%s'\n", __func__,
kmi->idname);
- }
++ CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " handled - and pass on! '%s'",
kmi->idname);
+ }
else {
- if (action & WM_HANDLER_HANDLED) {
- CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " handled - and pass on!
'%s'", kmi->idname);
- }
- else {
- CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " un-handled '%s'",
kmi->idname);
- }
- PRINT("%s: un-handled '%s'\n", __func__, kmi->idname);
++ CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " un-handled '%s'",
kmi->idname);
}
}
}
@@@ -3650,13 -3684,8 +3642,11 @@@ wmKeyMap *WM_event_get_keymap_from_tool
handler->keymap_tool = area->runtime.tool;
return km;
}
- else {
- CLOG_VERBOSE(WM_LOG_EVENTS,
- 1,
- "Keymap: '%s' not found for tool '%s'",
- tref_rt->keymap,
- area->runtime.tool->idname);
- }
- printf(
- "Keymap: '%s' not found for tool '%s'\n", tref_rt->keymap,
area->runtime.tool->idname);
++ CLOG_VERBOSE(WM_LOG_EVENTS,
++ 1,
++ "Keymap: '%s' not found for tool '%s'",
++ tref_rt->keymap,
++ area->runtime.tool->idname);
}
}
return NULL;
@@@ -3677,13 -3706,8 +3667,11 @@@ wmKeyMap *WM_event_get_keymap_from_tool
handler->keymap_tool = area->runtime.tool;
return km;
}
- else {
- CLOG_VERBOSE(WM_LOG_EVENTS,
- 1,
- "Keymap: '%s' not found for tool '%s'",
- tref_rt->keymap,
- area->runtime.tool->idname);
- }
- printf(
- "Keymap: '%s' not found for tool '%s'\n", tref_rt->keymap,
area->runtime.tool->idname);
++ CLOG_VERBOSE(WM_LOG_EVENTS,
++ 1,
++ "Keymap: '%s' not found for tool '%s'",
++ tref_rt->keymap,
++ area->runtime.tool->idname);
}
}
return NULL;
diff --cc source/blender/windowmanager/intern/wm_files.c
index 2fa70b443e1,ef4f2b4a62a..35477d2cb34
--- a/source/blen
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
