Printing os thread id, when KMP_AFFINITY is set.

[• Vishakha]

Summary

This patch is applied as requested from CRT, to print os thread id when KMP_AFFINITY is set.

[jlpeyton]

LGTM.

src/i18n/en_US.txt

 AffHWSubsetInvalid           "%1$s: invalid value \"%2$s\", valid format is \"Ns[@N],Nc[@N],Nt "
                              "(nSockets@offset, nCores@offset, nTthreads per core)\"."
 AffHWSubsetUnsupported       "KMP_HW_SUBSET ignored: unsupported architecture."
 AffHWSubsetManyCores         "KMP_HW_SUBSET ignored: too many cores requested."
 SyntaxErrorUsing             "%1$s: syntax error, using %2$s."
 AdaptiveNotSupported         "%1$s: Adaptive locks are not supported; using queuing."
 EnvSyntaxError               "%1$s: Invalid symbols found. Check the value \"%2$s\"."
 EnvSpacesNotAllowed          "%1$s: Spaces between digits are not allowed \"%2$s\"."
-BoundToOSProcSet             "%1$s: pid %2$d thread %3$d bound to OS proc set %4$s"
+BoundToOSProcSet             "%1$s: pid %2$d tid %3$d thread %4$d bound to OS proc set %5$s"
 CnsLoopIncrIllegal           "%1$s error: parallel loop increment and condition are inconsistent."
 NoGompCancellation           "libgomp cancellation is not currently supported."
 AffHWSubsetNonUniform        "KMP_HW_SUBSET ignored: non-uniform topology."
 AffHWSubsetNonThreeLevel     "KMP_HW_SUBSET ignored: only three-level topology is supported."
 AffGranTopGroup              "%1$s: granularity=%2$s is not supported with KMP_TOPOLOGY_METHOD=group. Using \"granularity=fine\"."
 AffGranGroupType             "%1$s: granularity=group is not supported with KMP_AFFINITY=%2$s. Using \"granularity=core\"."
 AffHWSubsetManySockets       "KMP_HW_SUBSET ignored: too many sockets requested."
 AffHWSubsetDeprecated        "KMP_HW_SUBSET \"o\" offset designator deprecated, please use @ prefix for offset value."

src/kmp_affinity.cpp

 # endif /* OMP_40_ENABLED */
 
     KMP_CPU_COPY(th->th.th_affin_mask, mask);
 
     if (__kmp_affinity_verbose) {
         char buf[KMP_AFFIN_MASK_PRINT_LEN];
         __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
           th->th.th_affin_mask);
-        KMP_INFORM(BoundToOSProcSet, "KMP_AFFINITY", (kmp_int32)getpid(), gtid,
-          buf);
+        KMP_INFORM(BoundToOSProcSet, "KMP_AFFINITY", (kmp_int32)getpid(),__kmp_gettid(), gtid, buf);
     }
 
 # if KMP_OS_WINDOWS
     //
     // On Windows* OS, the process affinity mask might have changed.
     // If the user didn't request affinity and this call fails,
     // just continue silently.  See CQ171393.
     //
kmp_affin_mask_t *mask = KMP_CPU_INDEX(__kmp_affinity_masks,
       th->th.th_new_place);
     KMP_CPU_COPY(th->th.th_affin_mask, mask);
     th->th.th_current_place = th->th.th_new_place;
 
     if (__kmp_affinity_verbose) {
         char buf[KMP_AFFIN_MASK_PRINT_LEN];
         __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
           th->th.th_affin_mask);
-        KMP_INFORM(BoundToOSProcSet, "OMP_PROC_BIND", (kmp_int32)getpid(),
-          gtid, buf);
+        KMP_INFORM(BoundToOSProcSet, "OMP_PROC_BIND", (kmp_int32)getpid(), __kmp_gettid(), gtid, buf);
     }
     __kmp_set_system_affinity(th->th.th_affin_mask, TRUE);
 }
 
 # endif /* OMP_40_ENABLED */
 
 
 int
if( __kmp_affinity_uniform_topology() ) {
                 osID = address2os[ coreID * __kmp_nth_per_core + i ].second;
                 KMP_CPU_SET( osID, mask);
             }
         }
         if (__kmp_affinity_verbose) {
             char buf[KMP_AFFIN_MASK_PRINT_LEN];
             __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN, mask);
             KMP_INFORM(BoundToOSProcSet, "KMP_AFFINITY", (kmp_int32)getpid(),
-              tid, buf);
+            __kmp_gettid(), tid, buf);
         }
         __kmp_set_system_affinity( mask, TRUE );
         KMP_CPU_FREE_FROM_STACK(mask);
     } else { // Non-uniform topology
 
         kmp_affin_mask_t *mask;
         KMP_CPU_ALLOC_ON_STACK(mask);
         KMP_CPU_ZERO(mask);
if( __kmp_affinity_uniform_topology() ) {
             }
             __kmp_free( newarr );
         }
 
         if (__kmp_affinity_verbose) {
             char buf[KMP_AFFIN_MASK_PRINT_LEN];
             __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN, mask);
             KMP_INFORM(BoundToOSProcSet, "KMP_AFFINITY", (kmp_int32)getpid(),
-              tid, buf);
+            __kmp_gettid(), tid, buf);
         }
         __kmp_set_system_affinity( mask, TRUE );
         KMP_CPU_FREE_FROM_STACK(mask);
     }
 }
 
 #if KMP_OS_LINUX
 // We don't need this entry for Windows because

src/kmp_wrapper_getpid.h

 #ifndef KMP_WRAPPER_GETPID_H
 #define KMP_WRAPPER_GETPID_H
 
 #if KMP_OS_UNIX
 
     // On Unix-like systems (Linux* OS and OS X*) getpid() is declared in standard headers.
     #include <sys/types.h>
     #include <unistd.h>
+    #include <sys/syscall.h>
+    #if KMP_OS_DARWIN
+    //OS X
+    #define __kmp_gettid() syscall(SYS_thread_selfid)
+    #elif defined(SYS_gettid)
+    // Hopefully other Unix systems define SYS_gettid syscall for getting os thread id
+    #define __kmp_gettid() syscall(SYS_gettid)
+    #else
+    #warning No gettid found, use getpid instead
+    #define __kmp_gettid() getpid()
+    #endif
 
 #elif KMP_OS_WINDOWS
 
     // On Windows* OS _getpid() returns int (not pid_t) and is declared in "process.h".
     #include <process.h>
     // Let us simulate Unix.
     typedef int pid_t;
     #define getpid _getpid
+    #define __kmp_gettid() GetCurrentThreadId()
 
 #else
 
     #error Unknown or unsupported OS.
 
 #endif
 
 /*