diff options
| author | Henrik Nord <[email protected]> | 2012-07-06 12:25:36 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-07-06 12:25:36 +0200 |
| commit | c075ac6484e3d5a93a0d870ab4483d39ae26eaec (patch) | |
| tree | f12a3bdcd9cdba0c52b85a8ac9f0b19bef72dcdb /erts/preloaded/src/erl_prim_loader.erl | |
| parent | 0eed86218c2f9e1dfadb25b0ec993d207e43d25e (diff) | |
| parent | 978cdb3543f67838b8900d05a833ebeef7ac7295 (diff) | |
| download | otp-c075ac6484e3d5a93a0d870ab4483d39ae26eaec.tar.gz otp-c075ac6484e3d5a93a0d870ab4483d39ae26eaec.tar.bz2 otp-c075ac6484e3d5a93a0d870ab4483d39ae26eaec.zip | |
Merge branch 'slf/dtrace-nif-N-probes' into maint
* slf/dtrace-nif-N-probes:
Remove crufty scaffolding code
Add 1024 separate USDT probes to dyntrace.erl and dyntrace.c
Conflicts:
lib/runtime_tools/src/dyntrace.erl
OTP-10143
Diffstat (limited to 'erts/preloaded/src/erl_prim_loader.erl')
0 files changed, 0 insertions, 0 deletions