diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-22 13:31:19 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-22 13:31:19 +0000 |
| commit | 8d7ae6bdd828ec14f4680d67914200e1e421ec49 (patch) | |
| tree | 26c0e0557942902dec529177106c166afc7fb64e /usr/src/lib/libc | |
| parent | b0c111b3e907993d2032ef8478d3ade9e22a18ca (diff) | |
| parent | bc4c0ff1343a311cc24933908ac6c4455af09031 (diff) | |
| download | illumos-joyent-8d7ae6bdd828ec14f4680d67914200e1e421ec49.tar.gz | |
[illumos-gate merge]
commit bc4c0ff1343a311cc24933908ac6c4455af09031
9880 Race in ZFS parallel mount
commit 975041dd3b571af240661f84d186e0cd0e36217b
9873 SMB logon fails during 1st second after service start
commit ab618543cc6fc4bc273c077ef5d247961cdb29d4
8158 Want named threads API
9857 proc manpages should have LIBRARY section
commit 62f63298eba531d48f87aa8c2089298cb7821962
9881 smbd terminated by SIGABRT after smb_account_free()
Conflicts:
usr/src/uts/common/sys/thread.h
usr/src/uts/common/fs/proc/prvnops.c
usr/src/uts/common/disp/thread.c
usr/src/man/man4/proc.4
usr/src/man/man1/ps.1
usr/src/lib/libc/port/threads/thr.c
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/mapfile-vers | 10 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/threads/thr.c | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers index f51996c646..eee08d81ca 100644 --- a/usr/src/lib/libc/port/mapfile-vers +++ b/usr/src/lib/libc/port/mapfile-vers @@ -77,6 +77,16 @@ $if _x86 && _ELF64 $add amd64 $endif +SYMBOL_VERSION ILLUMOS_0.28 { + protected: + pthread_attr_getname_np; + pthread_attr_setname_np; + pthread_getname_np; + pthread_setname_np; + thr_getname; + thr_setname; +} ILLUMOS_0.27; + SYMBOL_VERSION ILLUMOS_0.27 { # memset_s(3C) and set_constraint_handler_s(3C) protected: abort_handler_s; diff --git a/usr/src/lib/libc/port/threads/thr.c b/usr/src/lib/libc/port/threads/thr.c index 2db0041755..10302bae90 100644 --- a/usr/src/lib/libc/port/threads/thr.c +++ b/usr/src/lib/libc/port/threads/thr.c @@ -2411,14 +2411,11 @@ __nthreads(void) return (curthread->ul_uberdata->nthreads); } -/* "/native/proc/self/lwp/%u/lwpname" w/o stdio */ +/* "/proc/self/lwp/%u/lwpname" w/o stdio */ static void lwpname_path(pthread_t tid, char *buf, size_t bufsize) { - char *brand_root = curthread->ul_uberdata->ub_broot; - - (void) strlcpy(buf, brand_root == NULL ? "" : brand_root, bufsize); - (void) strlcat(buf, "/proc/self/lwp/", bufsize); + (void) strlcpy(buf, "/proc/self/lwp/", bufsize); ultos((uint64_t)tid, 10, buf + strlen(buf)); (void) strlcat(buf, "/lwpname", bufsize); } |