diff options
| author | Lukas Larsson <[email protected]> | 2014-03-25 09:44:16 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-25 09:44:16 +0100 |
| commit | 1eee4ded1b435d3728fc75ad384626c80025bb3b (patch) | |
| tree | 3258699aad3a77eb06f416b6187473848131c219 /erts/emulator/beam/erl_async.c | |
| parent | c7df173fbd45965d78c67dea617ae7b9bbe23089 (diff) | |
| parent | effb1c0a593e71664dec5b06da72518e74254c1b (diff) | |
| download | otp-1eee4ded1b435d3728fc75ad384626c80025bb3b.tar.gz otp-1eee4ded1b435d3728fc75ad384626c80025bb3b.tar.bz2 otp-1eee4ded1b435d3728fc75ad384626c80025bb3b.zip | |
Merge branch 'paulgray/dtrace_snprintf_fix/OTP-11816'
* paulgray/dtrace_snprintf_fix/OTP-11816:
Pass full strings to DTrace probes
Diffstat (limited to 'erts/emulator/beam/erl_async.c')
| -rw-r--r-- | erts/emulator/beam/erl_async.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c index b3dc327704..decae6b2ca 100644 --- a/erts/emulator/beam/erl_async.c +++ b/erts/emulator/beam/erl_async.c @@ -292,7 +292,8 @@ static ERTS_INLINE void async_add(ErtsAsync *a, ErtsAsyncQ* q) if (DTRACE_ENABLED(aio_pool_add)) { DTRACE_CHARBUF(port_str, 16); - erts_snprintf(port_str, sizeof(port_str), "%T", a->port); + erts_snprintf(port_str, sizeof(DTRACE_CHARBUF_NAME(port_str)), + "%T", a->port); /* DTRACE TODO: Get the queue length from erts_thr_q_enqueue() ? */ len = -1; DTRACE2(aio_pool_add, port_str, len); @@ -327,7 +328,8 @@ static ERTS_INLINE ErtsAsync *async_get(ErtsThrQ_t *q, if (DTRACE_ENABLED(aio_pool_get)) { DTRACE_CHARBUF(port_str, 16); - erts_snprintf(port_str, sizeof(port_str), "%T", a->port); + erts_snprintf(port_str, sizeof(DTRACE_CHARBUF_NAME(port_str)), + "%T", a->port); /* DTRACE TODO: Get the length from erts_thr_q_dequeue() ? */ len = -1; DTRACE2(aio_pool_get, port_str, len); |