[Bf-blender-cvs] [fb9b277e701] soc-2020-info-editor: Cleanup: rename loggers
Mateusz Grzeliński
noreply at git.blender.org
Sat Jul 11 10:43:41 CEST 2020
Commit: fb9b277e7019e2d264fb57f7638fb59167560a1f
Author: Mateusz Grzeliński
Date: Fri Jul 10 11:18:49 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBfb9b277e7019e2d264fb57f7638fb59167560a1f
Cleanup: rename loggers
===================================================================
M source/blender/blenkernel/BKE_global.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_jobs.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 08b0eebbd4b..66142cf782b 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -137,7 +137,7 @@ enum {
G_DEBUG_EVENTS = (1 << 3), /* unused, converted to log WM_LOG_EVENTS */
G_DEBUG_HANDLERS = (1 << 4), /* unused, converted to log WM_LOG_HANDLERS */
G_DEBUG_WM = (1 << 5), /* operator, undo */
- G_DEBUG_JOBS = (1 << 6), /* unused, converted to log WM_LOG_JOB */
+ G_DEBUG_JOBS = (1 << 6), /* unused, converted to log WM_LOG_JOBS */
G_DEBUG_FREESTYLE = (1 << 7), /* freestyle messages */
G_DEBUG_DEPSGRAPH_BUILD = (1 << 8), /* depsgraph construction messages */
G_DEBUG_DEPSGRAPH_EVAL = (1 << 9), /* depsgraph evaluation messages */
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 3ee1136f686..d5f49236776 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -926,7 +926,7 @@ extern struct CLG_LogRef *WM_LOG_TOOLS;
extern struct CLG_LogRef *WM_LOG_MSGBUS_PUB;
extern struct CLG_LogRef *WM_LOG_MSGBUS_SUB;
extern struct CLG_LogRef *WM_LOG_SESSION;
-extern struct CLG_LogRef *WM_LOG_JOB;
+extern struct CLG_LogRef *WM_LOG_JOBS;
extern struct CLG_LogRef *WM_LOG_GIZMO;
#ifdef __cplusplus
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 73bcb22cf17..bad5d317bf2 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -134,15 +134,15 @@
#include "DRW_engine.h"
-CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_OPERATORS, "wm.operator");
-CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_HANDLERS, "wm.handler");
-CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_EVENTS, "wm.event");
-CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_KEYMAPS, "wm.keymap");
-CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_TOOLS, "wm.tool");
+CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_OPERATORS, "wm.operators");
+CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_HANDLERS, "wm.handlers");
+CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_EVENTS, "wm.events");
+CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_KEYMAPS, "wm.keymaps");
+CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_TOOLS, "wm.tools");
CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_MSGBUS_PUB, "wm.msgbus.pub");
CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_MSGBUS_SUB, "wm.msgbus.sub");
CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_SESSION, "wm.session");
-CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_JOB, "wm.job");
+CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_JOBS, "wm.jobs");
CLG_LOGREF_DECLARE_GLOBAL(WM_LOG_GIZMO, "wm.gizmo");
static void wm_init_reports(bContext *C)
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index c1facce7c05..1f7429643cb 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -439,7 +439,7 @@ static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test)
/* if this job has higher priority, stop others */
if (test->flag & WM_JOB_PRIORITY) {
wm_job->stop = true;
- CLOG_INFO(WM_LOG_JOB, "job stopped: %s\n", wm_job->name);
+ CLOG_INFO(WM_LOG_JOBS, "job stopped: %s\n", wm_job->name);
}
}
}
@@ -447,7 +447,7 @@ static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test)
/* Possible suspend ourselves, waiting for other jobs, or de-suspend. */
test->suspended = suspend;
if (suspend) {
- CLOG_INFO(WM_LOG_JOB, "job suspended: %s\n", test->name);
+ CLOG_INFO(WM_LOG_JOBS, "job suspended: %s\n", test->name);
}
}
@@ -460,7 +460,7 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *wm_job)
if (wm_job->running) {
/* signal job to end and restart */
wm_job->stop = true;
- CLOG_INFO(WM_LOG_JOB, "job started a running job, ending... %s", wm_job->name);
+ CLOG_INFO(WM_LOG_JOBS, "job started a running job, ending... %s", wm_job->name);
}
else {
@@ -486,7 +486,7 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *wm_job)
wm_job->ready = false;
wm_job->progress = 0.0;
- CLOG_INFO(WM_LOG_JOB, "job started: %s", wm_job->name);
+ CLOG_INFO(WM_LOG_JOBS, "job started: %s", wm_job->name);
BLI_threadpool_init(&wm_job->threads, do_job_thread, 1);
BLI_threadpool_insert(&wm_job->threads, wm_job);
@@ -504,7 +504,7 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *wm_job)
wm_job->start_time = PIL_check_seconds_timer();
}
else {
- CLOG_WARN(WM_LOG_JOB, "job %s fails, not initialized", wm_job->name);
+ CLOG_WARN(WM_LOG_JOBS, "job %s fails, not initialized", wm_job->name);
}
}
}
@@ -685,13 +685,13 @@ void wm_jobs_timer(wmWindowManager *wm, wmTimer *wt)
wm_job->run_free = NULL;
if (wm_job->stop) {
- CLOG_INFO(WM_LOG_JOB, "job ready but stopped: %s", wm_job->name);
+ CLOG_INFO(WM_LOG_JOBS, "job ready but stopped: %s", wm_job->name);
}
else {
- CLOG_INFO(WM_LOG_JOB, "job finished: %s", wm_job->name);
+ CLOG_INFO(WM_LOG_JOBS, "job finished: %s", wm_job->name);
}
- CLOG_VERBOSE(WM_LOG_JOB,
+ CLOG_VERBOSE(WM_LOG_JOBS,
1,
"Job '%s' finished in %f seconds",
wm_job->name,
@@ -711,7 +711,7 @@ void wm_jobs_timer(wmWindowManager *wm, wmTimer *wt)
/* new job added for wm_job? */
if (wm_job->customdata) {
- CLOG_INFO(WM_LOG_JOB, "job restarted with new data %s", wm_job->name);
+ CLOG_INFO(WM_LOG_JOBS, "job restarted with new data %s", wm_job->name);
WM_jobs_start(wm, wm_job);
}
else {
More information about the Bf-blender-cvs
mailing list