2008-05-07 Johannes Singler <singler@ira.uka.de>

       * include/parallel/quicksort.h:
       (parallel_sort_qs_conquer) Explicitly request number of threads
       in the parallel clause.
       (parallel_sort_qs) Remove setting the number of threads globally.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135038 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ecba4a3..6bc43b8 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-07  Johannes Singler  <singler@ira.uka.de>
+
+       * include/parallel/quicksort.h:
+       (parallel_sort_qs_conquer) Explicitly request number of threads
+       in the parallel clause.
+       (parallel_sort_qs) Remove setting the number of threads globally. 
+
 2008-05-06  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/std/mutex (mutex::mutex): Fix usage of initializing macro.

diff --git a/libstdc++-v3/include/parallel/quicksort.h b/libstdc++-v3/include/parallel/quicksort.h
index 8ef5b7c..844a5bf 100644 (file)
--- a/libstdc++-v3/include/parallel/quicksort.h
+++ b/libstdc++-v3/include/parallel/quicksort.h
@@ -138,7 +138,7 @@ namespace __gnu_parallel
                                _Settings::get().sort_qs_num_samples_preset,
                                num_threads);
 
-#pragma omp parallel sections
+#pragma omp parallel sections num_threads(2)
       {
 #pragma omp section
        parallel_sort_qs_conquer(begin, begin + split,
@@ -177,9 +177,6 @@ namespace __gnu_parallel
       if (num_threads > n)
         num_threads = static_cast<thread_index_t>(n);
 
-      // Hard to avoid.
-      omp_set_num_threads(num_threads);
-
       parallel_sort_qs_conquer(begin, begin + n, comp, num_threads);
     }