Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-06-17 12:56:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-17 15:07:51 +0300
commit0b79c5ed291eff8dc82e49502665829560b86f8e (patch)
tree0891d0a26a28b6aea9e08264188127b181c3d0a9
parente1ce9220d6fd0c1fb78d0fd71b8168425abc1220 (diff)
Cycles: Report total and render time to the log
This includes total render time spent on rendering since render() was invoked and also prints time of actual rendering (without synchronization step).
-rw-r--r--intern/cycles/blender/blender_session.cpp6
-rw-r--r--intern/cycles/util/util_progress.h6
2 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index bc1fd37962e..b82289e007b 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -32,6 +32,7 @@
#include "util_color.h"
#include "util_foreach.h"
#include "util_function.h"
+#include "util_logging.h"
#include "util_progress.h"
#include "util_time.h"
@@ -502,6 +503,11 @@ void BlenderSession::render()
break;
}
+ double total_time, render_time;
+ session->progress.get_time(total_time, render_time);
+ VLOG(1) << "Total render time: " << total_time;
+ VLOG(1) << "Render time (without synchronization): " << render_time;
+
/* clear callback */
session->write_render_tile_cb = function_null;
session->update_render_tile_cb = function_null;
diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h
index 13fce655734..0b35142ddb3 100644
--- a/intern/cycles/util/util_progress.h
+++ b/intern/cycles/util/util_progress.h
@@ -173,6 +173,12 @@ public:
tile_time_ = tile_time;
}
+ void get_time(double& total_time_, double& render_time_)
+ {
+ total_time_ = (total_time > 0.0)? total_time: 0.0;
+ render_time_ = (render_time > 0.0)? render_time: 0.0;
+ }
+
void reset_sample()
{
thread_scoped_lock lock(progress_mutex);