From 74eafcdaff43d7d84264110066c52fa01e65f159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Mon, 2 May 2016 17:36:33 +0200
Subject: erts: Change argument order for LTTng driver_stop

* Be consistent.
---
 erts/emulator/beam/erlang_lttng.h   | 6 +++---
 erts/emulator/beam/io.c             | 2 +-
 lib/runtime_tools/doc/src/LTTng.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/erts/emulator/beam/erlang_lttng.h b/erts/emulator/beam/erlang_lttng.h
index 43ceeda671..f7d751252d 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)
     )
 )
 
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/lib/runtime_tools/doc/src/LTTng.xml b/lib/runtime_tools/doc/src/LTTng.xml
index 57c73469d1..0d970c487b 100644
--- a/lib/runtime_tools/doc/src/LTTng.xml
+++ b/lib/runtime_tools/doc/src/LTTng.xml
@@ -337,11 +337,11 @@ $ make </code>
         <p><em>driver_stop</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
         </list>
         <p>Example:</p>
-        <p><code type="none">driver_stop: { cpu_id = 5 }, { pid = "[]", driver = "efile", port = "#Port&lt;0.3673&gt;" }</code></p>
+        <p><code type="none">driver_stop: { cpu_id = 5 }, { pid = "[]", port = "#Port&lt;0.3673&gt;", driver = "efile" }</code></p>
 
         <p><em>driver_process_exit</em></p>
         <list type="bulleted">
-- 
cgit v1.2.3