[Bf-blender-cvs] [0b79c5e] master: Cycles: Report total and render time to the log

[Sergey Sharybin]

Commit: 0b79c5ed291eff8dc82e49502665829560b86f8e
Author: Sergey Sharybin
Date:   Wed Jun 17 11:56:19 2015 +0200
Branches: master
https://developer.blender.org/rB0b79c5ed291eff8dc82e49502665829560b86f8e

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).

===================================================================

M	intern/cycles/blender/blender_session.cpp
M	intern/cycles/util/util_progress.h

===================================================================

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index bc1fd37..b82289e 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 13fce65..0b35142 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);