diff options
| author | Björn Gustavsson <[email protected]> | 2012-06-28 11:33:10 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-06-28 11:33:10 +0200 |
| commit | 65c23210b49d348954a6f7f6c70d02f79676ffeb (patch) | |
| tree | b580ad9099457f495f1ffaadac94e9190f87eb4d /erts/emulator/beam/ops.tab | |
| parent | 2af66d1761c54e0bc2811a2ad2950f62d9ceccdc (diff) | |
| parent | 00d769bf3d35df706dbbb9155052183db3631475 (diff) | |
| download | otp-65c23210b49d348954a6f7f6c70d02f79676ffeb.tar.gz otp-65c23210b49d348954a6f7f6c70d02f79676ffeb.tar.bz2 otp-65c23210b49d348954a6f7f6c70d02f79676ffeb.zip | |
Merge branch 'bjorn/erts/breakpoints/OTP-10122'
* bjorn/erts/breakpoints/OTP-10122:
Strengthen trace test cases
Don't go to single-scheduler mode when managing breakpoints
Refactor the code for managing breakpoints
Change the data structures for breakpoints
Add trace_local_SUITE:concurrency/1
Make the lock check in erts_is_code_ix_locked() stronger
Diffstat (limited to 'erts/emulator/beam/ops.tab')
| -rw-r--r-- | erts/emulator/beam/ops.tab | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index c58b36231c..6764e88c81 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -62,11 +62,8 @@ label L i_func_info I a a I int_code_end -i_trace_breakpoint -i_mtrace_breakpoint +i_generic_breakpoint i_debug_breakpoint -i_count_breakpoint -i_time_breakpoint i_return_time_trace i_return_to_trace i_yield @@ -522,7 +519,6 @@ apply_bif call_nif call_error_handler error_action_code -call_traced_function return_trace # |