Merge branch 'master' of github.com:flame/blis

This commit is contained in:
Field G. Van Zee
2014-11-26 17:25:24 -06:00

View File

@@ -52,6 +52,7 @@ herk_thrinfo_t BLIS_HERK_SINGLE_THREADED;
thread_comm_t BLIS_SINGLE_COMM;
#ifdef BLIS_ENABLE_PTHREADS
pthread_mutex_t initialize_mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t mem_manager_mutex;
#endif
@@ -80,6 +81,9 @@ err_t bli_init( void )
// BEGIN CRITICAL SECTION
#ifdef BLIS_ENABLE_OPENMP
_Pragma( "omp critical (init)" )
#endif
#ifdef BLIS_ENABLE_PTHREADS
pthread_mutex_lock( &mem_manager_mutex );
#endif
{
@@ -114,6 +118,9 @@ err_t bli_init( void )
// END CRITICAL SECTION
}
#ifdef BLIS_ENABLE_PTHREADS
pthread_mutex_unlock( &mem_manager_mutex );
#endif
#ifdef BLIS_ENABLE_PTHREADS
pthread_mutex_init( &mem_manager_mutex, NULL );
@@ -146,6 +153,9 @@ err_t bli_finalize( void )
// BEGIN CRITICAL SECTION
#ifdef BLIS_ENABLE_OPENMP
_Pragma( "omp critical (init)" )
#endif
#ifdef BLIS_ENABLE_PTHREADS
pthread_mutex_lock( &mem_manager_mutex );
#endif
{
@@ -175,6 +185,9 @@ err_t bli_finalize( void )
// END CRITICAL SECTION
}
#ifdef BLIS_ENABLE_PTHREADS
pthread_mutex_unlock( &mem_manager_mutex );
#endif
#ifdef BLIS_ENABLE_PTHREADS
pthread_mutex_destroy( &mem_manager_mutex );