Skip to content

Commit 68bbb3b

Browse files
committed
679* dtrace_linux.c: par_alloc: Remove temporary stub-out - we werent
providing fbt module probes.
1 parent 7d74711 commit 68bbb3b

File tree

5 files changed

+50
-98
lines changed

5 files changed

+50
-98
lines changed

.release

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
date=Mon Feb 6 22:50:23 GMT 2012
2-
release=dtrace-20120206
3-
build=373
1+
date=Sat Feb 11 13:16:37 GMT 2012
2+
release=dtrace-20120211
3+
build=374

Changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Sat Feb 11 10:25:20 2012 fox
2+
3+
679* dtrace_linux.c: par_alloc: Remove temporary stub-out - we werent
4+
providing fbt module probes.
5+
16
Mon Feb 6 21:47:58 2012 fox
27

38
678* libdtrace/dt_pid.c: dt_pid_usdt_mapping: Dont call

README

Lines changed: 35 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Linux port of DTrace
22

33
February 2012
44
Paul D. Fox
5-
fox@crisp.demon.co.uk
5+
paul.d.fox@gmail.com
66
http://www.twitter.com/crispeditor
77
http://www.crisp.demon.co.uk
88

@@ -13,71 +13,64 @@ Blog - latest news and stuff about the dtrace project:
1313

1414
Download dtrace tarballs for linux here:
1515

16-
http://dl.dropbox.com/u/45405441/dtrace-latest.tar.gz
16+
https://github.com/dtrace4linux/linux
1717
ftp://crisp.dynalias.com/pub/release/website/dtrace
1818

19+
My public dropbox, likely out of date:
20+
21+
http://dl.dropbox.com/u/45405441/dtrace-latest.tar.gz
22+
1923
Introduction
2024
============
2125

2226
This is a port of the Sun DTrace user and kernel code to Linux.
23-
No linux kernel code is touched in this build, but what is produced
24-
is a dynamically loadable kernel module. This avoids licensing
25-
issues and allows people to load and update dtrace as they desire.
26-
27-
The goal of this project is to ensure dtrace is everywhere - so
28-
that we can all benefit from faster systems and software,
29-
better kernels and generally be a good citizen to the user and
30-
administrators systems.
27+
No linux kernel code is touched in this build, but what is
28+
produced is a dynamically loadable kernel module. This avoids
29+
licensing issues and allows people to load and update dtrace as
30+
they desire.
3131

32-
If this works for you, great. If not, feel free to feedback
33-
what/why it doesnt work and we may be able to address the
34-
issues.
32+
The goal of this project is to make available DTrace for the
33+
Linux platforms. By making it available for everyone, they can
34+
use it to optimise their systems and tools, and in return, I
35+
get to benefit from their work.
3536

36-
3737
PayPal
3838
======
39-
If you want to make a donation for this software, feel free to do so.
40-
Nothing is asked of you - it is genuinely free software, but it can
41-
help guage interest and appreciation if you do.
39+
If you want to make a donation for this software, feel free to
40+
do so. Nothing is asked of you - it is genuinely free software,
41+
but it can help guage interest and appreciation if you do.
4242

43-
You can pay by visiting the link below and clicking on "Donate", or
44-
use this reference for donations:
43+
You can pay by visiting the link below and clicking on
44+
"Donate", or use this reference for donations:
4545

4646
4747

4848
Licensing
4949
=========
5050

51-
The majority (if not all) of this code falls under Sun's CDDL
52-
license. The original files copyrights are left intact, so
53-
please honour those as appropriate. Any files without an
54-
attributed copyright are likely my own invention and can be
55-
placed under the GPLv3, but this is a mixed-mode project, and
56-
it is not *my* right to give Dtrace away under GPL.
51+
The original DTrace is licensed under Sun's (now Oracle) CDDL
52+
license. Original copyrights are left intact. No GPL code is
53+
incorporated into the release, to avoid legal conflicts.
5754

58-
Any mistakes or omissions in copyright attribution will be my
55+
Any mistakes or omissions in copyright attribution will be my
5956
mistake, so please let me know if there are such cases.
6057

61-
The linux kernel was referred to in order to engineer the glue
62-
for dtrace behavior, and there is no intention of making this
63-
code fall under anything other than CDDL. (If Sun migrate to a
64-
GPL friendly license, then this port of dtrace can follow). I
65-
do not own the license or assert any rights on the licensing
58+
The linux kernel was referred to in order to engineer the glue
59+
for dtrace behavior, and there is no intention of making this
60+
code fall under anything other than CDDL. (If Oracle migrate to
61+
a GPL friendly license, then this port of dtrace can follow). I
62+
do not own the license or assert any rights on the licensing
6663
other than that expected of me as a consumer/supplier.
6764

68-
I have no political affiliation or preference for a licensing
69-
scheme, simply that Sun has gracefully donated to the community
70-
a large body of work.
65+
I have no political affiliation or preference for a licensing
66+
scheme, simply that Sun/Oracle has gracefully donated to the
67+
community a large body of work.
7168

72-
My efforts are simply in glueing pieces together and as such,
73-
these pieces of work may be considered falling somewhere
74-
between GPL and CDDL. I reserve the right to change the
75-
licensing model for my own code at a later date, when and if
76-
someone puts forward a case as to the correct license
77-
agreement. I will not and can not ascribe code that does not
78-
belong to me.
69+
I reserve the right to change the licensing model for my own
70+
code at a later date, when and if someone puts forward a case
71+
as to the correct license agreement.
7972

80-
If the code is useful to you - great. Spread it around and get
73+
If the code is useful to you - great. Spread it around and get
8174
people to use, debug and enhance it.
8275

8376
GIT Repository
@@ -139,57 +132,6 @@ is not valid for dtrace to touch your sources. It is also much
139132
easier to not even require kernel sources - so long as
140133
a kernel build environment is available.
141134

142-
Miscellaneous
143-
=============
144-
145-
This is a pre-alpha, work-in-progress port of Sun's DTrace kernel
146-
debugging tool for Linux. It is not prime-time and much of it
147-
doesnt compile.
148-
149-
I have taken a variety of approaches to get where I am:
150-
151-
custom include dir:
152-
153-
- <linux> for user land tools which front-ends /usr/include and
154-
/usr/include/sys
155-
- <sys> for the kernel drivers.
156-
157-
makefiles are incomplete - I use 'makefile' and will clean up Suns
158-
Makefile and Makefile.targ and other extraneous subdirs to simplify things.
159-
160-
make-me is a temporary script to build the kernel drivers.
161-
162-
No top-level makefile at present. In cmd/dtrace/dtrace is a 64-bit dtrace
163-
binary built on RedHat FC8. Will remove that and make it buildable.
164-
165-
Kernel drivers assume access to /usr/src/linux -- needs to be fixed.
166-
kernel drivers dont compile yet. Lots of use of
167-
168-
# if defined(sun)
169-
...
170-
# endif
171-
172-
for bits we wont want (much cribbed from the FreeBSD port).
173-
174-
Some code has
175-
176-
# if linux
177-
...
178-
#endif
179-
180-
where its definitely Linux time.
181-
182-
No GPL code in here at present; all CDDL.
183-
184-
'tags' files are CRiSP format cross-reference files. If you dont have
185-
CRiSP, delete them and build your own !
186-
187-
If you see 'warn' in a makefile, its a tool which color codes gcc
188-
warnings and errors and makes it easier to read the output. It also
189-
knows how to hide the exceptionally annoying non-warning output lines
190-
which are impossible to fix in real life code without a gazillion
191-
of compiler flags.
192-
193135
INSTALLATION
194136
============
195137

driver/dtrace_linux.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/* */
99
/* License: CDDL */
1010
/* */
11-
/* $Header: Last edited: 05-Feb-2012 1.13 $ */
11+
/* $Header: Last edited: 11-Feb-2012 1.14 $ */
1212
/**********************************************************************/
1313

1414
#include <linux/mm.h>
@@ -1518,7 +1518,7 @@ static mutex_t par_mutex;
15181518
void *
15191519
par_alloc(int domain, void *ptr, int size, int *init)
15201520
{ par_alloc_t *p;
1521-
return NULL;
1521+
15221522
dmutex_enter(&par_mutex);
15231523
for (p = hd_par; p; p = p->pa_next) {
15241524
if (p->pa_ptr == ptr && p->pa_domain == domain) {

usdt/c/README

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,8 @@ will see the crc change, indicating a breakpoint got placed.
2424
A test, might be to use gdb to place a breakpoint at the same place
2525
as the usdt and see what happens. (Dtrace will assume it belongs
2626
to it, whilst the process is running).
27+
28+
The script, mkapple, shows that Apple does something a little
29+
easier for dtrace generation. They have modified the compiler and/or
30+
linker to auto generate the .SUNW_dof section without needing to
31+
directly invoke dtrace to post process the ELF file.

0 commit comments

Comments
 (0)