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

4 files changed, 12 insertions, 12 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
diff --git a/erts/emulator/beam/erlang_lttng.h b/erts/emulator/beam/erlang_lttng.h
index 43ceeda671..12f68e477b 100644
--- a/erts/emulator/beam/erlang_lttng.h
+++ b/erts/emulator/beam/erlang_lttng.h
@@ -218,13 +218,13 @@ TRACEPOINT_EVENT(
     driver_stop,
     TP_ARGS(
         char*, pid,
-        char*, driver,
-        char*, port
+        char*, port,
+        char*, driver
     ),
     TP_FIELDS(
         ctf_string(pid, pid)
-        ctf_string(driver, driver)
         ctf_string(port, port)
+        ctf_string(driver, driver)
     )
 )
 
@@ -324,7 +324,7 @@ TRACEPOINT_EVENT(
 
 TRACEPOINT_EVENT(
     com_ericsson_otp,
-    aio_pool_add,
+    aio_pool_put,
     TP_ARGS(
         char*, port,
         int, length
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index b14ca77a04..5c2595c69d 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -3861,7 +3861,7 @@ terminate_port(Port *prt)
             lttng_decl_procbuf(proc_str);
             lttng_pid_to_str(connected_id, proc_str);
             lttng_port_to_str(prt, port_str);
-            LTTNG3(driver_stop, proc_str, drv->name, port_str);
+            LTTNG3(driver_stop, proc_str, port_str, drv->name);
         }
 #endif
 
diff --git a/erts/emulator/test/lttng_SUITE.erl b/erts/emulator/test/lttng_SUITE.erl
index d0f6292d5b..efc79f42ed 100644
--- a/erts/emulator/test/lttng_SUITE.erl
+++ b/erts/emulator/test/lttng_SUITE.erl
@@ -89,8 +89,8 @@ end_per_testcase(Case, _Config) ->
 %%   com_ericsson_otp:carrier_pool_put
 %%   com_ericsson_otp:carrier_destroy
 %%   com_ericsson_otp:carrier_create
-%%   com_ericsson_otp:aio_pool_add 
-%%   com_ericsson_otp:aio_pool_get 
+%%   com_ericsson_otp:aio_pool_put
+%%   com_ericsson_otp:aio_pool_get
 %%   com_ericsson_otp:driver_control
 %%   com_ericsson_otp:driver_call
 %%   com_ericsson_otp:driver_finish
@@ -151,7 +151,7 @@ t_memory_carrier(Config) ->
             ok
     end.
 
-%% com_ericsson_otp:aio_pool_add
+%% com_ericsson_otp:aio_pool_put
 %% com_ericsson_otp:aio_pool_get
 t_async_io_pool(Config) ->
     case have_async_threads() of
@@ -168,7 +168,7 @@ t_async_io_pool(Config) ->
             {ok, _} = file:list_dir(Path2),
 
             Res = lttng_stop_and_view(Config),
-            ok = check_tracepoint("com_ericsson_otp:aio_pool_add", Res),
+            ok = check_tracepoint("com_ericsson_otp:aio_pool_put", Res),
             ok = check_tracepoint("com_ericsson_otp:aio_pool_get", Res),
             ok
     end.
@@ -416,7 +416,7 @@ txt() ->
       "%%   com_ericsson_otp:carrier_pool_put\n"
       "%%   com_ericsson_otp:carrier_destroy\n"
       "%%   com_ericsson_otp:carrier_create\n"
-      "%%   com_ericsson_otp:aio_pool_add\n"
+      "%%   com_ericsson_otp:aio_pool_put\n"
       "%%   com_ericsson_otp:aio_pool_get\n"
       "%%   com_ericsson_otp:driver_control\n"
       "%%   com_ericsson_otp:driver_call\n"