X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.c;h=4ea8e08607c6067a6bffa645c5bf2e377823dc14;hb=23649f1186d370ae42454b8f82c09ae77c5dbaf1;hp=d3d952a7de810d3ab0f52d19a8ee805ba2a9c236;hpb=c25613651ac7525a16b9877230a682fc1a64e036;p=lttng-tools.git

diff --git a/src/common/error.c b/src/common/error.c
index d3d952a7d..4ea8e0860 100644
--- 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,8 +46,9 @@ const char *log_add_time(void)
 	struct tm tm, *res;
 	struct timespec tp;
 	time_t now;
+	const int errsv = errno;
 
-	ret = clock_gettime(CLOCK_REALTIME, &tp);
+	ret = lttng_clock_gettime(CLOCK_REALTIME, &tp);
 	if (ret < 0) {
 		goto error;
 	}
@@ -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,12 @@ 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_INVALID_TRIGGER) ] = "Invalid trigger",
+	[ ERROR_INDEX(LTTNG_ERR_TRIGGER_EXISTS) ] = "Trigger already registered",
+	[ ERROR_INDEX(LTTNG_ERR_TRIGGER_NOT_FOUND) ] = "Trigger not found",
+	[ ERROR_INDEX(LTTNG_ERR_COMMAND_CANCELLED) ] = "Command cancelled",
+	[ ERROR_INDEX(LTTNG_ERR_AGENT_TRACING_DISABLED) ] = "Session daemon agent tracing is disabled",
 
 	/* Last element */
 	[ ERROR_INDEX(LTTNG_ERR_NR) ] = "Unknown error code"