/home/fox/release/dtrace/dtrace-20120205a.tar.bz2

Author: dtrace4linux

.release

@@ -1,3 +1,3 @@
-date=Sun Feb  5 16:28:32 GMT 2012
-release=dtrace-20120205
-build=370
+date=Sun Feb  5 22:21:34 GMT 2012
+release=dtrace-20120205a
+build=372

CONTRIB

@@ -1,6 +1,7 @@
 Following is a list of people who have contributed to the
-code. This is a team effort.
+code. 
 
+C.Bergstr�m
 Nigel.Smith
 [email protected]
 [email protected]

Changes

@@ -1,5 +1,12 @@
 Sun Feb  5 10:18:55 2012  fox
 
+     676* driver/intr.c: Fix license.
+
+     675* liblinux/proc2.c: Fix to avoid leaving target USDT proc in
+          a stopped state. (We did this due to bugs in libproc handling
+	  but we shouldnt even if we are buggy). Not detecting 't'
+	  process state properly.
+
      674* Archive: 1.0137
 
      673* dtrace_linux.c: Fix clflush issue in <= 2.6.21 kernels

README

@@ -1,6 +1,6 @@
 Linux port of DTrace
 
-January 2011
+February 2012
 Paul D. Fox
 [email protected]
 http://www.twitter.com/crispeditor
@@ -16,6 +16,24 @@ Download dtrace tarballs for linux here:
    http://dl.dropbox.com/u/45405441/dtrace-latest.tar.gz
    ftp://crisp.dynalias.com/pub/release/website/dtrace
 
+Introduction
+============
+
+This is a port of the Sun DTrace user and kernel code to Linux.
+No linux kernel code is touched in this build, but what is produced
+is a dynamically loadable kernel module. This avoids licensing
+issues and allows people to load and update dtrace as they desire.
+
+The goal of this project is to ensure dtrace is everywhere - so
+that we can all benefit from faster systems and software,
+better kernels and generally be a good citizen to the user and
+administrators systems.
+
+If this works for you, great. If not, feel free to feedback
+what/why it doesnt work and we may be able to address the
+issues.
+
+  
 PayPal
 ======
 If you want to make a donation for this software, feel free to do so.
@@ -27,75 +45,49 @@ use this reference for donations:
 
    [email protected]
 
-Introduction
-============
-
-This is a port of the Sun DTrace user and kernel code to Linux.
-No linux kernel code is touched in this build, but what is produced
-is a dynamically loadable kernel module. This avoids licensing
-issues and allows people to load and update dtrace as they desire.
-
-It also makes it more of a challenge than Solaris or FreeBSD or
-MacOSX, which have dtrace too, since we are trying to support old
-and new kernels, 32 and 64 bit kernels, and have to fit in with
-Linux's desire to change and evolve. So, if this works for you, great.
-If not, feel free to feedback what/why it doesnt work and we
-may be able to address the issues.
-
-The goal of this project is to ensure dtrace is everywhere - so
-that we can all benefit from faster systems and software, better
-kernels and generally be a good citizen to the user and administrators
-systems.
-  
 Licensing
 =========
 
 The majority (if not all) of this code falls under Sun's CDDL
-license. Some files or headers may originate with GPL code, e.g.
-ELF libraries from GLIBC or RedHat. The original files
-copyrights are left intact, so please honour those as appropriate.
-Any files without an attributed copyright are likely my own
-invention and can be placed under the GPLv3, but this is a mixed-mode
-project, and it is not *my* right to give Dtrace away under GPL.
+license. The original files copyrights are left intact, so
+please honour those as appropriate. Any files without an
+attributed copyright are likely my own invention and can be
+placed under the GPLv3, but this is a mixed-mode project, and
+it is not *my* right to give Dtrace away under GPL.
 
-Any mistakes or omissions in copyright attribution will be my mistake,
-so please let me know if there are such cases.
+Any mistakes or omissions in copyright attribution will be my
+mistake, so please let me know if there are such cases.
 
 The linux kernel was referred to in order to engineer the glue
 for dtrace behavior, and there is no intention of making this
-code fall under anything other than CDDL. (If Sun migrate
-to a GPL friendly license, then this port of dtrace can follow).
-I do not own the license or assert any rights on the licensing
+code fall under anything other than CDDL. (If Sun migrate to a
+GPL friendly license, then this port of dtrace can follow). I
+do not own the license or assert any rights on the licensing
 other than that expected of me as a consumer/supplier.
 
-I have no political affiliation or preference for a licensing scheme,
-simply that Sun has gracefully donated to the community a large body
-of work.
+I have no political affiliation or preference for a licensing
+scheme, simply that Sun has gracefully donated to the community
+a large body of work.
 
 My efforts are simply in glueing pieces together and as such,
-these pieces of work may be considered falling somewhere between
-GPL and CDDL. I reserve the right to change the licensing model
-for my own code at a later date, when and if someone puts forward
-a case as to the correct license agreement. I will not and can not 
-ascribe code that does not belong to me.
+these pieces of work may be considered falling somewhere
+between GPL and CDDL. I reserve the right to change the
+licensing model for my own code at a later date, when and if
+someone puts forward a case as to the correct license
+agreement. I will not and can not ascribe code that does not
+belong to me.
 
 If the code is useful to you - great. Spread it around and get
 people to use, debug and enhance it.
 
 GIT Repository
 ==============
 
-  https://github.com/pdmccormick/dtrace-for-linux
-
-Thanks to Peter McCormick for setting this up.
-
-   NOTE: This is not the master archive for dtrace. Peter has
-   kindly set this up and it may lag the master releases. See
-   the links at the top of this document for the current homepage
-   data.
+  https://github.com/dtrace4linux/dtrace
 
-   As of March 2011, I dont believe the git repository is being
-   synced, so do not rely on it, or check the dates.
+(Theres an older and orphaned github repository under 
+Peter McCormicks name, please ignore this as it has not been
+updated in a long while and is no longer active).
 
 Installation
 ============

doc/usdt.html

@@ -170,6 +170,35 @@ <h2>Annotating a program with custom probes</h2>
 probes with dtrace, the checksum will change, and as you Ctrl-C dtrace,
 the checksum will be restored.
 
+<h2>Apple/Mac OS X</h2>
+<p>
+
+Apple has done some enhancements to dtrace, which are interesting and 
+simplify the mechanism for creating a USDT enabled application.
+With Apple's dtrace mechanism, only two commands are needed to generate
+a probable executable:
+
+<pre>
+$ dtrace -h -s simple_probes.d
+$ gcc -I../../uts/common -o simple simple.c
+</pre>
+
+The dtrace command generates the header file, containing the probe
+definitions, e.g.
+
+<pre>
+define SIMPLE_SAW_LINE(arg0) \
+do { \
+        __asm__ volatile(".reference " SIMPLE_TYPEDEFS); \
+        __dtrace_probe$simple$saw__line$v1$696e74(arg0); \
+        __asm__ volatile(".reference " SIMPLE_STABILITY); \
+} while (0)
+</pre>
+
+The use of ".reference" is interesting, since this is doing the work
+of the traditional phase used to create an ELF object file with
+the probe table information.
+
 <h2>Issues</h2>
 <p>
 DTrace relies on the DTRACE_PROBE macros to create the assembler

driver/intr.c

@@ -5,9 +5,9 @@
 /*   Date: December 2011					      */
 /*   Author: Paul D. Fox					      */
 /*   								      */
-/*   License: GPLv2						      */
+/*   License: CDDL						      */
 /*   								      */
-/*   $Header: Last edited: 31-Jan-2012 1.14 $ 			      */
+/*   $Header: Last edited: 05-Feb-2012 1.15 $ 			      */
 /**********************************************************************/
 
 #include <linux/mm.h>

driver/printf.c

@@ -6,6 +6,8 @@
 /*   								      */
 /*   Author: Paul D. Fox					      */
 /*   Date: December 2011					      */
+/*   								      */
+/*   License: CDDL						      */
 /**********************************************************************/
 
 #include <linux/mm.h>

liblinux/proc2.c

@@ -127,7 +127,7 @@ int lx_read_stat(struct ps_prochandle *P, pstatus_t *pst)
 		close(fd);
 	}
 //printf("lx_read_stat pid=%d: state='%s'\n", P->pid, state);
-	if (*state == 'T')
+	if (*state == 'T' || *state == 't')
 		pst->pr_flags |= PR_STOPPED;
 	P->status.pr_flags = pst->pr_flags;
 

tools/mkrelease.pl

@@ -60,15 +60,13 @@ sub main
 	#   Handle multireleases in a day.	      #
 	###############################################
 	my $pkg = "dtrace";
-	if (-f "ENV{HOME}/release/$pkg/$pkg-$rel.tar.bz2") {
+	if (-f "$ENV{HOME}/release/$pkg/$pkg-$rel.tar.bz2") {
 		foreach my $letter (qw/a b c d e f g h i j k l m n o p q r s t u v w x y z/) {
 			if (! -f "$ENV{HOME}/$pkg/$pkg-$rel$letter.tar.bz2") {
 				$rel .= $letter;
 				last;
 			}
 		}
-print "hello\n";
-exit;
 	}
 	$fh = new FileHandle(".release");
 	die "Cannot open .release file -- $!\n" if !$fh;

usdt/c/mkapple

@@ -0,0 +1,3 @@
+# This is how it is done on Apple, due to compiler/linker enhancements.
+dtrace -h -s simple_probes.d
+gcc -I../../uts/common -o simple simple.c