diff options
| author | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
| commit | 76378f21242b8036bac1b187e895bcafa28201da (patch) | |
| tree | 7b4f7927292cb193854b3012573d17e371e4ed6a /erts/emulator/beam/erl_trace.h | |
| parent | 8bc9c88cd98bbbcc18265a7aed830b73f5133cf6 (diff) | |
| parent | 36dd5c3dd86c91d04a7fc13fd2a89b10af64db5a (diff) | |
| download | otp-76378f21242b8036bac1b187e895bcafa28201da.tar.gz otp-76378f21242b8036bac1b187e895bcafa28201da.tar.bz2 otp-76378f21242b8036bac1b187e895bcafa28201da.zip | |
Merge branch 'lukas/erts/max_heap_size/OTP-13174'
* lukas/erts/max_heap_size/OTP-13174:
erts: Fix max heap size exit when in hipe mode
Update preloaded modules
erts: Fix pre-bif yield current_function
erts: Implement max_heap_size process flag
Diffstat (limited to 'erts/emulator/beam/erl_trace.h')
| -rw-r--r-- | erts/emulator/beam/erl_trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_trace.h b/erts/emulator/beam/erl_trace.h index de4beadb7e..fd5879bc9d 100644 --- a/erts/emulator/beam/erl_trace.h +++ b/erts/emulator/beam/erl_trace.h @@ -112,7 +112,7 @@ void trace_sched(Process*, ErtsProcLocks, Eterm); void trace_proc(Process*, ErtsProcLocks, Process*, Eterm, Eterm); void trace_proc_spawn(Process*, Eterm what, Eterm pid, Eterm mod, Eterm func, Eterm args); void save_calls(Process *p, Export *); -void trace_gc(Process *p, Eterm what, Uint size); +void trace_gc(Process *p, Eterm what, Uint size, Eterm msg); /* port tracing */ void trace_virtual_sched(Process*, ErtsProcLocks, Eterm); void trace_sched_ports(Port *pp, Eterm); |