[OpenMP] Fix issue with directives used in a macro.

[sfantao]

Summary

If directives are used in a macro, clang complains with:

src/projects/openmp/runtime/src/kmp_runtime.c:7486:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive]
#if KMP_USE_MONITOR

This patch fixes two occurrences of the issue in kmp_runtime.cpp.

[Hahnfeld]

I think the format strings and arguments should be reformatted as they where before rL283577

[sfantao]

• Use string format used before.

[Hahnfeld]

LGTM

[sfantao]

Hi Jonas,

Thanks for the quick review!

In D25823#575301, @Hahnfeld wrote:

I think the format strings and arguments should be reformatted as they where before rL283577

Sure, it makes sense. Fixed it in the last diff. It is not exactly the same as before as I am using LLVM code style guidelines in this change.

Thanks again!
Samuel

runtime/src/kmp_runtime.c

#if KMP_USE_MONITOR
     set__bt_intervals_team( thread->th.th_serial_team, 0, bt_intervals );
 #endif
 
     /* Set whether blocktime has been set to "TRUE" */
     bt_set = TRUE;
 
     set__bt_set_team( thread->th.th_team, tid, bt_set );
     set__bt_set_team( thread->th.th_serial_team, 0, bt_set );
-    KF_TRACE(10, ( "kmp_set_blocktime: T#%d(%d:%d), blocktime=%d"
 #if KMP_USE_MONITOR
-                   ", bt_intervals=%d, monitor_updates=%d"
-#endif
-                   "\n",
-                   __kmp_gtid_from_tid(tid, thread->th.th_team), thread->th.th_team->t.t_id, tid, blocktime
-#if KMP_USE_MONITOR
-                   , bt_intervals, __kmp_monitor_wakeups
+    KF_TRACE(10, ("kmp_set_blocktime: T#%d(%d:%d), blocktime=%d, "
+                  "bt_intervals=%d, monitor_updates=%d\n",
+                  __kmp_gtid_from_tid(tid, thread->th.th_team),
+                  thread->th.th_team->t.t_id, tid, blocktime, bt_intervals,
+                  __kmp_monitor_wakeups));
+#else
+    KF_TRACE(10, ("kmp_set_blocktime: T#%d(%d:%d), blocktime=%d\n",
+                  __kmp_gtid_from_tid(tid, thread->th.th_team),
+                  thread->th.th_team->t.t_id, tid, blocktime));
 #endif
-                 ) );
 }
 
 void
 __kmp_aux_set_defaults(
     char const * str,
     int          len
 ) {
     if ( ! __kmp_init_serial ) {