master: openmp and bthread: parallel_setup(1, nullptr, nullptr) after…

… multi-threading.
coin-or · Mar 14, 2024 · 8de3bf3 · 8de3bf3
1 parent bd6a54f
commit 8de3bf3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/example/multi_thread/bthread/get_started.cpp b/example/multi_thread/bthread/get_started.cpp
@@ -222,6 +222,7 @@ bool get_started(void)
    //
    // sequential_execution_
    sequential_execution_ = true;
+   CppAD::thread_alloc::parallel_setup(1, nullptr, nullptr);
    ok &= ! in_parallel();
    //
    // hold_memory

diff --git a/example/multi_thread/openmp/get_started.cpp b/example/multi_thread/openmp/get_started.cpp
@@ -120,7 +120,7 @@ bool get_started(void)
    //
    // parallel_setup
    omp_set_num_threads( int(num_threads) );
-   assert( ! in_parallel() );
+   ok &= ! in_parallel();
    CppAD::thread_alloc::parallel_setup(
       num_threads, in_parallel, thread_number
    );
@@ -144,8 +144,8 @@ bool get_started(void)
    //
    // hold_memory
    // free memory for other threads before this (the master thread)
-   assert( ! in_parallel() );
-   assert( thread_number() == 0 );
+   CppAD::thread_alloc::parallel_setup(1, nullptr, nullptr);
+   ok &= ! in_parallel();
    CppAD::thread_alloc::hold_memory(false);
    for(size_t i = 1; i < num_threads; ++i)
       CppAD::thread_alloc::free_available(i);

diff --git a/example/multi_thread/pthread/get_started.cpp b/example/multi_thread/pthread/get_started.cpp
@@ -133,9 +133,10 @@ namespace {
       //
       // phtread_setspecific, ok
       if( thread_num != 0 )
-      rc  = pthread_setspecific(thread_specific_key_, &thread_num);
-      ok &= rc == 0;
-      ok &= thread_number() == thread_num;
+      {  rc  = pthread_setspecific(thread_specific_key_, &thread_num);
+         ok &= rc == 0;
+         ok &= thread_number() == thread_num;
+      }
       //
       // Jac
       for(size_t j = j_begin; j < j_end; ++j)