blender/intern/cycles/util/util_progress.h
Lukas Stockner 193871ae7d Cycles: Ignore preprocessing time in ETA calculation
This patch makes Cycles ignore the time spent in BVH construction etc. when
estimating the remaining time. Considering that the remaining time is calculated
based on the average time per tile so far, as far as I understand it makes no
sense to include the preprocessing time.

Reviewers: sergey, #cycles

Reviewed By: sergey, #cycles

Subscribers: sergey

Projects: #cycles

Differential Revision: https://developer.blender.org/D895
2015-01-14 23:14:16 +05:00

312 lines
6.0 KiB
C++

/*
* Copyright 2011-2013 Blender Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef __UTIL_PROGRESS_H__
#define __UTIL_PROGRESS_H__
/* Progress
*
* Simple class to communicate progress status messages, timing information,
* update notifications from a job running in another thread. All methods
* except for the constructor/destructor are thread safe. */
#include "util_function.h"
#include "util_string.h"
#include "util_time.h"
#include "util_thread.h"
CCL_NAMESPACE_BEGIN
class Progress {
public:
Progress()
{
tile = 0;
sample = 0;
start_time = time_dt();
total_time = 0.0f;
tile_time = 0.0f;
status = "Initializing";
substatus = "";
sync_status = "";
sync_substatus = "";
update_cb = NULL;
cancel = false;
cancel_message = "";
error = false;
error_message = "";
cancel_cb = NULL;
}
Progress(Progress& progress)
{
*this = progress;
}
Progress& operator=(Progress& progress)
{
thread_scoped_lock lock(progress.progress_mutex);
progress.get_status(status, substatus);
progress.get_tile(tile, total_time, render_time, tile_time);
sample = progress.get_sample();
return *this;
}
void reset()
{
tile = 0;
sample = 0;
start_time = time_dt();
render_start_time = time_dt();
total_time = 0.0f;
render_time = 0.0f;
tile_time = 0.0f;
status = "Initializing";
substatus = "";
sync_status = "";
sync_substatus = "";
cancel = false;
cancel_message = "";
error = false;
error_message = "";
}
/* cancel */
void set_cancel(const string& cancel_message_)
{
thread_scoped_lock lock(progress_mutex);
cancel_message = cancel_message_;
cancel = true;
}
bool get_cancel()
{
if(!cancel && cancel_cb)
cancel_cb();
return cancel;
}
string get_cancel_message()
{
thread_scoped_lock lock(progress_mutex);
return cancel_message;
}
void set_cancel_callback(boost::function<void(void)> function)
{
cancel_cb = function;
}
/* error */
void set_error(const string& error_message_)
{
thread_scoped_lock lock(progress_mutex);
error_message = error_message_;
error = true;
/* If error happens we also stop rendering. */
cancel_message = error_message_;
cancel = true;
}
bool get_error()
{
return error;
}
string get_error_message()
{
thread_scoped_lock lock(progress_mutex);
return error_message;
}
/* tile and timing information */
void set_start_time(double start_time_)
{
thread_scoped_lock lock(progress_mutex);
start_time = start_time_;
}
void set_render_start_time(double render_start_time_)
{
thread_scoped_lock lock(progress_mutex);
render_start_time = render_start_time_;
}
void set_tile(int tile_, double tile_time_)
{
thread_scoped_lock lock(progress_mutex);
tile = tile_;
total_time = time_dt() - start_time;
render_time = time_dt() - render_start_time;
tile_time = tile_time_;
}
void get_tile(int& tile_, double& total_time_, double& render_time_, double& tile_time_)
{
thread_scoped_lock lock(progress_mutex);
tile_ = tile;
total_time_ = (total_time > 0.0)? total_time: 0.0;
render_time_ = (render_time > 0.0)? render_time: 0.0;
tile_time_ = tile_time;
}
void reset_sample()
{
thread_scoped_lock lock(progress_mutex);
sample = 0;
}
void increment_sample()
{
thread_scoped_lock lock(progress_mutex);
sample++;
}
void increment_sample_update()
{
increment_sample();
set_update();
}
int get_sample()
{
return sample;
}
/* status messages */
void set_status(const string& status_, const string& substatus_ = "")
{
{
thread_scoped_lock lock(progress_mutex);
status = status_;
substatus = substatus_;
total_time = time_dt() - start_time;
render_time = time_dt() - render_start_time;
}
set_update();
}
void set_substatus(const string& substatus_)
{
{
thread_scoped_lock lock(progress_mutex);
substatus = substatus_;
total_time = time_dt() - start_time;
render_time = time_dt() - render_start_time;
}
set_update();
}
void set_sync_status(const string& status_, const string& substatus_ = "")
{
{
thread_scoped_lock lock(progress_mutex);
sync_status = status_;
sync_substatus = substatus_;
total_time = time_dt() - start_time;
render_time = time_dt() - render_start_time;
}
set_update();
}
void set_sync_substatus(const string& substatus_)
{
{
thread_scoped_lock lock(progress_mutex);
sync_substatus = substatus_;
total_time = time_dt() - start_time;
render_time = time_dt() - render_start_time;
}
set_update();
}
void get_status(string& status_, string& substatus_)
{
thread_scoped_lock lock(progress_mutex);
if(sync_status != "") {
status_ = sync_status;
substatus_ = sync_substatus;
}
else {
status_ = status;
substatus_ = substatus;
}
}
/* callback */
void set_update()
{
if(update_cb) {
thread_scoped_lock lock(update_mutex);
update_cb();
}
}
void set_update_callback(boost::function<void(void)> function)
{
update_cb = function;
}
protected:
thread_mutex progress_mutex;
thread_mutex update_mutex;
boost::function<void(void)> update_cb;
boost::function<void(void)> cancel_cb;
int tile; /* counter for rendered tiles */
int sample; /* counter of rendered samples, global for all tiles */
double start_time, render_start_time;
double total_time, render_time;
double tile_time;
string status;
string substatus;
string sync_status;
string sync_substatus;
volatile bool cancel;
string cancel_message;
volatile bool error;
string error_message;
};
CCL_NAMESPACE_END
#endif /* __UTIL_PROGRESS_H__ */