From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 17 18:06:33 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A537E106564A for ; Fri, 17 Jun 2011 18:06:33 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 37E4C8FC12 for ; Fri, 17 Jun 2011 18:06:32 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p5HI6VHq061018 for ; Fri, 17 Jun 2011 18:06:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p5HI6QxQ060353 for freebsd-gecko@freebsd.org; Fri, 17 Jun 2011 18:06:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 17 Jun 2011 18:06:26 GMT Message-Id: <201106171806.p5HI6QxQ060353@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r561 - in branches/experimental/www: firefox-aurora/files firefox-beta/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2011 18:06:33 -0000 Author: flo Date: Fri Jun 17 18:06:26 2011 New Revision: 561 Log: - use better method to obtain thread ids Submitted by: Pan Tsu Modified: branches/experimental/www/firefox-aurora/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Modified: branches/experimental/www/firefox-aurora/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Thu Jun 16 22:01:09 2011 (r560) +++ branches/experimental/www/firefox-aurora/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Fri Jun 17 18:06:26 2011 (r561) @@ -1,12 +1,25 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 -+++ ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 -@@ -34,7 +33,8 @@ +--- ipc/chromium/src/base/platform_thread_posix.cc~ ++++ ipc/chromium/src/base/platform_thread_posix.cc +@@ -11,6 +11,7 @@ + #include + #elif defined(OS_LINUX) + #include ++#include + #include + #endif + +@@ -34,7 +35,13 @@ PlatformThreadId PlatformThread::Current #if defined(OS_MACOSX) return mach_thread_self(); #elif defined(OS_LINUX) - return syscall(__NR_gettid); -+ // TODO(BSD): find a better thread ID -+ return reinterpret_cast(pthread_self()); ++#if __FreeBSD_version > 900030 ++ return pthread_getthreadid_np(); ++#else ++ long tid; ++ syscall(SYS_thr_self, &tid); ++ return tid; ++#endif #endif } Modified: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Thu Jun 16 22:01:09 2011 (r560) +++ branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Fri Jun 17 18:06:26 2011 (r561) @@ -1,12 +1,25 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 -+++ ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 -@@ -34,7 +33,8 @@ +--- ipc/chromium/src/base/platform_thread_posix.cc~ ++++ ipc/chromium/src/base/platform_thread_posix.cc +@@ -11,6 +11,7 @@ + #include + #elif defined(OS_LINUX) + #include ++#include + #include + #endif + +@@ -34,7 +35,13 @@ PlatformThreadId PlatformThread::Current #if defined(OS_MACOSX) return mach_thread_self(); #elif defined(OS_LINUX) - return syscall(__NR_gettid); -+ // TODO(BSD): find a better thread ID -+ return reinterpret_cast(pthread_self()); ++#if __FreeBSD_version > 900030 ++ return pthread_getthreadid_np(); ++#else ++ long tid; ++ syscall(SYS_thr_self, &tid); ++ return tid; ++#endif #endif }