diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-11 02:31:16 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-11 02:31:16 +0400 |
| commit | 8148d7b1df54f103eec60fcae12fb5000e225c7b (patch) | |
| tree | 1dfc590b8017dbc21ec5a42766a0e9c9658e03c9 /intern/cycles/util/util_task.h | |
| parent | d35d0e38ce3ab421880b01fe5e80cb61a1323c45 (diff) | |
Cycles: reviewed the task scheduler code and fixed (hopefully all) windows threading problems.
Diffstat (limited to 'intern/cycles/util/util_task.h')
| -rw-r--r-- | intern/cycles/util/util_task.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index 6b7562c2267..401a503f540 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -73,12 +73,13 @@ public: protected: friend class TaskScheduler; - void done_increase(int done); + void num_decrease(int done); + void num_increase(); - thread_mutex done_mutex; - thread_condition_variable done_cond; + thread_mutex num_mutex; + thread_condition_variable num_cond; - volatile int num, num_done; + volatile int num; volatile bool do_cancel; }; |