diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-04-06 17:27:17 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-06 17:27:17 +0200 |
| commit | 2ea950f70bb3c2bee32be7f98442df8d8d2f008a (patch) | |
| tree | 0438b76786bb8c1aac788600a85e1856aa7acbf1 /erts/emulator/beam/erl_alloc.h | |
| parent | dc599847686a683441617eb507539d68dab88d6b (diff) | |
| parent | 58762e934f603b3fe036aa3b9d8a5930b77ae5f1 (diff) | |
| download | otp-2ea950f70bb3c2bee32be7f98442df8d8d2f008a.tar.gz otp-2ea950f70bb3c2bee32be7f98442df8d8d2f008a.tar.bz2 otp-2ea950f70bb3c2bee32be7f98442df8d8d2f008a.zip | |
Merge branch 'egil/erts/tracing-beam-lttng/OTP-10282'
* egil/erts/tracing-beam-lttng/OTP-10282:
erts: Don't use ratio in carrier lttng tracepoints
Add lttng testcases
erts: Extend erlang:system_info/1 with lttng
Refactor and fix dtrace define in erl_message
erts: Add lttng tracepoints for async pool queue
erts: Add lttng tracepoints for drivers
erts: Add lttng tracepoints for scheduler events
erts: Add lttng tracepoints for memory carriers
erts: Update lttng-wrapper with mfa conversion
erts: Teach lttng to configure and build system
Diffstat (limited to 'erts/emulator/beam/erl_alloc.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h index 71e4713624..ee2013bd93 100644 --- a/erts/emulator/beam/erl_alloc.h +++ b/erts/emulator/beam/erl_alloc.h @@ -235,9 +235,9 @@ void *erts_alloc(ErtsAlcType_t type, Uint size) void *res; ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC); res = (*erts_allctrs[ERTS_ALC_T2A(type)].alloc)( - ERTS_ALC_T2N(type), - erts_allctrs[ERTS_ALC_T2A(type)].extra, - size); + ERTS_ALC_T2N(type), + erts_allctrs[ERTS_ALC_T2A(type)].extra, + size); if (!res) erts_alloc_n_enomem(ERTS_ALC_T2N(type), size); ERTS_MSACC_POP_STATE_X(); @@ -564,5 +564,3 @@ NAME##_free(TYPE *p) \ #undef ERTS_ALC_ATTRIBUTES #endif /* #ifndef ERL_ALLOC_H__ */ - - |