[Openmp-commits] [openmp] r258984 - Removing extra empty lines
Jonathan Peyton via Openmp-commits
openmp-commits at lists.llvm.org
Wed Jan 27 12:44:49 PST 2016
Author: jlpeyton
Date: Wed Jan 27 14:44:49 2016
New Revision: 258984
URL: http://llvm.org/viewvc/llvm-project?rev=258984&view=rev
Log:
Removing extra empty lines
Modified:
openmp/trunk/runtime/src/kmp.h
openmp/trunk/runtime/src/kmp_runtime.c
openmp/trunk/runtime/src/kmp_settings.c
openmp/trunk/runtime/src/kmp_tasking.c
openmp/trunk/runtime/src/z_Linux_util.c
openmp/trunk/runtime/src/z_Windows_NT_util.c
Modified: openmp/trunk/runtime/src/kmp.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp.h?rev=258984&r1=258983&r2=258984&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp.h (original)
+++ openmp/trunk/runtime/src/kmp.h Wed Jan 27 14:44:49 2016
@@ -224,7 +224,6 @@ typedef union kmp_team kmp_team_p;
typedef union kmp_info kmp_info_p;
typedef union kmp_root kmp_root_p;
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -2333,7 +2332,6 @@ typedef struct KMP_ALIGN_CACHE kmp_base_
int th_active; // ! sleeping
// 32 bits for TCR/TCW
-
struct cons_header * th_cons; // used for consistency check
/*
Modified: openmp/trunk/runtime/src/kmp_runtime.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_runtime.c?rev=258984&r1=258983&r2=258984&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_runtime.c (original)
+++ openmp/trunk/runtime/src/kmp_runtime.c Wed Jan 27 14:44:49 2016
@@ -54,7 +54,6 @@ char const __kmp_version_omp_api[] = KMP
char const __kmp_version_lock[] = KMP_VERSION_PREFIX "lock type: run time selectable";
#endif /* KMP_DEBUG */
-
#define KMP_MIN( x, y ) ( (x) < (y) ? (x) : (y) )
/* ------------------------------------------------------------------------ */
@@ -611,8 +610,6 @@ __kmp_reset_locks_on_process_detach( int
#ifdef KMP_DEBUG
__kmp_reset_lock( &__kmp_stdio_lock );
#endif // KMP_DEBUG
-
-
}
BOOL WINAPI
@@ -964,7 +961,6 @@ __kmp_reserve_threads( kmp_root_t *root,
new_nthreads = tl_nthreads;
}
-
//
// Check if the threads array is large enough, or needs expanding.
//
@@ -2177,7 +2173,6 @@ __kmp_fork_call(
__kmp_release_bootstrap_lock( &__kmp_forkjoin_lock );
-
#if USE_ITT_BUILD
if ( team->t.t_active_level == 1 // only report frames at level 1
# if OMP_40_ENABLED
@@ -2631,7 +2626,6 @@ __kmp_set_num_threads( int new_nth, int
__kmp_acquire_bootstrap_lock( &__kmp_forkjoin_lock );
-
// Release the extra threads we don't need any more.
for ( f = new_nth; f < hot_team->t.t_nproc; f++ ) {
KMP_DEBUG_ASSERT( hot_team->t.t_threads[f] != NULL );
@@ -2650,7 +2644,6 @@ __kmp_set_num_threads( int new_nth, int
}
#endif
-
__kmp_release_bootstrap_lock( &__kmp_forkjoin_lock );
//
@@ -4194,7 +4187,6 @@ __kmp_allocate_thread( kmp_root_t *root,
// Don't touch th_active_in_pool or th_active.
// The worker thread adjusts those flags as it sleeps/awakens.
//
-
__kmp_thread_pool_nth--;
KA_TRACE( 20, ("__kmp_allocate_thread: T#%d using thread T#%d\n",
@@ -4385,7 +4377,6 @@ __kmp_allocate_thread( kmp_root_t *root,
__kmp_create_worker( new_gtid, new_thr, __kmp_stksize );
KF_TRACE( 10, ("__kmp_allocate_thread: after __kmp_create_worker: %p\n", new_thr ));
-
KA_TRACE( 20, ("__kmp_allocate_thread: T#%d forked T#%d\n", __kmp_get_gtid(), new_gtid ));
KMP_MB();
return new_thr;
@@ -4956,7 +4947,6 @@ __kmp_allocate_team( kmp_root_t *root, i
team->t.t_size_changed = 1;
-
#if KMP_NESTED_HOT_TEAMS
int avail_threads = hot_teams[level].hot_team_nth;
if( new_nproc < avail_threads )
@@ -5307,7 +5297,6 @@ __kmp_free_team( kmp_root_t *root, kmp_t
// Reset pointer to parent team only for non-hot teams.
team->t.t_parent = NULL;
-
/* free the worker threads */
for ( f = 1; f < team->t.t_nproc; ++ f ) {
KMP_DEBUG_ASSERT( team->t.t_threads[ f ] );
@@ -5315,7 +5304,6 @@ __kmp_free_team( kmp_root_t *root, kmp_t
team->t.t_threads[ f ] = NULL;
}
-
/* put the team back in the team pool */
/* TODO limit size of team pool, call reap_team if pool too large */
team->t.t_next_pool = (kmp_team_t*) __kmp_team_pool;
@@ -5399,7 +5387,6 @@ __kmp_free_thread( kmp_info_t *this_th )
}
this_th->th.th_task_state = 0;
-
/* put thread back on the free pool */
TCW_PTR(this_th->th.th_team, NULL);
TCW_PTR(this_th->th.th_root, NULL);
@@ -5707,7 +5694,6 @@ __kmp_reap_thread(
__kmp_release_64(&flag);
}; // if
-
// Terminate OS thread.
__kmp_reap_worker( thread );
@@ -5914,7 +5900,6 @@ __kmp_internal_end(void)
TCW_4(__kmp_init_gtid, FALSE);
KMP_MB(); /* Flush all pending memory write invalidates. */
-
__kmp_cleanup();
#if OMPT_SUPPORT
ompt_fini();
Modified: openmp/trunk/runtime/src/kmp_settings.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_settings.c?rev=258984&r1=258983&r2=258984&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_settings.c (original)
+++ openmp/trunk/runtime/src/kmp_settings.c Wed Jan 27 14:44:49 2016
@@ -3854,7 +3854,6 @@ __kmp_stg_print_gtid_mode( kmp_str_buf_t
}
} // __kmp_stg_print_gtid_mode
-
// -------------------------------------------------------------------------------------------------
// KMP_NUM_LOCKS_IN_BLOCK
// -------------------------------------------------------------------------------------------------
Modified: openmp/trunk/runtime/src/kmp_tasking.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_tasking.c?rev=258984&r1=258983&r2=258984&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_tasking.c (original)
+++ openmp/trunk/runtime/src/kmp_tasking.c Wed Jan 27 14:44:49 2016
@@ -23,7 +23,6 @@
#include "ompt-specific.h"
#endif
-
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
@@ -2476,7 +2475,6 @@ __kmp_wait_to_unref_task_teams(void)
KMP_INIT_YIELD( spins );
-
for (;;) {
done = TRUE;
@@ -2529,8 +2527,6 @@ __kmp_wait_to_unref_task_teams(void)
KMP_YIELD( TCR_4(__kmp_nth) > __kmp_avail_proc );
KMP_YIELD_SPIN( spins ); // Yields only if KMP_LIBRARY=throughput
}
-
-
}
Modified: openmp/trunk/runtime/src/z_Linux_util.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/z_Linux_util.c?rev=258984&r1=258983&r2=258984&view=diff
==============================================================================
--- openmp/trunk/runtime/src/z_Linux_util.c (original)
+++ openmp/trunk/runtime/src/z_Linux_util.c Wed Jan 27 14:44:49 2016
@@ -54,7 +54,6 @@
# include <pthread_np.h>
#endif
-
#include <dirent.h>
#include <ctype.h>
#include <fcntl.h>
@@ -754,7 +753,6 @@ __kmp_launch_worker( void *thr )
return exit_val;
}
-
/* The monitor thread controls all of the threads in the complex */
static void*
@@ -1752,8 +1750,6 @@ static inline void __kmp_suspend_templat
KMP_DEBUG_ASSERT( TCR_4(__kmp_thread_pool_active_nth) >= 0 );
}
deactivated = TRUE;
-
-
}
#if USE_SUSPEND_TIMEOUT
@@ -1813,7 +1809,6 @@ static inline void __kmp_suspend_templat
}
#endif
-
status = pthread_mutex_unlock( &th->th.th_suspend_mx.m_mutex );
KMP_CHECK_SYSFAIL( "pthread_mutex_unlock", status );
@@ -1872,7 +1867,6 @@ static inline void __kmp_resume_template
KF_TRACE( 5, ( "__kmp_resume_template: T#%d exiting, thread T#%d already awake: flag(%p): "
"%u => %u\n",
gtid, target_gtid, flag->get(), old_spin, *flag->get() ) );
-
status = pthread_mutex_unlock( &th->th.th_suspend_mx.m_mutex );
KMP_CHECK_SYSFAIL( "pthread_mutex_unlock", status );
return;
@@ -1892,7 +1886,6 @@ static inline void __kmp_resume_template
}
#endif
-
status = pthread_cond_signal( &th->th.th_suspend_cv.c_cond );
KMP_CHECK_SYSFAIL( "pthread_cond_signal", status );
status = pthread_mutex_unlock( &th->th.th_suspend_mx.m_mutex );
Modified: openmp/trunk/runtime/src/z_Windows_NT_util.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/z_Windows_NT_util.c?rev=258984&r1=258983&r2=258984&view=diff
==============================================================================
--- openmp/trunk/runtime/src/z_Windows_NT_util.c (original)
+++ openmp/trunk/runtime/src/z_Windows_NT_util.c Wed Jan 27 14:44:49 2016
@@ -228,7 +228,6 @@ __kmp_win32_cond_wait( kmp_win32_cond_t
__kmp_win32_mutex_unlock( &cv->waiters_count_lock_ );
__kmp_win32_mutex_unlock( mx );
-
for (;;) {
int wait_done;
@@ -394,7 +393,6 @@ static inline void __kmp_suspend_templat
}
deactivated = TRUE;
-
__kmp_win32_cond_wait( &th->th.th_suspend_cv, &th->th.th_suspend_mx, 0, 0 );
}
else {
@@ -420,7 +418,6 @@ static inline void __kmp_suspend_templat
}
}
-
__kmp_win32_mutex_unlock( &th->th.th_suspend_mx );
KF_TRACE( 30, ("__kmp_suspend_template: T#%d exit\n", th_gtid ) );
@@ -481,7 +478,6 @@ static inline void __kmp_resume_template
KF_TRACE( 5, ( "__kmp_resume_template: T#%d about to wakeup T#%d, reset sleep bit for flag's loc(%p)\n",
gtid, target_gtid, flag->get() ) );
-
__kmp_win32_cond_signal( &th->th.th_suspend_cv );
__kmp_win32_mutex_unlock( &th->th.th_suspend_mx );
@@ -1141,7 +1137,6 @@ __kmp_elapsed_tick( double *t )
void
__kmp_read_system_time( double *delta )
{
-
if (delta != NULL) {
BOOL status;
LARGE_INTEGER now;
@@ -1211,7 +1206,6 @@ __kmp_launch_worker( void *arg )
return exit_val;
}
-
/* The monitor thread controls all of the threads in the complex */
void * __stdcall
More information about the Openmp-commits
mailing list