From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:19:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F69816A418; Sun, 2 Dec 2007 00:19:55 +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 A867D16A469 for ; Sun, 2 Dec 2007 00:19:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90B9413C45D for ; Sun, 2 Dec 2007 00:19:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20JsiL004584 for ; Sun, 2 Dec 2007 00:19:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20Jsd5004581 for perforce@freebsd.org; Sun, 2 Dec 2007 00:19:54 GMT (envelope-from jb@freebsd.org) Date: Sun, 2 Dec 2007 00:19:54 GMT Message-Id: <200712020019.lB20Jsd5004581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2007 00:19:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=129927 Change 129927 by jb@jb_freebsd1 on 2007/12/02 00:19:20 IFC to loopback the elf change. Affected files ... .. //depot/projects/dtrace/src/share/man/man9/Makefile#24 integrate .. //depot/projects/dtrace/src/share/man/man9/stack.9#4 integrate .. //depot/projects/dtrace/src/sys/sys/elf_common.h#10 integrate Differences ... ==== //depot/projects/dtrace/src/share/man/man9/Makefile#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.319 2007/11/29 17:16:55 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.320 2007/12/01 22:04:15 rwatson Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1074,6 +1074,7 @@ stack.9 stack_put.9 \ stack.9 stack_save.9 \ stack.9 stack_sbuf_print.9 \ + stack.9 stack_sbuf_print_ddb.9 \ stack.9 stack_zero.9 MLINKS+=store.9 subyte.9 \ store.9 suswintr.9 \ ==== //depot/projects/dtrace/src/share/man/man9/stack.9#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/stack.9,v 1.3 2007/11/29 17:16:55 rwatson Exp $ +.\" $FreeBSD: src/share/man/man9/stack.9,v 1.4 2007/12/01 22:04:15 rwatson Exp $ .\" .Dd February 27, 2007 .Dt STACK 9 @@ -54,6 +54,8 @@ .Ft void .Fn stack_sbuf_print "struct sbuf sb*" "struct stack *st" .Ft void +.Fn stack_sbuf_print_ddb "struct sbuf sb*" "struct stack *st" +.Ft void .Fn stack_save "struct stack *st" .Sh DESCRIPTION The @@ -96,7 +98,17 @@ .Xr sbuf 9 . This function may sleep if an auto-extending .Dv struct sbuf -is used. +is used, and because the kernel linker (used to look up symbol names) uses +.Xr sx 9 +locks. +.Pp +In locking-sensitive environments, such as +.Xr DDB 4 , +the unsynchronized +.Fn stack_sbuf_print_ddb +variant may be invoked; this makes use of kernel linker data structures to +look up symbol names without following locking protocols, so is appropriate +for use in the debugger but not while the system is live. .Pp The utility functions .Nm stack_zero , @@ -107,7 +119,8 @@ .Sh SEE ALSO .Xr DDB 4 , .Xr printf 9 , -.Xr sbuf 9 +.Xr sbuf 9 , +.Xr sx 9 .Sh AUTHORS .An -nosplit The ==== //depot/projects/dtrace/src/sys/sys/elf_common.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/elf_common.h,v 1.22 2007/04/03 01:47:07 kan Exp $ + * $FreeBSD: src/sys/sys/elf_common.h,v 1.23 2007/12/02 00:05:18 jb Exp $ */ #ifndef _SYS_ELF_COMMON_H_ @@ -431,6 +431,9 @@ #define STV_INTERNAL 0x1 /* Special meaning in relocatable objects. */ #define STV_HIDDEN 0x2 /* Not visible. */ #define STV_PROTECTED 0x3 /* Visible but not preemptible. */ +#define STV_EXPORTED 0x4 +#define STV_SINGLETON 0x5 +#define STV_ELIMINATE 0x6 /* Special symbol table indexes. */ #define STN_UNDEF 0 /* Undefined symbol index. */