From b0e4f87fb073d517460fa562d31d94af28ce8bd0 Mon Sep 17 00:00:00 2001 From: Joachim Protze Date: Sat, 17 Feb 2018 09:54:10 +0000 Subject: [PATCH] [OMPT] Omissionin in OMPT Formatting Applying clang-format to the /runtime/src/ folder Differential Revision: https://reviews.llvm.org/D42169 llvm-svn: 325424 --- openmp/runtime/src/kmp_ftn_entry.h | 3 +-- openmp/runtime/src/kmp_gsupport.cpp | 2 +- openmp/runtime/src/kmp_i18n.cpp | 3 ++- openmp/runtime/src/kmp_taskdeps.cpp | 3 ++- openmp/runtime/src/ompt-general.cpp | 5 +++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/openmp/runtime/src/kmp_ftn_entry.h b/openmp/runtime/src/kmp_ftn_entry.h index 72d899efee79..f98ee9d8d55f 100644 --- a/openmp/runtime/src/kmp_ftn_entry.h +++ b/openmp/runtime/src/kmp_ftn_entry.h @@ -345,8 +345,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_MAX_THREADS)(void) { } #if OMP_50_ENABLED -int FTN_STDCALL FTN_CONTROL_TOOL(int command, int modifier, - void *arg) { +int FTN_STDCALL FTN_CONTROL_TOOL(int command, int modifier, void *arg) { #if defined(KMP_STUB) || !OMPT_SUPPORT return -2; #else diff --git a/openmp/runtime/src/kmp_gsupport.cpp b/openmp/runtime/src/kmp_gsupport.cpp index 9fa05e6afbeb..fd1e6b212c89 100644 --- a/openmp/runtime/src/kmp_gsupport.cpp +++ b/openmp/runtime/src/kmp_gsupport.cpp @@ -324,7 +324,7 @@ static enum sched_type schedule, long start, long end, long incr, long chunk_size) { -// Intialize the loop worksharing construct. + // Intialize the loop worksharing construct. KMP_DISPATCH_INIT(loc, *gtid, schedule, start, end, incr, chunk_size, schedule != kmp_sch_static); diff --git a/openmp/runtime/src/kmp_i18n.cpp b/openmp/runtime/src/kmp_i18n.cpp index 40ec1f071d5c..95daac2065eb 100644 --- a/openmp/runtime/src/kmp_i18n.cpp +++ b/openmp/runtime/src/kmp_i18n.cpp @@ -823,7 +823,8 @@ void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, va_list args) { switch (message.type) { case kmp_mt_hint: { format = kmp_i18n_fmt_Hint; - // we cannot skip %1$ and only use %2$ to print the message without the number + // we cannot skip %1$ and only use %2$ to print the message without the + // number fmsg = __kmp_msg_format(format, message.str); } break; case kmp_mt_syserr: { diff --git a/openmp/runtime/src/kmp_taskdeps.cpp b/openmp/runtime/src/kmp_taskdeps.cpp index 0e4fdec2aff6..dedf022ff248 100644 --- a/openmp/runtime/src/kmp_taskdeps.cpp +++ b/openmp/runtime/src/kmp_taskdeps.cpp @@ -478,7 +478,8 @@ kmp_int32 __kmpc_omp_task_with_deps(ident_t *loc_ref, kmp_int32 gtid, if (ompt_enabled.enabled) { OMPT_STORE_RETURN_ADDRESS(gtid); if (!current_task->ompt_task_info.frame.enter_frame) - current_task->ompt_task_info.frame.enter_frame = OMPT_GET_FRAME_ADDRESS(1); + current_task->ompt_task_info.frame.enter_frame = + OMPT_GET_FRAME_ADDRESS(1); if (ompt_enabled.ompt_callback_task_create) { ompt_data_t task_data = ompt_data_none; ompt_callbacks.ompt_callback(ompt_callback_task_create)( diff --git a/openmp/runtime/src/ompt-general.cpp b/openmp/runtime/src/ompt-general.cpp index 8994ad4728bf..532778298c0a 100644 --- a/openmp/runtime/src/ompt-general.cpp +++ b/openmp/runtime/src/ompt-general.cpp @@ -218,8 +218,8 @@ ompt_try_start_tool(unsigned int omp_version, const char *runtime_version) { const char *sep = ":"; #endif - // Try in the current address space #if KMP_OS_DARWIN + // Try in the current address space ret = ompt_tool_darwin(omp_version, runtime_version); #elif OMPT_HAVE_WEAK_ATTRIBUTE ret = ompt_start_tool(omp_version, runtime_version); @@ -501,7 +501,8 @@ OMPT_API_ROUTINE int ompt_get_task_info(int ancestor_level, int *type, ****************************************************************************/ OMPT_API_ROUTINE int ompt_get_num_procs(void) { -// copied from kmp_ftn_entry.h (but modified: OMPT can only be called when runtime is initialized) + // copied from kmp_ftn_entry.h (but modified: OMPT can only be called when + // runtime is initialized) return __kmp_avail_proc; }