diff options
| author | Patrik Nyblom <[email protected]> | 2012-04-19 18:35:42 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-04-19 18:37:27 +0200 |
| commit | a9f8c459f562fe3c919bad66633ac85a86f3028a (patch) | |
| tree | ac9a0781d4dbc12cccfae767958392d2b78a9856 /erts | |
| parent | cff02d4925bfd6ed88d9d7b897f4b4416e4643ce (diff) | |
| parent | 64028ec29c663d692539d34fb2b6a2f90ae080d4 (diff) | |
| download | otp-a9f8c459f562fe3c919bad66633ac85a86f3028a.tar.gz otp-a9f8c459f562fe3c919bad66633ac85a86f3028a.tar.bz2 otp-a9f8c459f562fe3c919bad66633ac85a86f3028a.zip | |
Merge branch 'pan/dtrace_merge_master_correction'
* pan/dtrace_merge_master_correction:
Correct dtrace for master branch
OTP-10017
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 6 | ||||
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 88612 -> 88612 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 2042b2c12a..49c4ac1b00 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1560,7 +1560,7 @@ void process_main(void) */ #ifdef USE_VM_CALL_PROBES if (DTRACE_ENABLED(global_function_entry)) { - BeamInstr* fp = (BeamInstr *) (((Export *) Arg(0))->address); + BeamInstr* fp = (BeamInstr *) (((Export *) Arg(0))->addressv[erts_active_code_ix()]); DTRACE_GLOBAL_CALL(c_p, (Eterm)fp[-3], (Eterm)fp[-2], fp[-1]); } #endif @@ -1575,7 +1575,7 @@ void process_main(void) SET_CP(c_p, I+2); #ifdef USE_VM_CALL_PROBES if (DTRACE_ENABLED(global_function_entry)) { - BeamInstr* fp = (BeamInstr *) (((Export *) Arg(0))->address); + BeamInstr* fp = (BeamInstr *) (((Export *) Arg(0))->addressv[erts_active_code_ix()]); DTRACE_GLOBAL_CALL(c_p, (Eterm)fp[-3], (Eterm)fp[-2], fp[-1]); } #endif @@ -1588,7 +1588,7 @@ void process_main(void) OpCase(i_call_ext_only_e): #ifdef USE_VM_CALL_PROBES if (DTRACE_ENABLED(global_function_entry)) { - BeamInstr* fp = (BeamInstr *) (((Export *) Arg(0))->address); + BeamInstr* fp = (BeamInstr *) (((Export *) Arg(0))->addressv[erts_active_code_ix()]); DTRACE_GLOBAL_CALL(c_p, (Eterm)fp[-3], (Eterm)fp[-2], fp[-1]); } #endif diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex f50b8e9d43..f3a2170a9b 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index c55a90b3fb..614b6053fc 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -575,7 +575,7 @@ dist_exit(_P1, _P2, _P3) -> erlang:nif_error(undefined). %% dt_append_vm_tag_data/1 --spec dt_append_vm_tag_data(IoData) -> IoDataRet when +-spec erlang:dt_append_vm_tag_data(IoData) -> IoDataRet when IoData :: iodata(), IoDataRet :: iodata(). dt_append_vm_tag_data(_IoData) -> @@ -592,7 +592,7 @@ dt_get_tag_data() -> erlang:nif_error(undefined). %% dt_prepend_vm_tag_data/1 --spec dt_prepend_vm_tag_data(IoData) -> IoDataRet when +-spec erlang:dt_prepend_vm_tag_data(IoData) -> IoDataRet when IoData :: iodata(), IoDataRet :: iodata(). dt_prepend_vm_tag_data(_IoData) -> |