Merge branch 'egil/lttng-change-domain'

* egil/lttng-change-domain:
  runtime_tools: Change LTTng dyntrace domain
  erts: Change LTTng otp domain

4 files changed, 138 insertions, 138 deletions

diff --git a/erts/configure.in b/erts/configure.in
index ac2fae70ce..81ecad4f51 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -3858,15 +3858,15 @@ if test "$enable_lttng_test" = "yes" ; then
     AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM(
             [#include <lttng/tracepoint.h>
-             #define TRACEPOINT_PROVIDER com_ericsson_otp
+             #define TRACEPOINT_PROVIDER org_erlang_otp
              TRACEPOINT_EVENT(
-                 com_ericsson_otp,
+                 org_erlang_otp,
                  dummy,
                  TP_ARGS(int, my_int),
                  TP_FIELDS(ctf_integer(int, my_int, my_int)))
              #define TRACEPOINT_CREATE_PROBES
              #define TRACEPOINT_DEFINE],
-            [if(tracepoint_enabled(com_ericsson_otp,dummy)) do {} while(0)])],
+            [if(tracepoint_enabled(org_erlang_otp,dummy)) do {} while(0)])],
         [AC_MSG_RESULT([yes])],
         [AC_MSG_ERROR([no (available in lttng-ust v2.7)])])
     if test "x$ac_cv_header_lttng_tracepoint_h" = "xyes" \
diff --git a/erts/emulator/beam/erlang_lttng.h b/erts/emulator/beam/erlang_lttng.h
index 12f68e477b..4e869671f7 100644
--- a/erts/emulator/beam/erlang_lttng.h
+++ b/erts/emulator/beam/erlang_lttng.h
@@ -20,7 +20,7 @@
 
 #ifdef USE_LTTNG
 #undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER com_ericsson_otp
+#define TRACEPOINT_PROVIDER org_erlang_otp
 
 #undef TRACEPOINT_INCLUDE
 #define TRACEPOINT_INCLUDE "erlang_lttng.h"
@@ -33,7 +33,7 @@
 /* Schedulers */
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     scheduler_poll,
     TP_ARGS(
         int, id,
@@ -62,7 +62,7 @@ typedef struct {
 /* Port and Driver Scheduling */
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_start,
     TP_ARGS(
         char*, pid,
@@ -77,7 +77,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_init,
     TP_ARGS(
         char*, driver,
@@ -94,7 +94,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_outputv,
     TP_ARGS(
         char*, pid,
@@ -111,7 +111,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_output,
     TP_ARGS(
         char*, pid,
@@ -128,7 +128,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_ready_input,
     TP_ARGS(
         char*, pid,
@@ -143,7 +143,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_ready_output,
     TP_ARGS(
         char*, pid,
@@ -158,7 +158,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_event,
     TP_ARGS(
         char*, pid,
@@ -173,7 +173,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_timeout,
     TP_ARGS(
         char*, pid,
@@ -188,7 +188,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_stop_select,
     TP_ARGS(
         char*, driver
@@ -199,7 +199,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_flush,
     TP_ARGS(
         char*, pid,
@@ -214,7 +214,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_stop,
     TP_ARGS(
         char*, pid,
@@ -229,7 +229,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_process_exit,
     TP_ARGS(
         char*, pid,
@@ -244,7 +244,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_ready_async,
     TP_ARGS(
         char*, pid,
@@ -259,7 +259,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_finish,
     TP_ARGS(
         char*, driver
@@ -270,7 +270,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_call,
     TP_ARGS(
         char*, pid,
@@ -289,7 +289,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     driver_control,
     TP_ARGS(
         char*, pid,
@@ -310,7 +310,7 @@ TRACEPOINT_EVENT(
 /* Async pool */
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     aio_pool_get,
     TP_ARGS(
         char*, port,
@@ -323,7 +323,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     aio_pool_put,
     TP_ARGS(
         char*, port,
@@ -339,7 +339,7 @@ TRACEPOINT_EVENT(
 /* Memory Allocator */
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     carrier_create,
     TP_ARGS(
         const char*, type,
@@ -365,7 +365,7 @@ TRACEPOINT_EVENT(
 
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     carrier_destroy,
     TP_ARGS(
         const char*, type,
@@ -390,7 +390,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     carrier_pool_put,
     TP_ARGS(
         const char*, name,
@@ -405,7 +405,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_otp,
+    org_erlang_otp,
     carrier_pool_get,
     TP_ARGS(
         const char*, name,
diff --git a/erts/emulator/beam/lttng-wrapper.h b/erts/emulator/beam/lttng-wrapper.h
index 294872c365..0bc75c1552 100644
--- a/erts/emulator/beam/lttng-wrapper.h
+++ b/erts/emulator/beam/lttng-wrapper.h
@@ -77,23 +77,23 @@
     (RQ)->scheduler->no
 
 #define LTTNG_ENABLED(Name) \
-    tracepoint_enabled(com_ericsson_otp, Name)
+    tracepoint_enabled(org_erlang_otp, Name)
 
 /* include a special LTTNG_DO for do_tracepoint ? */
 #define LTTNG1(Name, Arg1) \
-    tracepoint(com_ericsson_otp, Name, (Arg1))
+    tracepoint(org_erlang_otp, Name, (Arg1))
 
 #define LTTNG2(Name, Arg1, Arg2) \
-    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2))
+    tracepoint(org_erlang_otp, Name, (Arg1), (Arg2))
 
 #define LTTNG3(Name, Arg1, Arg2, Arg3) \
-    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2), (Arg3))
+    tracepoint(org_erlang_otp, Name, (Arg1), (Arg2), (Arg3))
 
 #define LTTNG4(Name, Arg1, Arg2, Arg3, Arg4) \
-    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2), (Arg3), (Arg4))
+    tracepoint(org_erlang_otp, Name, (Arg1), (Arg2), (Arg3), (Arg4))
 
 #define LTTNG5(Name, Arg1, Arg2, Arg3, Arg4, Arg5) \
-    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2), (Arg3), (Arg4), (Arg5))
+    tracepoint(org_erlang_otp, Name, (Arg1), (Arg2), (Arg3), (Arg4), (Arg5))
 
 #else /* USE_LTTNG */
 
diff --git a/erts/emulator/test/lttng_SUITE.erl b/erts/emulator/test/lttng_SUITE.erl
index 1360751aee..6b7ad836f5 100644
--- a/erts/emulator/test/lttng_SUITE.erl
+++ b/erts/emulator/test/lttng_SUITE.erl
@@ -80,34 +80,34 @@ end_per_testcase(Case, _Config) ->
     ok.
 
 %% Not tested yet
-%%   com_ericsson_otp:driver_process_exit
-%%   com_ericsson_otp:driver_event
+%%   org_erlang_otp:driver_process_exit
+%%   org_erlang_otp:driver_event
 
 %% tracepoints
 %%
-%%   com_ericsson_otp:carrier_pool_get
-%%   com_ericsson_otp:carrier_pool_put
-%%   com_ericsson_otp:carrier_destroy
-%%   com_ericsson_otp:carrier_create
-%%   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
-%%   com_ericsson_otp:driver_ready_async
-%%   com_ericsson_otp:driver_process_exit
-%%   com_ericsson_otp:driver_stop
-%%   com_ericsson_otp:driver_flush
-%%   com_ericsson_otp:driver_stop_select
-%%   com_ericsson_otp:driver_timeout
-%%   com_ericsson_otp:driver_event
-%%   com_ericsson_otp:driver_ready_output
-%%   com_ericsson_otp:driver_ready_input
-%%   com_ericsson_otp:driver_output
-%%   com_ericsson_otp:driver_outputv
-%%   com_ericsson_otp:driver_init
-%%   com_ericsson_otp:driver_start
-%%   com_ericsson_otp:scheduler_poll
+%%   org_erlang_otp:carrier_pool_get
+%%   org_erlang_otp:carrier_pool_put
+%%   org_erlang_otp:carrier_destroy
+%%   org_erlang_otp:carrier_create
+%%   org_erlang_otp:aio_pool_put
+%%   org_erlang_otp:aio_pool_get
+%%   org_erlang_otp:driver_control
+%%   org_erlang_otp:driver_call
+%%   org_erlang_otp:driver_finish
+%%   org_erlang_otp:driver_ready_async
+%%   org_erlang_otp:driver_process_exit
+%%   org_erlang_otp:driver_stop
+%%   org_erlang_otp:driver_flush
+%%   org_erlang_otp:driver_stop_select
+%%   org_erlang_otp:driver_timeout
+%%   org_erlang_otp:driver_event
+%%   org_erlang_otp:driver_ready_output
+%%   org_erlang_otp:driver_ready_input
+%%   org_erlang_otp:driver_output
+%%   org_erlang_otp:driver_outputv
+%%   org_erlang_otp:driver_init
+%%   org_erlang_otp:driver_start
+%%   org_erlang_otp:scheduler_poll
 
 %%
 %% Testcases
@@ -117,48 +117,48 @@ t_lttng_list(_Config) ->
     {ok, _} = cmd("lttng list -u"),
     ok.
 
-%% com_ericsson_otp:carrier_pool_get
-%% com_ericsson_otp:carrier_pool_put
+%% org_erlang_otp:carrier_pool_get
+%% org_erlang_otp:carrier_pool_put
 t_carrier_pool(Config) ->
     case have_carriers(ets_alloc) of
         false ->
             {skip, "No Memory Carriers configured on system."};
         true ->
-            ok = lttng_start_event("com_ericsson_otp:carrier_pool*", Config),
+            ok = lttng_start_event("org_erlang_otp:carrier_pool*", Config),
 
             ok = ets_load(),
 
             Res = lttng_stop_and_view(Config),
-            ok = check_tracepoint("com_ericsson_otp:carrier_pool_get", Res),
-            ok = check_tracepoint("com_ericsson_otp:carrier_pool_put", Res),
+            ok = check_tracepoint("org_erlang_otp:carrier_pool_get", Res),
+            ok = check_tracepoint("org_erlang_otp:carrier_pool_put", Res),
             ok
     end.
 
-%% com_ericsson_otp:carrier_destroy
-%% com_ericsson_otp:carrier_create
+%% org_erlang_otp:carrier_destroy
+%% org_erlang_otp:carrier_create
 t_memory_carrier(Config) ->
     case have_carriers(ets_alloc) of
         false ->
             {skip, "No Memory Carriers configured on system."};
         true ->
-            ok = lttng_start_event("com_ericsson_otp:carrier_*", Config),
+            ok = lttng_start_event("org_erlang_otp:carrier_*", Config),
 
             ok = ets_load(),
 
             Res = lttng_stop_and_view(Config),
-            ok = check_tracepoint("com_ericsson_otp:carrier_destroy", Res),
-            ok = check_tracepoint("com_ericsson_otp:carrier_create", Res),
+            ok = check_tracepoint("org_erlang_otp:carrier_destroy", Res),
+            ok = check_tracepoint("org_erlang_otp:carrier_create", Res),
             ok
     end.
 
-%% com_ericsson_otp:aio_pool_put
-%% com_ericsson_otp:aio_pool_get
+%% org_erlang_otp:aio_pool_put
+%% org_erlang_otp:aio_pool_get
 t_async_io_pool(Config) ->
     case have_async_threads() of
         false ->
             {skip, "No Async Threads configured on system."};
         true ->
-            ok = lttng_start_event("com_ericsson_otp:aio_pool_*", Config),
+            ok = lttng_start_event("org_erlang_otp:aio_pool_*", Config),
 
             Path1 = proplists:get_value(priv_dir, Config),
             {ok, [[Path2]]} = init:get_argument(home),
@@ -168,16 +168,16 @@ t_async_io_pool(Config) ->
             {ok, _} = file:list_dir(Path2),
 
             Res = lttng_stop_and_view(Config),
-            ok = check_tracepoint("com_ericsson_otp:aio_pool_put", Res),
-            ok = check_tracepoint("com_ericsson_otp:aio_pool_get", Res),
+            ok = check_tracepoint("org_erlang_otp:aio_pool_put", Res),
+            ok = check_tracepoint("org_erlang_otp:aio_pool_get", Res),
             ok
     end.
 
 
-%% com_ericsson_otp:driver_start
-%% com_ericsson_otp:driver_stop
+%% org_erlang_otp:driver_start
+%% org_erlang_otp:driver_stop
 t_driver_start_stop(Config) ->
-    ok = lttng_start_event("com_ericsson_otp:driver_*", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_*", Config),
     timer:sleep(500),
     Path = proplists:get_value(priv_dir, Config),
     Name = filename:join(Path, "sometext.txt"),
@@ -186,35 +186,35 @@ t_driver_start_stop(Config) ->
     {ok, Bin} = file:read_file(Name),
     timer:sleep(500),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_otp:driver_start", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_stop", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_control", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_outputv", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_ready_async", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_start", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_stop", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_control", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_outputv", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_ready_async", Res),
     ok.
 
-%% com_ericsson_otp:driver_control
-%% com_ericsson_otp:driver_outputv
-%% com_ericsson_otp:driver_ready_async
+%% org_erlang_otp:driver_control
+%% org_erlang_otp:driver_outputv
+%% org_erlang_otp:driver_ready_async
 t_driver_control_ready_async(Config) ->
-    ok = lttng_start_event("com_ericsson_otp:driver_control", Config),
-    ok = lttng_start_event("com_ericsson_otp:driver_outputv", Config),
-    ok = lttng_start_event("com_ericsson_otp:driver_ready_async", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_control", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_outputv", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_ready_async", Config),
     Path = proplists:get_value(priv_dir, Config),
     Name = filename:join(Path, "sometext.txt"),
     Bin  = txt(),
     ok = file:write_file(Name, Bin),
     {ok, Bin} = file:read_file(Name),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_otp:driver_control", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_outputv", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_ready_async", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_control", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_outputv", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_ready_async", Res),
     ok.
 
-%% com_ericsson_otp:driver_ready_input
-%% com_ericsson_otp:driver_ready_output
+%% org_erlang_otp:driver_ready_input
+%% org_erlang_otp:driver_ready_output
 t_driver_ready_input_output(Config) ->
-    ok = lttng_start_event("com_ericsson_otp:driver_ready_*", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_ready_*", Config),
     timer:sleep(500),
     Me = self(),
     Pid = spawn_link(fun() -> tcp_server(Me, active) end),
@@ -230,15 +230,15 @@ t_driver_ready_input_output(Config) ->
 
     timer:sleep(500),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_otp:driver_ready_input", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_ready_output", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_ready_input", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_ready_output", Res),
     ok.
 
 
-%% com_ericsson_otp:driver_stop_select
-%% com_ericsson_otp:driver_timeout
+%% org_erlang_otp:driver_stop_select
+%% org_erlang_otp:driver_timeout
 t_driver_timeout(Config) ->
-    ok = lttng_start_event("com_ericsson_otp:driver_*", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_*", Config),
     Me = self(),
     Pid = spawn_link(fun() -> tcp_server(Me, timeout) end),
     receive {Pid, accept} -> ok end,
@@ -247,16 +247,16 @@ t_driver_timeout(Config) ->
     receive {Pid, done} -> ok end,
     ok = gen_tcp:close(Sock),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_otp:driver_timeout", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_stop_select", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_timeout", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_stop_select", Res),
     ok.
  
-%% com_ericsson_otp:driver_call
-%% com_ericsson_otp:driver_output
-%% com_ericsson_otp:driver_init
-%% com_ericsson_otp:driver_finish
+%% org_erlang_otp:driver_call
+%% org_erlang_otp:driver_output
+%% org_erlang_otp:driver_init
+%% org_erlang_otp:driver_finish
 t_driver_caller(Config) ->
-    ok = lttng_start_event("com_ericsson_otp:driver_*", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_*", Config),
 
     Drv = 'caller_drv',
     os:putenv("CALLER_DRV_USE_OUTPUTV", "false"),
@@ -282,25 +282,25 @@ t_driver_caller(Config) ->
     erl_ddll:unload_driver(Drv),
 
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_otp:driver_call", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_output", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_init", Res),
-    ok = check_tracepoint("com_ericsson_otp:driver_finish", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_call", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_output", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_init", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_finish", Res),
     ok.
  
-%% com_ericsson_otp:scheduler_poll
+%% org_erlang_otp:scheduler_poll
 t_scheduler_poll(Config) ->
-    ok = lttng_start_event("com_ericsson_otp:scheduler_poll", Config),
+    ok = lttng_start_event("org_erlang_otp:scheduler_poll", Config),
 
     ok = memory_load(),
 
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_otp:scheduler_poll", Res),
+    ok = check_tracepoint("org_erlang_otp:scheduler_poll", Res),
     ok.
 
-%% com_ericsson_otp:driver_flush
+%% org_erlang_otp:driver_flush
 t_driver_flush(Config) ->
-    ok = lttng_start_event("com_ericsson_otp:driver_flush", Config),
+    ok = lttng_start_event("org_erlang_otp:driver_flush", Config),
 
     Me = self(),
     Pid = spawn_link(fun() -> tcp_server(Me, passive_no_read) end),
@@ -324,7 +324,7 @@ t_driver_flush(Config) ->
     receive {Pid, done} -> ok end,
 
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_otp:driver_flush", Res),
+    ok = check_tracepoint("org_erlang_otp:driver_flush", Res),
     ok.
 
 %%
@@ -416,29 +416,29 @@ tcp_server(Pid, Type) ->
 txt() ->
     <<"%% tracepoints\n"
       "%%\n"
-      "%%   com_ericsson_otp:carrier_pool_get\n"
-      "%%   com_ericsson_otp:carrier_pool_put\n"
-      "%%   com_ericsson_otp:carrier_destroy\n"
-      "%%   com_ericsson_otp:carrier_create\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"
-      "%%   com_ericsson_otp:driver_finish\n"
-      "%%   com_ericsson_otp:driver_ready_async\n"
-      "%%   com_ericsson_otp:driver_process_exit\n"
-      "%%   com_ericsson_otp:driver_stop\n"
-      "%%   com_ericsson_otp:driver_flush\n"
-      "%%   com_ericsson_otp:driver_stop_select\n"
-      "%%   com_ericsson_otp:driver_timeout\n"
-      "%%   com_ericsson_otp:driver_event\n"
-      "%%   com_ericsson_otp:driver_ready_output\n"
-      "%%   com_ericsson_otp:driver_ready_input\n"
-      "%%   com_ericsson_otp:driver_output\n"
-      "%%   com_ericsson_otp:driver_outputv\n"
-      "%%   com_ericsson_otp:driver_init\n"
-      "%%   com_ericsson_otp:driver_start\n"
-      "%%   com_ericsson_otp:scheduler_poll">>.
+      "%%   org_erlang_otp:carrier_pool_get\n"
+      "%%   org_erlang_otp:carrier_pool_put\n"
+      "%%   org_erlang_otp:carrier_destroy\n"
+      "%%   org_erlang_otp:carrier_create\n"
+      "%%   org_erlang_otp:aio_pool_put\n"
+      "%%   org_erlang_otp:aio_pool_get\n"
+      "%%   org_erlang_otp:driver_control\n"
+      "%%   org_erlang_otp:driver_call\n"
+      "%%   org_erlang_otp:driver_finish\n"
+      "%%   org_erlang_otp:driver_ready_async\n"
+      "%%   org_erlang_otp:driver_process_exit\n"
+      "%%   org_erlang_otp:driver_stop\n"
+      "%%   org_erlang_otp:driver_flush\n"
+      "%%   org_erlang_otp:driver_stop_select\n"
+      "%%   org_erlang_otp:driver_timeout\n"
+      "%%   org_erlang_otp:driver_event\n"
+      "%%   org_erlang_otp:driver_ready_output\n"
+      "%%   org_erlang_otp:driver_ready_input\n"
+      "%%   org_erlang_otp:driver_output\n"
+      "%%   org_erlang_otp:driver_outputv\n"
+      "%%   org_erlang_otp:driver_init\n"
+      "%%   org_erlang_otp:driver_start\n"
+      "%%   org_erlang_otp:scheduler_poll">>.
 
 load_driver(Dir, Driver) ->
     case erl_ddll:load_driver(Dir, Driver) of