Fix: logging: log_add_time() save/restore errno

[lttng-tools.git] / src / common / error.c

diff --git a/src/common/error.c b/src/common/error.c
index 1067e48527e8d3fc70a46cd3766d26bc8d475f8d..2092fcf235e954af1afe4eb56599a399a9c4b4a9 100644 (file)
--- a/src/common/error.c
+++ b/src/common/error.c
@@ -20,6 +20,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include <lttng/lttng-error.h>
 #include <common/common.h>
@@ -45,6 +46,7 @@ const char *log_add_time(void)
        struct tm tm, *res;
        struct timespec tp;
        time_t now;
+       const int errsv = errno;
 
        ret = lttng_clock_gettime(CLOCK_REALTIME, &tp);
        if (ret < 0) {
@@ -59,16 +61,18 @@ const char *log_add_time(void)
 
        /* Format time in the TLS variable. */
        ret = snprintf(URCU_TLS(error_log_time).str, sizeof(URCU_TLS(error_log_time).str),
-                       "%02d:%02d:%02d.%06ld",
+                       "%02d:%02d:%02d.%09ld",
                        tm.tm_hour, tm.tm_min, tm.tm_sec, tp.tv_nsec);
        if (ret < 0) {
                goto error;
        }
 
+       errno = errsv;
        return URCU_TLS(error_log_time).str;
 
 error:
        /* Return an empty string on error so logging is not affected. */
+       errno = errsv;
        return "";
 }
 
@@ -185,6 +189,8 @@ static const char *error_string_array[] = {
        [ ERROR_INDEX(LTTNG_ERR_KERN_CONTEXT_UNAVAILABLE) ] = "Context unavailable on this kernel",
        [ ERROR_INDEX(LTTNG_ERR_REGEN_STATEDUMP_FAIL) ] = "Failed to regenerate the state dump",
        [ ERROR_INDEX(LTTNG_ERR_REGEN_STATEDUMP_NOMEM) ] = "Failed to regenerate the state dump, not enough memory",
+       [ ERROR_INDEX(LTTNG_ERR_NOT_SNAPSHOT_SESSION) ] = "Snapshot command can't be applied to a non-snapshot session",
+       [ ERROR_INDEX(LTTNG_ERR_AGENT_TRACING_DISABLED) ] = "Session daemon agent tracing is disabled",
 
        /* Last element */
        [ ERROR_INDEX(LTTNG_ERR_NR) ] = "Unknown error code"