Date: Mon, 26 Jun 2006 23:42:04 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100102 for review Message-ID: <200606262342.k5QNg49O048314@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100102 Change 100102 by jb@jb_freebsd2 on 2006/06/26 23:41:41 Integrate OpenSolaris ON (OS/Net) Consolidation - 20060619 Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pexecname.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#20 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#4 (text) ==== @@ -27,7 +27,7 @@ #ifndef _DEBUG_H #define _DEBUG_H -#pragma ident "@(#)debug.h 1.137 06/05/09 SMI" +#pragma ident "@(#)debug.h 1.138 06/06/07 SMI" /* * Global include file for lddbg debugging. @@ -642,7 +642,7 @@ extern void Dbg_file_reuse(Lm_list *, const char *, const char *); extern void Dbg_file_skip(Lm_list *, const char *, const char *); -extern void Dbg_got_display(Ofl_desc *, Gottable *); +extern void Dbg_got_display(Ofl_desc *, Off, int); extern void Dbg_libs_audit(Lm_list *, const char *, const char *); extern void Dbg_libs_find(Lm_list *, const char *); @@ -767,7 +767,8 @@ extern void Dbg_syms_up_title(Lm_list *); extern void Dbg_tls_modactivity(Lm_list *, void *, uint_t); -extern void Dbg_tls_static_block(Lm_list *, void *, ulong_t); +extern void Dbg_tls_static_block(Lm_list *, void *, ulong_t, ulong_t); +extern void Dbg_tls_static_resv(Rt_map *, ulong_t, ulong_t); extern void Dbg_util_broadcast(Rt_map *); extern void Dbg_util_call_array(Rt_map *, void *, int, Word); ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pexecname.c#2 (text) ==== @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,11 +19,11 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "@(#)Pexecname.c 1.4 05/06/08 SMI" +#pragma ident "@(#)Pexecname.c 1.5 06/06/14 SMI" #define __EXTENSIONS__ #include <string.h> @@ -127,8 +126,8 @@ if (try_exec(cwd, path, buf, isexec, isdata)) goto found; - if (strchr(path, '/') != NULL && basename(path) != NULL && - try_exec(cwd, path, buf, isexec, isdata)) + if (strchr(path, '/') != NULL && (p = basename(path)) != NULL && + try_exec(cwd, p, buf, isexec, isdata)) goto found; } @@ -146,8 +145,8 @@ if (try_exec(cwd, path, buf, isexec, isdata)) goto found; - if (strchr(path, '/') != NULL && basename(path) != NULL && - try_exec(cwd, path, buf, isexec, isdata)) + if (strchr(path, '/') != NULL && (p = basename(path)) != NULL && + try_exec(cwd, p, buf, isexec, isdata)) goto found; } @@ -162,8 +161,8 @@ if (try_exec(cwd, path, buf, isexec, isdata)) goto found; - if (strchr(path, '/') != NULL && basename(path) != NULL && - try_exec(cwd, path, buf, isexec, isdata)) + if (strchr(path, '/') != NULL && (p = basename(path)) != NULL && + try_exec(cwd, p, buf, isexec, isdata)) goto found; } ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#20 (text) ==== @@ -28,7 +28,7 @@ #define _SYS_DTRACE_H #if defined(sun) -#pragma ident "@(#)dtrace.h 1.30 06/03/30 SMI" +#pragma ident "@(#)dtrace.h 1.31 06/06/12 SMI" #endif #ifdef __cplusplus @@ -2202,7 +2202,6 @@ struct regs; extern int (*dtrace_pid_probe_ptr)(struct regs *); -extern int (*dtrace_fasttrap_probe_ptr)(struct regs *); extern int (*dtrace_return_probe_ptr)(struct regs *); extern void (*dtrace_fasttrap_fork_ptr)(proc_t *, proc_t *); extern void (*dtrace_fasttrap_exec_ptr)(proc_t *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606262342.k5QNg49O048314>