X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fusterr-signal-safe.h;h=868a0d8b81257d186cd5a788e40c1891058c52b7;hb=aab8b172425eb52f2cd5bd71ce03f8a5624f83df;hp=1df5ada0ff2ec290d4eb5f53a15836a5bb7cb454;hpb=b52af4675af8dce5a6c99f366102713c335a05da;p=lttng-ust.git

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index 1df5ada0..868a0d8b 100644
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -1,56 +1,51 @@
-#ifndef _USTERR_SIGNAL_SAFE_H
-#define _USTERR_SIGNAL_SAFE_H
-
 /*
- * Copyright (C) 2009  Pierre-Marc Fournier
- * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
- *
- * This library 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
- * Lesser General Public License for more details.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#ifndef _USTERR_SIGNAL_SAFE_H
+#define _USTERR_SIGNAL_SAFE_H
+
 #include <string.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <share.h>
-#include "lttng/ust-tid.h"
-
-enum ust_loglevel {
-	UST_LOGLEVEL_UNKNOWN = 0,
-	UST_LOGLEVEL_NORMAL,
-	UST_LOGLEVEL_DEBUG,
+#include <ust-share.h>
+#include "ust-tid.h"
+#include "ust-snprintf.h"
+
+enum ust_err_loglevel {
+	UST_ERR_LOGLEVEL_UNKNOWN = 0,
+	UST_ERR_LOGLEVEL_NORMAL,
+	UST_ERR_LOGLEVEL_DEBUG,
 };
 
-extern volatile enum ust_loglevel ust_loglevel;
-void init_usterr(void);
+__attribute__((visibility("hidden")))
+extern volatile enum ust_err_loglevel ust_err_loglevel;
+
+__attribute__((visibility("hidden")))
+void ust_err_init(void);
 
 #ifdef LTTNG_UST_DEBUG
-static inline int ust_debug(void)
+static inline bool ust_err_debug_enabled(void)
 {
-	return 1;
+	return true;
 }
 #else /* #ifdef LTTNG_UST_DEBUG */
-static inline int ust_debug(void)
+static inline bool ust_err_debug_enabled(void)
 {
-	return ust_loglevel == UST_LOGLEVEL_DEBUG;
+	return ust_err_loglevel == UST_ERR_LOGLEVEL_DEBUG;
 }
 #endif /* #else #ifdef LTTNG_UST_DEBUG */
 
+/*
+ * The default component for error messages.
+ */
 #ifndef UST_COMPONENT
-//#error UST_COMPONENT is undefined
 #define UST_COMPONENT libust
 #endif
 
@@ -58,32 +53,24 @@ static inline int ust_debug(void)
 #define UST_XSTR(d) UST_STR(d)
 #define UST_STR(s) #s
 
-#define USTERR_MAX_LEN	512
+#define UST_ERR_MAX_LEN	512
 
-/* We sometimes print in the tracing path, and tracing can occur in
+/*
+ * We sometimes print in the tracing path, and tracing can occur in
  * signal handlers, so we must use a print method which is signal safe.
  */
-
-extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...)
-	__attribute__ ((format (printf, 3, 4)));
-
-static inline void __attribute__ ((format (printf, 1, 2)))
-	__check_ust_safe_fmt(const char *fmt, ...)
-{
-}
-
-/* Can't use dynamic allocation. Limit ourselves to USTERR_MAX_LEN chars. */
+/* Can't use dynamic allocation. Limit ourselves to UST_ERR_MAX_LEN chars. */
 /* Add end of string in case of buffer overflow. */
 #define sigsafe_print_err(fmt, args...)					\
 do {									\
-	if (ust_debug()) {						\
-		char ____buf[USTERR_MAX_LEN];				\
+	if (ust_err_debug_enabled()) {					\
+		char ____buf[UST_ERR_MAX_LEN];				\
 		int ____saved_errno;					\
 									\
 		____saved_errno = errno;	/* signal-safety */	\
 		ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
 		____buf[sizeof(____buf) - 1] = 0;			\
-		patient_write(STDERR_FILENO, ____buf, strlen(____buf));	\
+		ust_patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
 		errno = ____saved_errno;	/* signal-safety */	\
 		fflush(stderr);						\
 	}								\
@@ -95,7 +82,7 @@ do {									\
 	do {					\
 		sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n", \
 		(long) getpid(),		\
-		(long) gettid(),		\
+		(long) lttng_gettid(),		\
 		## args, __func__);		\
 	} while(0)
 
@@ -112,7 +99,7 @@ do {									\
  */
 #define PERROR(call, args...)						\
 	do {								\
-		if (ust_debug()) {					\
+		if (ust_err_debug_enabled()) {				\
 			char buf[200] = "Error in strerror_r()";	\
 			strerror_r(errno, buf, sizeof(buf));		\
 			ERRMSG("Error: " call ": %s", ## args, buf);	\
@@ -124,7 +111,7 @@ do {									\
  */
 #define PERROR(call, args...)						\
 	do {								\
-		if (ust_debug()) {					\
+		if (ust_err_debug_enabled()) {				\
 			char *buf;					\
 			char tmp[200];					\
 			buf = strerror_r(errno, tmp, sizeof(tmp));	\