summaryrefslogtreecommitdiffstats
path: root/libdimension/ray_trace.c
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2014-04-23 18:12:53 -0400
committerTavian Barnes <tavianator@tavianator.com>2014-04-23 22:41:21 -0400
commit0acff566213fdddbc8f4561887aced121f82dc26 (patch)
tree97620a5ef72efc783d35817e4349a9f8a1d8cff8 /libdimension/ray_trace.c
parent3ce3ed46f5cd95bfca4f9303c93859fac54476bb (diff)
downloaddimension-0acff566213fdddbc8f4561887aced121f82dc26.tar.xz
future: Add a race-free way to examine a partial computation.
This allows safe OpenGL previews, for example. dmnsn_future* learned the dmnsn_future_{pause,resume}() functions which cause all worker threads to block. render.test now survives Helgrind with no errors.
Diffstat (limited to 'libdimension/ray_trace.c')
-rw-r--r--libdimension/ray_trace.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libdimension/ray_trace.c b/libdimension/ray_trace.c
index 7587e2c..c9f7da4 100644
--- a/libdimension/ray_trace.c
+++ b/libdimension/ray_trace.c
@@ -1,5 +1,5 @@
/*************************************************************************
- * Copyright (C) 2010-2012 Tavian Barnes <tavianator@tavianator.com> *
+ * Copyright (C) 2010-2014 Tavian Barnes <tavianator@tavianator.com> *
* *
* This file is part of The Dimension Library. *
* *
@@ -89,7 +89,8 @@ dmnsn_ray_trace_scene_thread(void *ptr)
/* Time the render itself */
dmnsn_timer_start(&payload->scene->render_timer);
- int ret = dmnsn_execute_concurrently(dmnsn_ray_trace_scene_concurrent,
+ int ret = dmnsn_execute_concurrently(payload->future,
+ dmnsn_ray_trace_scene_concurrent,
payload, payload->scene->nthreads);
dmnsn_timer_stop(&payload->scene->render_timer);