From owner-p4-projects@FreeBSD.ORG  Wed Nov  5 09:34:08 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0AEEF106568B; Wed,  5 Nov 2008 09:34:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C28C3106567A
	for <perforce@freebsd.org>; Wed,  5 Nov 2008 09:34:07 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B1A0F8FC0C
	for <perforce@freebsd.org>; Wed,  5 Nov 2008 09:34:07 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA59Y7fB067420
	for <perforce@freebsd.org>; Wed, 5 Nov 2008 09:34:07 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA59Y7jx067418
	for perforce@freebsd.org; Wed, 5 Nov 2008 09:34:07 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 5 Nov 2008 09:34:07 GMT
Message-Id: <200811050934.mA59Y7jx067418@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152512 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Nov 2008 09:34:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=152512

Change 152512 by peter@peter_overcee on 2008/11/05 09:33:31

	Make gettid() work.  (loosely from phk)

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcproc.c#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcproc.c#6 (text+ko) ====

@@ -368,15 +368,8 @@
    pids, etc
    ------------------------------------------------------------------ */
 
-#ifdef VGO_freebsd
 Int VG_(gettid)(void)
 {
-   // VG_(printf)("valgrind: gettid() faked\n");
-   return VG_(do_syscall0)(__NR_getpid).res;
-}
-#else
-Int VG_(gettid)(void)
-{
 #  if defined(VGO_aix5)
    SysRes res;
    Int    r;
@@ -385,6 +378,15 @@
    r = res.res;
    return r;
 
+#  elif defined(VGO_freebsd)
+   SysRes res;
+   long tid;
+
+   res = VG_(do_syscall1)(__NR_thr_self, (UWord)&tid);
+   if (res.isError)
+      tid = VG_(do_syscall0)(__NR_getpid).res;
+   return tid;
+
 #  else
    SysRes res = VG_(do_syscall0)(__NR_gettid);
 
@@ -415,7 +417,6 @@
    return res.res;
 #  endif
 }
-#endif
 
 /* You'd be amazed how many places need to know the current pid. */
 Int VG_(getpid) ( void )