From owner-svn-ports-head@freebsd.org Wed Jul 10 01:16:28 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76A8015EAC87; Wed, 10 Jul 2019 01:16:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 144338FD78; Wed, 10 Jul 2019 01:16:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B19AB7ED2; Wed, 10 Jul 2019 01:16:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6A1GQmj003006; Wed, 10 Jul 2019 01:16:26 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6A1GP5w002995; Wed, 10 Jul 2019 01:16:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201907100116.x6A1GP5w002995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 10 Jul 2019 01:16:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506330 - in head: audio/webrtc-audio-processing/files devel/android-tools-adb/files devel/android-tools-fastboot/files devel/android-tools-simpleperf/files multimedia/gmmlib/files mult... X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: audio/webrtc-audio-processing/files devel/android-tools-adb/files devel/android-tools-fastboot/files devel/android-tools-simpleperf/files multimedia/gmmlib/files multimedia/libva-intel-media-... X-SVN-Commit-Revision: 506330 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 144338FD78 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2019 01:16:28 -0000 Author: jbeich Date: Wed Jul 10 01:16:24 2019 New Revision: 506330 URL: https://svnweb.freebsd.org/changeset/ports/506330 Log: Add more gettid() aliases to my ports https://man.openbsd.org/getthrid.2 https://illumos.org/man/3C/thr_self Modified: head/audio/webrtc-audio-processing/files/patch-webrtc_base_platform__thread.cc (contents, props changed) head/devel/android-tools-adb/files/patch-base_logging.cpp (contents, props changed) head/devel/android-tools-adb/files/patch-libcutils_threads.cpp (contents, props changed) head/devel/android-tools-fastboot/files/patch-base_logging.cpp (contents, props changed) head/devel/android-tools-simpleperf/files/patch-base_logging.cpp (contents, props changed) head/multimedia/gmmlib/files/patch-thread-id (contents, props changed) head/multimedia/libva-intel-media-driver/files/patch-thread-id (contents, props changed) head/multimedia/libva/files/patch-va_va__trace.c (contents, props changed) Modified: head/audio/webrtc-audio-processing/files/patch-webrtc_base_platform__thread.cc ============================================================================== --- head/audio/webrtc-audio-processing/files/patch-webrtc_base_platform__thread.cc Wed Jul 10 01:16:13 2019 (r506329) +++ head/audio/webrtc-audio-processing/files/patch-webrtc_base_platform__thread.cc Wed Jul 10 01:16:24 2019 (r506330) @@ -16,7 +16,7 @@ namespace rtc { PlatformThreadId CurrentThreadId() { -@@ -32,9 +38,15 @@ PlatformThreadId CurrentThreadId() { +@@ -32,6 +38,12 @@ PlatformThreadId CurrentThreadId() { ret = syscall(__NR_gettid); #elif defined(WEBRTC_ANDROID) ret = gettid(); @@ -24,16 +24,12 @@ + ret = pthread_getthreadid_np(); +#elif defined(__NetBSD__) // WEBRTC_BSD + ret = _lwp_self(); ++#elif defined(__OpenBSD__) // WEBRTC_BSD ++ ret = getthrid(); #else // Default implementation for nacl and solaris. -- ret = reinterpret_cast(pthread_self()); -+ // WEBRTC_BSD: pthread_t is a pointer, so cannot be casted to pid_t -+ // (aka int32_t) on 64-bit archs. Required on OpenBSD. -+ ret = reinterpret_cast(pthread_self()); - #endif - #endif // defined(WEBRTC_POSIX) - RTC_DCHECK(ret); -@@ -76,6 +90,10 @@ void SetCurrentThreadName(const char* name) { + ret = reinterpret_cast(pthread_self()); +@@ -76,6 +88,10 @@ void SetCurrentThreadName(const char* name) { prctl(PR_SET_NAME, reinterpret_cast(name)); #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) pthread_setname_np(name); Modified: head/devel/android-tools-adb/files/patch-base_logging.cpp ============================================================================== --- head/devel/android-tools-adb/files/patch-base_logging.cpp Wed Jul 10 01:16:13 2019 (r506329) +++ head/devel/android-tools-adb/files/patch-base_logging.cpp Wed Jul 10 01:16:24 2019 (r506330) @@ -18,7 +18,7 @@ #include #include #include -@@ -71,6 +72,12 @@ +@@ -71,6 +72,16 @@ #include #elif defined(_WIN32) #include @@ -26,12 +26,16 @@ +#include +#elif defined(__NetBSD__) +#include -+#else // OpenBSD, Solaris ++#elif defined(__OpenBSD__) ++#include ++#elif defined(__sun) ++#include ++#else // fallback +#include #endif #if defined(_WIN32) -@@ -88,6 +97,12 @@ static thread_id GetThreadId() { +@@ -88,6 +97,16 @@ static thread_id GetThreadId() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -39,7 +43,11 @@ + return pthread_getthreadid_np(); +#elif defined(__NetBSD__) + return _lwp_self(); -+#else // OpenBSD, Solaris ++#elif defined(__OpenBSD__) ++ return getthrid(); ++#elif defined(__sun) ++ return thr_self(); ++#else // fallback + return (intptr_t) pthread_self(); #endif } Modified: head/devel/android-tools-adb/files/patch-libcutils_threads.cpp ============================================================================== --- head/devel/android-tools-adb/files/patch-libcutils_threads.cpp Wed Jul 10 01:16:13 2019 (r506329) +++ head/devel/android-tools-adb/files/patch-libcutils_threads.cpp Wed Jul 10 01:16:24 2019 (r506330) @@ -1,6 +1,6 @@ --- libcutils/threads.cpp.orig 2018-07-13 19:58:45 UTC +++ libcutils/threads.cpp -@@ -24,11 +24,17 @@ +@@ -24,11 +24,21 @@ #include #include #include @@ -8,17 +8,21 @@ +#include +#elif defined(__NetBSD__) +#include ++#elif defined(__OpenBSD__) ++#include ++#elif defined(__sun) ++#include #elif defined(__linux__) && !defined(__ANDROID__) #include #include #elif defined(_WIN32) #include -+#else // OpenBSD, Solaris ++#else // fallback +#include #endif // No definition needed for Android because we'll just pick up bionic's copy. -@@ -38,10 +46,16 @@ pid_t gettid() { +@@ -38,10 +46,20 @@ pid_t gettid() { uint64_t tid; pthread_threadid_np(NULL, &tid); return tid; @@ -26,11 +30,15 @@ + return pthread_getthreadid_np(); +#elif defined(__NetBSD__) + return _lwp_self(); ++#elif defined(__OpenBSD__) ++ return getthrid(); ++#elif defined(__sun) ++ return thr_self(); #elif defined(__linux__) return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); -+#else // OpenBSD, Solaris ++#else // fallback + return (intptr_t) pthread_self(); #endif } Modified: head/devel/android-tools-fastboot/files/patch-base_logging.cpp ============================================================================== --- head/devel/android-tools-fastboot/files/patch-base_logging.cpp Wed Jul 10 01:16:13 2019 (r506329) +++ head/devel/android-tools-fastboot/files/patch-base_logging.cpp Wed Jul 10 01:16:24 2019 (r506330) @@ -18,7 +18,7 @@ #include #include #include -@@ -71,6 +72,12 @@ +@@ -71,6 +72,16 @@ #include #elif defined(_WIN32) #include @@ -26,12 +26,16 @@ +#include +#elif defined(__NetBSD__) +#include -+#else // OpenBSD, Solaris ++#elif defined(__OpenBSD__) ++#include ++#elif defined(__sun) ++#include ++#else // fallback +#include #endif #if defined(_WIN32) -@@ -88,6 +97,12 @@ static thread_id GetThreadId() { +@@ -88,6 +97,16 @@ static thread_id GetThreadId() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -39,7 +43,11 @@ + return pthread_getthreadid_np(); +#elif defined(__NetBSD__) + return _lwp_self(); -+#else // OpenBSD, Solaris ++#elif defined(__OpenBSD__) ++ return getthrid(); ++#elif defined(__sun) ++ return thr_self(); ++#else // fallback + return (intptr_t) pthread_self(); #endif } Modified: head/devel/android-tools-simpleperf/files/patch-base_logging.cpp ============================================================================== --- head/devel/android-tools-simpleperf/files/patch-base_logging.cpp Wed Jul 10 01:16:13 2019 (r506329) +++ head/devel/android-tools-simpleperf/files/patch-base_logging.cpp Wed Jul 10 01:16:24 2019 (r506330) @@ -18,7 +18,7 @@ #include #include #include -@@ -71,6 +72,12 @@ +@@ -71,6 +72,16 @@ #include #elif defined(_WIN32) #include @@ -26,20 +26,28 @@ +#include +#elif defined(__NetBSD__) +#include -+#else ++#elif defined(__OpenBSD__) ++#include ++#elif defined(__sun) ++#include ++#else // fallback +#include #endif #if defined(_WIN32) -@@ -88,6 +97,12 @@ static thread_id GetThreadId() { +@@ -88,6 +97,16 @@ static thread_id GetThreadId() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); -+#elif defined(__NetBSD__) -+ return _lwp_self(); +#elif defined(__DragonFly__) || defined(__FreeBSD__) + return pthread_getthreadid_np(); -+#else ++#elif defined(__NetBSD__) ++ return _lwp_self(); ++#elif defined(__OpenBSD__) ++ return getthrid(); ++#elif defined(__sun) ++ return thr_self(); ++#else // fallback + return (intptr_t) pthread_self(); #endif } Modified: head/multimedia/gmmlib/files/patch-thread-id ============================================================================== --- head/multimedia/gmmlib/files/patch-thread-id Wed Jul 10 01:16:13 2019 (r506329) +++ head/multimedia/gmmlib/files/patch-thread-id Wed Jul 10 01:16:24 2019 (r506330) @@ -2,7 +2,7 @@ Add more BSDs and update to modern way to get thread I --- Source/GmmLib/Utility/GmmLog/spdlog/details/os.h.orig 2018-09-28 18:59:39 UTC +++ Source/GmmLib/Utility/GmmLog/spdlog/details/os.h -@@ -39,9 +39,13 @@ +@@ -39,9 +39,16 @@ #include #include @@ -15,10 +15,13 @@ Add more BSDs and update to modern way to get thread I +#elif defined(__NetBSD__) +#include // for _lwp_self + ++#elif defined(__sun) ++#include // for thr_self ++ #else #include -@@ -302,10 +308,10 @@ inline size_t thread_id() +@@ -302,10 +308,14 @@ inline size_t thread_id() # define SYS_gettid __NR_gettid # endif return static_cast(syscall(SYS_gettid)); @@ -30,6 +33,10 @@ Add more BSDs and update to modern way to get thread I + return static_cast(pthread_getthreadid_np()); +#elif defined(__NetBSD__) + return static_cast(_lwp_self()); ++#elif defined(__OpenBSD__) ++ return getthrid(); ++#elif defined(__sun) ++ return thr_self(); #else //Default to standard C++11 (OSX and other Unix) return static_cast(std::hash()(std::this_thread::get_id())); #endif Modified: head/multimedia/libva-intel-media-driver/files/patch-thread-id ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-thread-id Wed Jul 10 01:16:13 2019 (r506329) +++ head/multimedia/libva-intel-media-driver/files/patch-thread-id Wed Jul 10 01:16:24 2019 (r506330) @@ -15,7 +15,7 @@ media_driver/linux/common/cm/cm_innerdef_os.h:98:37: n --- media_driver/linux/common/cm/cm_innerdef_os.h.orig 2018-10-01 21:39:52 UTC +++ media_driver/linux/common/cm/cm_innerdef_os.h -@@ -35,8 +35,16 @@ +@@ -35,8 +35,18 @@ #include "mos_os.h" #include "media_libva_common.h" @@ -26,13 +26,15 @@ media_driver/linux/common/cm/cm_innerdef_os.h:98:37: n +#include +#elif defined(__NetBSD__) +#include -+#else // OpenBSD, Solaris ++#elif defined(__sun) ++#include ++#else // fallback +#include +#endif #include //Require DRM VMAP patch, -@@ -95,5 +103,13 @@ inline void GetLocalTime(PSYSTEMTIME psystime) +@@ -95,5 +103,17 @@ inline void GetLocalTime(PSYSTEMTIME psystime) #endif #define CmGetCurProcessId() getpid() @@ -42,7 +44,11 @@ media_driver/linux/common/cm/cm_innerdef_os.h:98:37: n +#define CmGetCurThreadId() pthread_getthreadid_np() +#elif defined(__NetBSD__) +#define CmGetCurThreadId() _lwp_self() -+#else // OpenBSD, Solaris ++#elif defined(__OpenBSD__) ++#define CmGetCurThreadId() getthrid() ++#elif defined(__sun) ++#define CmGetCurThreadId() thr_self() ++#else // fallback +#define CmGetCurThreadId() (uintptr_t)pthread_self() +#endif Modified: head/multimedia/libva/files/patch-va_va__trace.c ============================================================================== --- head/multimedia/libva/files/patch-va_va__trace.c Wed Jul 10 01:16:13 2019 (r506329) +++ head/multimedia/libva/files/patch-va_va__trace.c Wed Jul 10 01:16:24 2019 (r506330) @@ -2,7 +2,7 @@ --- va/va_trace.c.orig 2019-07-05 13:14:31 UTC +++ va/va_trace.c -@@ -48,12 +48,36 @@ +@@ -48,12 +48,42 @@ #include #include #include @@ -18,7 +18,9 @@ +#include +#elif defined(__NetBSD__) +#include -+#else // OpenBSD, Solaris ++#elif defined(__sun) ++#include ++#else // fallback +#include +#endif + @@ -31,7 +33,11 @@ + return pthread_getthreadid_np(); +#elif defined(__NetBSD__) + return _lwp_self(); -+#else // OpenBSD, Solaris ++#elif defined(__OpenBSD__) ++ return getthrid(); ++#elif defined(__sun) ++ return thr_self(); ++#else // fallback + return (intptr_t) pthread_self(); +#endif +}