diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-03 15:52:36 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-03 15:52:36 +0200 |
| commit | 10cf76e07b3105d6e4355f07a96e2dcc9d1efcda (patch) | |
| tree | d2962204e5fa8cfb9bd87e1e50de1c73a5e25339 /erts/emulator/beam/erl_async.c | |
| parent | 42c6436eb39dee7289f9dd03532015a1288ecafa (diff) | |
| parent | 95194afd63545c7d60e31b5148584f0707034347 (diff) | |
| download | otp-10cf76e07b3105d6e4355f07a96e2dcc9d1efcda.tar.gz otp-10cf76e07b3105d6e4355f07a96e2dcc9d1efcda.tar.bz2 otp-10cf76e07b3105d6e4355f07a96e2dcc9d1efcda.zip | |
Merge branch 'egil/erts/doc-lttng-beam-tps/OTP-10282'
* egil/erts/doc-lttng-beam-tps/OTP-10282:
erts: Rename LTTng tracepoint aio_pool_add to aio_pool_put
erts: Change argument order for LTTng driver_stop
runtime_tools: Document BEAM lttng tracepoints
Diffstat (limited to 'erts/emulator/beam/erl_async.c')
| -rw-r--r-- | erts/emulator/beam/erl_async.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c index 4d6d699d9f..84254af0c2 100644 --- a/erts/emulator/beam/erl_async.c +++ b/erts/emulator/beam/erl_async.c @@ -283,10 +283,10 @@ static ERTS_INLINE void async_add(ErtsAsync *a, ErtsAsyncQ* q) erts_thr_q_enqueue(&q->thr_q, a); #ifdef USE_LTTNG_VM_TRACEPOINTS - if (LTTNG_ENABLED(aio_pool_add)) { + if (LTTNG_ENABLED(aio_pool_put)) { lttng_decl_portbuf(port_str); lttng_portid_to_str(a->port, port_str); - LTTNG2(aio_pool_add, port_str, -1); + LTTNG2(aio_pool_put, port_str, -1); } #endif #ifdef USE_VM_PROBES |