diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2010-02-23 14:21:48 -0500 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2010-02-23 14:22:52 -0500 |
| commit | c76c0f017fa884c4b9a04ff7fa3b43d331c82d84 (patch) | |
| tree | 96927779db344699486933474a48cbb51d61416c /libdimension/raytrace.c | |
| parent | 6260a22ea7a9f08564483ea0beb76b6bdac34bb5 (diff) | |
| download | dimension-c76c0f017fa884c4b9a04ff7fa3b43d331c82d84.tar.xz | |
Determine nthreads in dmnsn_new_scene().
Diffstat (limited to 'libdimension/raytrace.c')
| -rw-r--r-- | libdimension/raytrace.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libdimension/raytrace.c b/libdimension/raytrace.c index 6721a9b..3fa873c 100644 --- a/libdimension/raytrace.c +++ b/libdimension/raytrace.c @@ -19,7 +19,6 @@ *************************************************************************/ #include "dimension_impl.h" -#include <unistd.h> /* For sysconf */ /* * Boilerplate for multithreading @@ -109,20 +108,16 @@ static void *dmnsn_raytrace_scene_multithread_thread(void *ptr); static int dmnsn_raytrace_scene_multithread(dmnsn_raytrace_payload *payload) { - int i, j, nthreads = payload->scene->nthreads; + int i, j; void *ptr; int retval = 0; dmnsn_raytrace_payload *payloads; pthread_t *threads; - if (!nthreads) { - /* Find the number of processors/cores running (TODO: do this portably) */ - nthreads = sysconf(_SC_NPROCESSORS_ONLN); - if (nthreads < 1) { - nthreads = 1; - } - /* End non-portable section */ - } + unsigned int nthreads = payload->scene->nthreads; + /* Sanity check */ + if (nthreads < 1) + nthreads = 1; payloads = malloc(nthreads*sizeof(dmnsn_raytrace_payload)); if (!payloads) { |