X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.c;h=8983652f9a1351c693ff2f5990231f5207178bd6;hb=d3a684eebfe788a7527368d65d7f020bdd1e61d9;hp=c5ddadfa07976b2ad406ff3d3819293d3f0f9646;hpb=546699de452c27c8687a9c4e522359079ef5e4fa;p=deliverable%2Flttng-tools.git

diff --git a/src/common/error.c b/src/common/error.c
index c5ddadfa0..8983652f9 100644
--- a/src/common/error.c
+++ b/src/common/error.c
@@ -1,30 +1,21 @@
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
 #include <assert.h>
+#include <errno.h>
 #include <inttypes.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
-#include <lttng/lttng-error.h>
 #include <common/common.h>
 #include <common/compat/getenv.h>
+#include <lttng/lttng-error.h>
 
 #include "error.h"
 
@@ -38,6 +29,7 @@ static int lttng_opt_abort_on_error = -1;
 
 /* TLS variable that contains the time of one single log entry. */
 DEFINE_URCU_TLS(struct log_time, error_log_time);
+DEFINE_URCU_TLS(const char *, logger_thread_name);
 
 LTTNG_HIDDEN
 const char *log_add_time(void)
@@ -76,6 +68,30 @@ error:
 	return "";
 }
 
+LTTNG_HIDDEN
+void logger_set_thread_name(const char *name, bool set_pthread_name)
+{
+	int ret;
+
+	assert(name);
+	URCU_TLS(logger_thread_name) = name;
+
+	if (set_pthread_name) {
+		char pthread_name[16];
+
+		/*
+		 * Truncations are expected since pthread limits thread names to
+		 * a generous 16 characters.
+		 */
+		strncpy(pthread_name, name, sizeof(pthread_name));
+		pthread_name[sizeof(pthread_name) - 1] = '\0';
+		ret = pthread_setname_np(pthread_self(), pthread_name);
+		if (ret) {
+			DBG("Failed to set pthread name attribute");
+		}
+	}
+}
+
 /*
  * Human readable error message.
  */