Differential D1185 Diff 3765 intern/cycles/util/util_progress.h

Changeset View

Standalone View

intern/cycles/util/util_progress.h

Show First 20 Lines • Show All 104 Lines • ▼ Show 20 Lines	public:
}		}

string get_cancel_message()		string get_cancel_message()
{		{
thread_scoped_lock lock(progress_mutex);		thread_scoped_lock lock(progress_mutex);
return cancel_message;		return cancel_message;
}		}

void set_cancel_callback(boost::function<void(void)> function)		void set_cancel_callback(function<void(void)> function)
{		{
cancel_cb = function;		cancel_cb = function;
}		}

/* error */		/* error */
void set_error(const string& error_message_)		void set_error(const string& error_message_)
{		{
thread_scoped_lock lock(progress_mutex);		thread_scoped_lock lock(progress_mutex);
▲ Show 20 Lines • Show All 148 Lines • ▼ Show 20 Lines	public:
void set_update()		void set_update()
{		{
if(update_cb) {		if(update_cb) {
thread_scoped_lock lock(update_mutex);		thread_scoped_lock lock(update_mutex);
update_cb();		update_cb();
}		}
}		}

void set_update_callback(boost::function<void(void)> function)		void set_update_callback(function<void(void)> function)
{		{
update_cb = function;		update_cb = function;
}		}

protected:		protected:
thread_mutex progress_mutex;		thread_mutex progress_mutex;
thread_mutex update_mutex;		thread_mutex update_mutex;
boost::function<void(void)> update_cb;		function<void(void)> update_cb;
boost::function<void(void)> cancel_cb;		function<void(void)> cancel_cb;

int tile; /* counter for rendered tiles */		int tile; /* counter for rendered tiles */
int sample; /* counter of rendered samples, global for all tiles */		int sample; /* counter of rendered samples, global for all tiles */

double start_time, render_start_time;		double start_time, render_start_time;
double total_time, render_time;		double total_time, render_time;
double tile_time;		double tile_time;

Show All 17 Lines