Module Name: src Committed By: pooka Date: Fri Mar 21 12:28:54 UTC 2014
Modified Files: src/lib/librumpuser: rumpuser_port.h rumpuser_pth.c Log Message: use a probe result to decide which pthread_setname_np() to use To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/librumpuser/rumpuser_port.h cvs rdiff -u -r1.37 -r1.38 src/lib/librumpuser/rumpuser_pth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.29 src/lib/librumpuser/rumpuser_port.h:1.30 --- src/lib/librumpuser/rumpuser_port.h:1.29 Tue Feb 25 20:58:18 2014 +++ src/lib/librumpuser/rumpuser_port.h Fri Mar 21 12:28:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_port.h,v 1.29 2014/02/25 20:58:18 pooka Exp $ */ +/* $NetBSD: rumpuser_port.h,v 1.30 2014/03/21 12:28:54 pooka Exp $ */ /* * Portability header for non-NetBSD platforms. @@ -20,6 +20,9 @@ #define PLATFORM_HAS_FSYNC_RANGE #define PLATFORM_HAS_NBSYSCTL #define PLATFORM_HAS_NBFILEHANDLE +#ifndef HAVE_PTHREAD_SETNAME3 +#define HAVE_PTHREAD_SETNAME3 +#endif #define PLATFORM_HAS_STRSUFTOLL #define PLATFORM_HAS_SETGETPROGNAME Index: src/lib/librumpuser/rumpuser_pth.c diff -u src/lib/librumpuser/rumpuser_pth.c:1.37 src/lib/librumpuser/rumpuser_pth.c:1.38 --- src/lib/librumpuser/rumpuser_pth.c:1.37 Fri Mar 21 12:07:10 2014 +++ src/lib/librumpuser/rumpuser_pth.c Fri Mar 21 12:28:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_pth.c,v 1.37 2014/03/21 12:07:10 pooka Exp $ */ +/* $NetBSD: rumpuser_pth.c,v 1.38 2014/03/21 12:28:54 pooka Exp $ */ /* * Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ #include "rumpuser_port.h" #if !defined(lint) -__RCSID("$NetBSD: rumpuser_pth.c,v 1.37 2014/03/21 12:07:10 pooka Exp $"); +__RCSID("$NetBSD: rumpuser_pth.c,v 1.38 2014/03/21 12:28:54 pooka Exp $"); #endif /* !lint */ #include <sys/queue.h> @@ -93,19 +93,13 @@ rumpuser_thread_create(void *(*f)(void * nanosleep(&ts, NULL); } -#if defined(__NetBSD__) - if (rv == 0 && thrname) +#if defined(HAVE_PTHREAD_SETNAME_3) + if (rv == 0 && thrname) { pthread_setname_np(*ptidp, thrname, NULL); -#elif defined(__linux__) - /* - * The pthread_setname_np() call varies from one Linux distro to - * another. Comment out the call pending autoconf support. - */ -#if 0 +#elif defined(HAVE_PTHREAD_SETNAME_2) if (rv == 0 && thrname) pthread_setname_np(*ptidp, thrname); #endif -#endif if (joinable) { assert(ptcookie);