diff --git a/libs/utils/include/utils/JobSystem.h b/libs/utils/include/utils/JobSystem.h index b6874c619a..ecc554e28e 100644 --- a/libs/utils/include/utils/JobSystem.h +++ b/libs/utils/include/utils/JobSystem.h @@ -503,7 +503,7 @@ JobSystem::Job* parallel_for(JobSystem& js, JobSystem::Job* parent, using JobData = details::ParallelForJobData; JobData jobData(start, count, 0, std::move(functor), splitter); return js.createJob(parent, std::move(jobData)); -}; +} // parallel jobs with pointer/count template @@ -515,7 +515,7 @@ JobSystem::Job* parallel_for(JobSystem& js, JobSystem::Job* parent, using JobData = details::ParallelForJobData; JobData jobData(0, count, 0, std::move(user), splitter); return js.createJob(parent, std::move(jobData)); -}; +} // parallel jobs with start/count indices + sequential 'reduce' @@ -530,7 +530,7 @@ JobSystem::Job* parallel_for(JobSystem& js, JobSystem::Job* parent, finish(js, parallelJob); }); return wrapper; -}; +} // parallel jobs with pointer/count + sequential 'reduce' template @@ -547,21 +547,21 @@ JobSystem::Job* parallel_for(JobSystem& js, JobSystem::Job* parent, finish(js, parallelJob); }); return wrapper; -}; +} // parallel jobs on a Slice<> template JobSystem::Job* parallel_for(JobSystem& js, JobSystem::Job* parent, utils::Slice slice, F functor, const S& splitter) noexcept { return parallel_for(js, parent, slice.data(), slice.size(), functor, splitter); -}; +} // parallel jobs on a Slice<> + sequential 'reduce' template JobSystem::Job* parallel_for(JobSystem& js, JobSystem::Job* parent, utils::Slice slice, F functor, const S& splitter, R finish) noexcept { return parallel_for(js, parent, slice.data(), slice.size(), functor, splitter, finish); -}; +} template diff --git a/libs/utils/src/JobSystem.cpp b/libs/utils/src/JobSystem.cpp index 9dbfc456b8..e10d323a63 100644 --- a/libs/utils/src/JobSystem.cpp +++ b/libs/utils/src/JobSystem.cpp @@ -136,10 +136,10 @@ JobSystem::JobSystem(size_t threadCount, size_t adoptableThreadsCount) noexcept auto& states = mThreadStates; #pragma nounroll - for (size_t i=0, n= states.size() ; i < n ; i++) { - auto &state = states[i]; + for (size_t i = 0, n = states.size(); i < n; i++) { + auto& state = states[i]; state.rndGen = default_random_engine(rd()); - state.mask = uint32_t(1UL << i); + state.mask = uint32_t(1UL << i); state.js = this; if (i < hardwareThreadCount) { // don't start a thread of adoptable thread slots