From owner-p4-projects@FreeBSD.ORG Wed Apr 19 23:20:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42EA016A406; Wed, 19 Apr 2006 23:20:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCBA116A405 for ; Wed, 19 Apr 2006 23:20:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FCEE43D53 for ; Wed, 19 Apr 2006 23:20:38 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3JNKbGc018662 for ; Wed, 19 Apr 2006 23:20:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JNKbqf018650 for perforce@freebsd.org; Wed, 19 Apr 2006 23:20:37 GMT (envelope-from jb@freebsd.org) Date: Wed, 19 Apr 2006 23:20:37 GMT Message-Id: <200604192320.k3JNKbqf018650@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 95637 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: Wed, 19 Apr 2006 23:20:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=95637 Change 95637 by jb@jb_freebsd2 on 2006/04/19 23:19:58 Hack up this code a bit as a temporary measure to avoid addressing some low level stuff which is at least operating system dependent. I need to learn a bit more about how DTrace works internally before porting that stuff. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 (text) ==== @@ -26,7 +26,9 @@ #ifndef _SYS_DTRACE_IMPL_H #define _SYS_DTRACE_IMPL_H +#if defined(sun) #pragma ident "@(#)dtrace_impl.h 1.20 06/04/03 SMI" +#endif #ifdef __cplusplus extern "C" { @@ -43,7 +45,12 @@ * Please refer to the "Solaris Dynamic Tracing Guide" for more information. */ +#if defined(sun) #include +#else +#include +#include +#endif /* * DTrace Implementation Constants and Typedefs @@ -1102,7 +1109,9 @@ int dts_nspeculations; /* number of speculations */ int dts_naggregations; /* number of aggregations */ dtrace_aggregation_t **dts_aggregations; /* aggregation array */ +#ifdef DOODAD vmem_t *dts_aggid_arena; /* arena for aggregation IDs */ +#endif uint64_t dts_errors; /* total number of errors */ uint32_t dts_speculations_busy; /* number of spec. busy */ uint32_t dts_speculations_unavail; /* number of spec unavail */ @@ -1110,8 +1119,10 @@ uint32_t dts_dblerrors; /* errors in ERROR probes */ uint32_t dts_reserve; /* space reserved for END */ hrtime_t dts_laststatus; /* time of last status */ +#ifdef DOODAD cyclic_id_t dts_cleaner; /* cleaning cyclic */ cyclic_id_t dts_deadman; /* deadman cyclic */ +#endif hrtime_t dts_alive; /* time last alive */ char dts_speculates; /* boolean: has speculations */ char dts_destructive; /* boolean: has dest. actions */ @@ -1223,7 +1234,9 @@ } dtrace_toxrange_t; extern uint64_t dtrace_getarg(int, int); +#ifdef DOODAD extern greg_t dtrace_getfp(void); +#endif extern int dtrace_getipl(void); extern uintptr_t dtrace_caller(int); extern uint32_t dtrace_cas32(uint32_t *, uint32_t, uint32_t); @@ -1232,8 +1245,10 @@ extern void dtrace_copyinstr(uintptr_t, uintptr_t, size_t); extern void dtrace_copyout(uintptr_t, uintptr_t, size_t); extern void dtrace_copyoutstr(uintptr_t, uintptr_t, size_t); +#ifdef DOODAD extern void dtrace_getpcstack(pc_t *, int, int, uint32_t *); extern ulong_t dtrace_getreg(struct regs *, uint_t); +#endif extern int dtrace_getstackdepth(int); extern void dtrace_getupcstack(uint64_t *, int); extern void dtrace_getufpstack(uint64_t *, uint64_t *, int); @@ -1247,7 +1262,7 @@ int, uintptr_t); extern int dtrace_assfail(const char *, const char *, int); extern int dtrace_attached(void); -extern hrtime_t dtrace_gethrestime(); +extern hrtime_t dtrace_gethrestime(void); #ifdef __sparc extern void dtrace_flush_windows(void);