This is an archive of the discontinued LLVM Phabricator instance.

Differential D92660

[OpenMP] Fix too long name for shm segment on macOS
ClosedPublic

Authored by jlpeyton on Dec 4 2020, 8:34 AM.

Details

Reviewers
AndreyChurbanov
terdner
jdoerfert
Commits
rG9b7d6a6bffce: [OpenMP] Fix too long name for shm segment on macOS
Summary

For macOS the shm segment name is apparently too long with the user id added to the end. Remove the user id component of the shm segment name and just use the pid like before.

Diff Detail

Event Timeline

jlpeyton created this revision.Dec 4 2020, 8:34 AM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptDec 4 2020, 8:34 AM
jlpeyton requested review of this revision.Dec 4 2020, 8:34 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptDec 4 2020, 8:34 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B81104: Diff 309543.Dec 4 2020, 9:30 AM
AndreyChurbanov accepted this revision.Dec 9 2020, 5:50 AM

LGTM

This revision is now accepted and ready to land.Dec 9 2020, 5:50 AM
Closed by commit rG9b7d6a6bffce: [OpenMP] Fix too long name for shm segment on macOS (authored by jlpeyton). · Explain WhyDec 9 2020, 12:32 PM
This revision was automatically updated to reflect the committed changes.
jlpeyton added a commit: rG9b7d6a6bffce: [OpenMP] Fix too long name for shm segment on macOS.

Revision Contents

PathSize
openmp/
runtime/
src/
11 lines

Diff 310612

openmp/runtime/src/kmp_runtime.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6,350 Lines • ▼ Show 20 Lines
// Library registration stuff. // Library registration stuff.
static long __kmp_registration_flag = 0; static long __kmp_registration_flag = 0;
// Random value used to indicate library initialization. // Random value used to indicate library initialization.
static char *__kmp_registration_str = NULL; static char *__kmp_registration_str = NULL;
// Value to be saved in env var __KMP_REGISTERED_LIB_<pid>. // Value to be saved in env var __KMP_REGISTERED_LIB_<pid>.
static inline char *__kmp_reg_status_name() { static inline char *__kmp_reg_status_name() {
/* On RHEL 3u5 if linked statically, getpid() returns different values in /* On RHEL 3u5 if linked statically, getpid() returns different values in
each thread. If registration and unregistration go in different threads each thread. If registration and unregistration go in different threads
(omp_misc_other_root_exit.cpp test case), the name of registered_lib_env (omp_misc_other_root_exit.cpp test case), the name of registered_lib_env
env var can not be found, because the name will contain different pid. */ env var can not be found, because the name will contain different pid. */
#if KMP_OS_UNIX && KMP_DYNAMIC_LIB // shared memory is with dynamic library // macOS* complains about name being too long with additional getuid()
#if KMP_OS_UNIX && !KMP_OS_DARWIN && KMP_DYNAMIC_LIB
return __kmp_str_format("__KMP_REGISTERED_LIB_%d_%d", (int)getpid(), return __kmp_str_format("__KMP_REGISTERED_LIB_%d_%d", (int)getpid(),
(int)getuid()); (int)getuid());
#else #else
return __kmp_str_format("__KMP_REGISTERED_LIB_%d", (int)getpid()); return __kmp_str_format("__KMP_REGISTERED_LIB_%d", (int)getpid());
#endif #endif
} // __kmp_reg_status_get } // __kmp_reg_status_get
void __kmp_register_library_startup(void) { void __kmp_register_library_startup(void) {
▲ Show 20 Lines • Show All 2,099 Lines • Show Last 20 Lines