X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.c;h=ad0ac51d4a5ad1af4611f1667a138e05b875c535;hp=bff21ae7139782bf0b5ca49e06418731759abfd0;hb=b93a4a13a2724a73069e1d661df5df83c629bb36;hpb=cde3e505b7948c15880114268534d21fb1f10a1c

diff --git a/src/common/error.c b/src/common/error.c
index bff21ae71..ad0ac51d4 100644
--- a/src/common/error.c
+++ b/src/common/error.c
@@ -16,7 +16,9 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
+#include <inttypes.h>
 
 #include <lttng/lttng-error.h>
 #include <common/common.h>
@@ -25,6 +27,43 @@
 
 #define ERROR_INDEX(code) (code - LTTNG_OK)
 
+/* TLS variable that contains the time of one single log entry. */
+DEFINE_URCU_TLS(struct log_time, error_log_time);
+
+LTTNG_HIDDEN
+const char *log_add_time(void)
+{
+	int ret;
+	struct tm tm, *res;
+	struct timespec tp;
+	time_t now;
+
+	ret = clock_gettime(CLOCK_REALTIME, &tp);
+	if (ret < 0) {
+		goto error;
+	}
+	now = (time_t) tp.tv_sec;
+
+	res = localtime_r(&now, &tm);
+	if (!res) {
+		goto error;
+	}
+
+	/* 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",
+			tm.tm_hour, tm.tm_min, tm.tm_sec, tp.tv_nsec);
+	if (ret < 0) {
+		goto error;
+	}
+
+	return URCU_TLS(error_log_time).str;
+
+error:
+	/* Return an empty string on error so logging is not affected. */
+	return "";
+}
+
 /*
  * Human readable error message.
  */
@@ -84,8 +123,8 @@ static const char *error_string_array[] = {
 	[ ERROR_INDEX(LTTNG_ERR_UST_CONTEXT_INVAL)] = "UST invalid context",
 	[ ERROR_INDEX(LTTNG_ERR_NEED_ROOT_SESSIOND) ] = "Tracing the kernel requires a root lttng-sessiond daemon, as well as \"tracing\" group membership or root user ID for the lttng client.",
 	[ ERROR_INDEX(LTTNG_ERR_NO_UST) ] = "LTTng-UST tracer is not supported. Please rebuild lttng-tools with lttng-ust support enabled.",
-	[ ERROR_INDEX(LTTNG_ERR_TRACE_ALREADY_STARTED) ] = "Tracing already started",
-	[ ERROR_INDEX(LTTNG_ERR_TRACE_ALREADY_STOPPED) ] = "Tracing already stopped",
+	[ ERROR_INDEX(LTTNG_ERR_TRACE_ALREADY_STARTED) ] = "Tracing has already been started once",
+	[ ERROR_INDEX(LTTNG_ERR_TRACE_ALREADY_STOPPED) ] = "Tracing has already been stopped",
 	[ ERROR_INDEX(LTTNG_ERR_KERN_EVENT_ENOSYS) ] = "Kernel event type not supported",
 	[ ERROR_INDEX(LTTNG_ERR_NEED_CHANNEL_NAME) ] = "Non-default channel exists within session: channel name needs to be specified with '-c name'",
 	[ ERROR_INDEX(LTTNG_ERR_INVALID) ] = "Invalid parameter",
@@ -116,6 +155,20 @@ static const char *error_string_array[] = {
 	[ ERROR_INDEX(LTTNG_ERR_CHAN_EXIST) ] = "Channel already exists",
 	[ ERROR_INDEX(LTTNG_ERR_SNAPSHOT_NODATA) ] = "No data available in snapshot",
 	[ ERROR_INDEX(LTTNG_ERR_NO_CHANNEL) ] = "No channel found in the session",
+	[ ERROR_INDEX(LTTNG_ERR_SESSION_INVALID_CHAR) ] = "Invalid character found in session name",
+	[ ERROR_INDEX(LTTNG_ERR_SAVE_FILE_EXIST) ] = "Session file already exists",
+	[ ERROR_INDEX(LTTNG_ERR_SAVE_IO_FAIL) ] = "IO error while writting session configuration",
+	[ ERROR_INDEX(LTTNG_ERR_LOAD_INVALID_CONFIG) ] = "Invalid session configuration",
+	[ ERROR_INDEX(LTTNG_ERR_LOAD_IO_FAIL) ] = "IO error while reading a session configuration",
+	[ ERROR_INDEX(LTTNG_ERR_LOAD_SESSION_NOENT) ] = "Session file not found",
+	[ ERROR_INDEX(LTTNG_ERR_MAX_SIZE_INVALID) ] = "Snapshot max size is invalid",
+	[ ERROR_INDEX(LTTNG_ERR_MI_OUTPUT_TYPE) ] = "Invalid MI output format",
+	[ ERROR_INDEX(LTTNG_ERR_MI_IO_FAIL) ] = "IO error while writing MI output",
+	[ ERROR_INDEX(LTTNG_ERR_MI_NOT_IMPLEMENTED) ] = "Mi feature not implemented",
+	[ ERROR_INDEX(LTTNG_ERR_INVALID_EVENT_NAME) ] = "Invalid event name",
+	[ ERROR_INDEX(LTTNG_ERR_INVALID_CHANNEL_NAME) ] = "Invalid channel name",
+	[ ERROR_INDEX(LTTNG_ERR_PID_TRACKED) ] = "PID already tracked",
+	[ ERROR_INDEX(LTTNG_ERR_PID_NOT_TRACKED) ] = "PID not tracked",
 
 	/* Last element */
 	[ ERROR_INDEX(LTTNG_ERR_NR) ] = "Unknown error code"