API change for lttng_get_readeable_code

The liblttngctl lttng_get_readeable_code call is renamed to
lttng_strerror.

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 62b3ca7c8608d09e9a46745e3bec981edf594696..a96c11f1da4cabcecb35198212ab102262130eb4 100644 (file)
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -208,7 +208,7 @@ struct lttng_handle {
  * array.
  *
  * On error, a negative value is returned being a specific lttng-tools error
- * code which can be humanly interpreted with lttng_get_readable_code(err).
+ * code which can be humanly interpreted with lttng_strerror(err).
  */
 
 /*
@@ -293,7 +293,7 @@ extern int lttng_set_tracing_group(const char *name);
  *
  * Parameter MUST be a negative value or else you'll get a generic message.
  */
-extern const char *lttng_get_readable_code(int code);
+extern const char *lttng_strerror(int code);
 
 /*
  * This call permits to register an "outside consumer" to a session and a lttng

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index 4c4cf80d33d866916510d774910a4ca231fca156..90977f8c3caa19190601089a0657b51ba0d0195c 100644 (file)
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -636,7 +636,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 /*
  *  Return a human readable string of code
  */
-const char *lttng_get_readable_code(int code)
+const char *lttng_strerror(int code)
 {
        if (code > -LTTCOMM_OK) {
                return "Ended with errors";

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 4da4cfbc1fa324d68fcb97dfac09ecfde249c9f9..167187e4da6801ba1b7e38ad9d21bd081b0b5730 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -3057,7 +3057,7 @@ static void *thread_manage_clients(void *data)
 
                DBG("Sending response (size: %d, retcode: %s)",
                                cmd_ctx->lttng_msg_size,
-                               lttng_get_readable_code(-cmd_ctx->llm->ret_code));
+                               lttng_strerror(-cmd_ctx->llm->ret_code));
                ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size);
                if (ret < 0) {
                        ERR("Failed to send data back to client");

diff --git a/lttng/commands/list.c b/lttng/commands/list.c
index 6afec1876c23b01ec24a878b724d0f8a0c2a5e08..50dad9a2b4efc3aa57cb747c72820cea36773add 100644 (file)
--- a/lttng/commands/list.c
+++ b/lttng/commands/list.c
@@ -267,7 +267,7 @@ static int list_channels(const char *channel_name)
                /* Listing events per channel */
                ret = list_events(channels[i].name);
                if (ret < 0) {
-                       MSG("%s", lttng_get_readable_code(ret));
+                       MSG("%s", lttng_strerror(ret));
                }
 
                if (chan_found) {

diff --git a/lttng/lttng.c b/lttng/lttng.c
index b9c6b5a8e2d2a2163485407105e20ef119ccec16..e76136669436d3bf0f9fa5739d35f2bcbc40eba7 100644 (file)
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -433,7 +433,7 @@ static int parse_args(int argc, char **argv)
                if (ret == -1) {
                        usage(stderr);
                } else {
-                       ERR("%s", lttng_get_readable_code(ret));
+                       ERR("%s", lttng_strerror(ret));
                }
                goto error;
        }

diff --git a/tests/lttng/kernel_all_events_basic.c b/tests/lttng/kernel_all_events_basic.c
index 14a9c7f45d719b224a39a5b73faa89aa5f600b4f..52546287f8be9bb97202087a5be0a2264bd680c9 100644 (file)
--- a/tests/lttng/kernel_all_events_basic.c
+++ b/tests/lttng/kernel_all_events_basic.c
@@ -57,28 +57,28 @@ int main(int argc, char **argv)
 
        printf("Creating tracing session (%s): ", argv[1]);
     if ((ret = lttng_create_session("test", argv[1])) < 0) {
-        printf("error creating the session : %s\n", lttng_get_readable_code(ret));
+        printf("error creating the session : %s\n", lttng_strerror(ret));
                goto create_fail;
     }
        PRINT_OK();
 
        printf("Creating session handle: ");
        if ((handle = lttng_create_handle("test", &dom)) == NULL) {
-               printf("error creating handle: %s\n", lttng_get_readable_code(ret));
+               printf("error creating handle: %s\n", lttng_strerror(ret));
                goto handle_fail;
        }
        PRINT_OK();
 
        printf("Enabling all kernel events: ");
     if ((ret = lttng_enable_event(handle, &event, channel_name)) < 0) {
-        printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+        printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
     }
        PRINT_OK();
 
        printf("Start tracing: ");
     if ((ret = lttng_start_tracing(handle)) < 0) {
-        printf("error starting tracing: %s\n", lttng_get_readable_code(ret));
+        printf("error starting tracing: %s\n", lttng_strerror(ret));
                goto start_fail;
     }
        PRINT_OK();
@@ -87,14 +87,14 @@ int main(int argc, char **argv)
 
        printf("Stop tracing: ");
        if ((ret = lttng_stop_tracing(handle)) < 0) {
-               printf("error stopping tracing: %s\n", lttng_get_readable_code(ret));
+               printf("error stopping tracing: %s\n", lttng_strerror(ret));
                goto stop_fail;
        }
        PRINT_OK();
 
        printf("Destroy tracing session: ");
        if ((ret = lttng_destroy_session(handle)) < 0) {
-               printf("error destroying session: %s\n", lttng_get_readable_code(ret));
+               printf("error destroying session: %s\n", lttng_strerror(ret));
        }
        PRINT_OK();
 

diff --git a/tests/lttng/kernel_event_basic.c b/tests/lttng/kernel_event_basic.c
index 18a6eb2cc6091f2bdf936b6f10dbcd6b9b3bb383..255557148ca8ff627e5677a7237dce23a353444e 100644 (file)
--- a/tests/lttng/kernel_event_basic.c
+++ b/tests/lttng/kernel_event_basic.c
@@ -76,76 +76,76 @@ int main(int argc, char **argv)
 
        printf("Creating tracing session (%s): ", argv[1]);
     if ((ret = lttng_create_session(session_name, argv[1])) < 0) {
-        printf("error creating the session : %s\n", lttng_get_readable_code(ret));
+        printf("error creating the session : %s\n", lttng_strerror(ret));
                goto create_fail;
     }
        PRINT_OK();
 
        printf("Creating session handle: ");
        if ((handle = lttng_create_handle(session_name, &dom)) == NULL) {
-               printf("error creating handle: %s\n", lttng_get_readable_code(ret));
+               printf("error creating handle: %s\n", lttng_strerror(ret));
                goto handle_fail;
        }
        PRINT_OK();
 
        printf("Enabling %s kernel channel: ", channel.name);
        if ((ret = lttng_enable_channel(handle, &channel)) < 0) {
-               printf("error enable channel: %s\n", lttng_get_readable_code(ret));
+               printf("error enable channel: %s\n", lttng_strerror(ret));
                goto enable_fail;
        }
 
        printf("Enabling %s kernel event: ", sched_switch.name);
     if ((ret = lttng_enable_event(handle, &sched_switch, channel.name)) < 0) {
-        printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+        printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
     }
        PRINT_OK();
 
        printf("Enabling %s kernel event: ", sched_process_exit.name);
        if ((ret = lttng_enable_event(handle, &sched_process_exit, channel.name)) < 0) {
-               printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+               printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
        }
        PRINT_OK();
 
        printf("Enabling %s kernel event: ", sched_process_free.name);
        if ((ret = lttng_enable_event(handle, &sched_process_free, channel.name)) < 0) {
-               printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+               printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
        }
        PRINT_OK();
 
        printf("Disabling %s kernel event: ", sched_switch.name);
        if ((ret = lttng_disable_event(handle, sched_switch.name, channel.name)) < 0) {
-               printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+               printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
        }
        PRINT_OK();
 
        printf("Disabling %s kernel event: ", sched_process_free.name);
        if ((ret = lttng_disable_event(handle, sched_process_free.name, channel.name)) < 0) {
-               printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+               printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
        }
        PRINT_OK();
 
        printf("Renabling %s kernel event: ", sched_switch.name);
        if ((ret = lttng_enable_event(handle, &sched_switch, channel.name)) < 0) {
-               printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+               printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
        }
        PRINT_OK();
 
        printf("Renabling %s kernel event: ", sched_process_free.name);
        if ((ret = lttng_enable_event(handle, &sched_process_free, channel.name)) < 0) {
-               printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+               printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
        }
        PRINT_OK();
 
        printf("Start tracing: ");
        if ((ret = lttng_start_tracing(handle)) < 0) {
-               printf("error starting tracing: %s\n", lttng_get_readable_code(ret));
+               printf("error starting tracing: %s\n", lttng_strerror(ret));
                goto start_fail;
        }
        PRINT_OK();
@@ -154,14 +154,14 @@ int main(int argc, char **argv)
 
        printf("Stop tracing: ");
        if ((ret = lttng_stop_tracing(handle)) < 0) {
-               printf("error stopping tracing: %s\n", lttng_get_readable_code(ret));
+               printf("error stopping tracing: %s\n", lttng_strerror(ret));
                goto stop_fail;
        }
        PRINT_OK();
 
        printf("Destroy tracing session: ");
        if ((ret = lttng_destroy_session(handle)) < 0) {
-               printf("error destroying session: %s\n", lttng_get_readable_code(ret));
+               printf("error destroying session: %s\n", lttng_strerror(ret));
        }
        PRINT_OK();