OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

random_shuffle.h: (parallel_random_shuffle_drs) Get the actual number of threads after entering...

Browse Source 
2008-06-05  Johannes Singler  <singler@ira.uka.de>

        * include/parallel/random_shuffle.h:
        (parallel_random_shuffle_drs) Get the actual number of
        threads after entering the parallel region. Indentation.
        * include/parallel/algo.h: (random_shuffle(begin, end))
        Add namespace qualification to avoid ambiguity.

From-SVN: r136406
This commit is contained in:
Johannes Singler 2008-06-05 15:47:17 +00:00 committed by Johannes Singler
parent bd7415dbca
commit 3611e1767d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2008-06-05 Johannes Singler <singler@ira.uka.de>
* include/parallel/random_shuffle.h:
(parallel_random_shuffle_drs) Get the actual number of
threads after entering the parallel region. Indentation.
* include/parallel/algo.h: (random_shuffle(begin, end))
Add namespace qualification to avoid ambiguity.
2008-06-04 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/pb_ds/assoc_container.hpp: Change allocator typedef

2
libstdc++-v3/include/parallel/algo.h
View File

@ -1649,7 +1649,7 @@ namespace __parallel
{
c_rand_number<> r;
// Parallelization still possible.
random_shuffle(begin, end, r);
__gnu_parallel::random_shuffle(begin, end, r);
}
// Parallel algorithm for random access iterators.

7
libstdc++-v3/include/parallel/random_shuffle.h
View File

@ -333,6 +333,7 @@ template<typename RandomAccessIterator, typename RandomNumberGenerator>
# pragma omp parallel num_threads(num_threads)
{
thread_index_t num_threads = omp_get_num_threads();
# pragma omp single
{
pus = new DRSSorterPU<RandomAccessIterator, random_number>
@ -375,9 +376,9 @@ template<typename RandomAccessIterator, typename RandomNumberGenerator>
}
starts[num_threads] = start;
} //single
// Now shuffle in parallel.
parallel_random_shuffle_drs_pu(pus);
}
// Now shuffle in parallel.
parallel_random_shuffle_drs_pu(pus);
} // parallel
delete[] starts;
delete[] sd.bin_proc;