diff options
Diffstat (limited to 'intern/cycles/util/util_task.cpp')
| -rw-r--r-- | intern/cycles/util/util_task.cpp | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp index d56553d1d4a..d86aa8a4a46 100644 --- a/intern/cycles/util/util_task.cpp +++ b/intern/cycles/util/util_task.cpp @@ -18,6 +18,7 @@ #include "util_foreach.h" #include "util_system.h" #include "util_task.h" +#include "util_time.h" //#define THREADING_DEBUG_ENABLED @@ -34,6 +35,7 @@ CCL_NAMESPACE_BEGIN TaskPool::TaskPool() { + num_tasks_handled = 0; num = 0; do_cancel = false; } @@ -58,7 +60,7 @@ void TaskPool::push(const TaskRunFunction& run, bool front) push(new Task(run), front); } -void TaskPool::wait_work() +void TaskPool::wait_work(Summary *stats) { thread_scoped_lock num_lock(num_mutex); @@ -89,7 +91,7 @@ void TaskPool::wait_work() /* if found task, do it, otherwise wait until other tasks are done */ if(found_entry) { /* run task */ - work_entry.task->run(); + work_entry.task->run(0); /* delete task */ delete work_entry.task; @@ -108,6 +110,11 @@ void TaskPool::wait_work() THREADING_DEBUG("num==%d, condition wait done in TaskPool::wait_work !found_entry\n", num); } } + + if(stats != NULL) { + stats->time_total = time_dt() - start_time; + stats->num_tasks_handled = num_tasks_handled; + } } void TaskPool::cancel() @@ -158,7 +165,11 @@ void TaskPool::num_decrease(int done) void TaskPool::num_increase() { thread_scoped_lock num_lock(num_mutex); + if(num_tasks_handled == 0) { + start_time = time_dt(); + } num++; + num_tasks_handled++; THREADING_DEBUG("num==%d, notifying all in TaskPool::num_increase\n", num); num_cond.notify_all(); } @@ -192,7 +203,7 @@ void TaskScheduler::init(int num_threads) threads.resize(num_threads); for(size_t i = 0; i < threads.size(); i++) - threads[i] = new thread(function_bind(&TaskScheduler::thread_run, i)); + threads[i] = new thread(function_bind(&TaskScheduler::thread_run, i + 1)); } users++; @@ -206,8 +217,10 @@ void TaskScheduler::exit() if(users == 0) { /* stop all waiting threads */ + TaskScheduler::queue_mutex.lock(); do_exit = true; TaskScheduler::queue_cond.notify_all(); + TaskScheduler::queue_mutex.unlock(); /* delete threads */ foreach(thread *t, threads) { @@ -219,6 +232,12 @@ void TaskScheduler::exit() } } +void TaskScheduler::free_memory() +{ + assert(users == 0); + threads.free_memory(); +} + bool TaskScheduler::thread_wait_pop(Entry& entry) { thread_scoped_lock queue_lock(queue_mutex); @@ -237,7 +256,7 @@ bool TaskScheduler::thread_wait_pop(Entry& entry) return true; } -void TaskScheduler::thread_run(int /*thread_id*/) +void TaskScheduler::thread_run(int thread_id) { Entry entry; @@ -246,7 +265,7 @@ void TaskScheduler::thread_run(int /*thread_id*/) /* keep popping off tasks */ while(thread_wait_pop(entry)) { /* run task */ - entry.task->run(); + entry.task->run(thread_id); /* delete task */ delete entry.task; @@ -413,7 +432,7 @@ void DedicatedTaskPool::thread_run() /* keep popping off tasks */ while(thread_wait_pop(task)) { /* run task */ - task->run(); + task->run(0); /* delete task */ delete task; @@ -444,5 +463,13 @@ void DedicatedTaskPool::clear() num_decrease(done); } +string TaskPool::Summary::full_report() const +{ + string report = ""; + report += string_printf("Total time: %f\n", time_total); + report += string_printf("Tasks handled: %d\n", num_tasks_handled); + return report; +} + CCL_NAMESPACE_END |