summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6339062)
This is an internal rename to reduce confusion with the public
ust-error.h API and better describe the functionality.
Change-Id: Ifc692c724ebd7b7bd4ad234fa92b95f50d724f5a
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
#include "common/logging.h"
#include "common/logging.h"
-volatile enum ust_err_loglevel ust_err_loglevel;
+volatile enum lttng_ust_log_level lttng_ust_log_level;
+void lttng_ust_logging_init(void)
- if (ust_err_loglevel == UST_ERR_LOGLEVEL_UNKNOWN) {
+ if (lttng_ust_log_level == LTTNG_UST_LOG_LEVEL_UNKNOWN) {
/*
* This getenv is not part of lttng_ust_getenv() because it
* is required to print ERR() performed during getenv
* initialization.
*/
/*
* This getenv is not part of lttng_ust_getenv() because it
* is required to print ERR() performed during getenv
* initialization.
*/
- ust_debug = getenv("LTTNG_UST_DEBUG");
- if (ust_debug)
- ust_err_loglevel = UST_ERR_LOGLEVEL_DEBUG;
+ lttng_ust_debug = getenv("LTTNG_UST_DEBUG");
+ if (lttng_ust_debug)
+ lttng_ust_log_level = LTTNG_UST_LOG_LEVEL_DEBUG;
- ust_err_loglevel = UST_ERR_LOGLEVEL_NORMAL;
+ lttng_ust_log_level = LTTNG_UST_LOG_LEVEL_NORMAL;
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#ifndef _USTERR_SIGNAL_SAFE_H
-#define _USTERR_SIGNAL_SAFE_H
+#ifndef _UST_COMMON_LOGGING_H
+#define _UST_COMMON_LOGGING_H
#include <string.h>
#include <sys/types.h>
#include <string.h>
#include <sys/types.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
+
+#include <lttng/ust-utils.h>
+
#include "common/patient.h"
#include "common/compat/tid.h"
#include "common/safe-snprintf.h"
#include "common/patient.h"
#include "common/compat/tid.h"
#include "common/safe-snprintf.h"
-enum ust_err_loglevel {
- UST_ERR_LOGLEVEL_UNKNOWN = 0,
- UST_ERR_LOGLEVEL_NORMAL,
- UST_ERR_LOGLEVEL_DEBUG,
+enum lttng_ust_log_level {
+ LTTNG_UST_LOG_LEVEL_UNKNOWN = 0,
+ LTTNG_UST_LOG_LEVEL_NORMAL,
+ LTTNG_UST_LOG_LEVEL_DEBUG,
-extern volatile enum ust_err_loglevel ust_err_loglevel
+extern volatile enum lttng_ust_log_level lttng_ust_log_level
__attribute__((visibility("hidden")));
__attribute__((visibility("hidden")));
+void lttng_ust_logging_init(void)
__attribute__((visibility("hidden")));
#ifdef LTTNG_UST_DEBUG
__attribute__((visibility("hidden")));
#ifdef LTTNG_UST_DEBUG
-static inline bool ust_err_debug_enabled(void)
+static inline bool lttng_ust_logging_debug_enabled(void)
{
return true;
}
#else /* #ifdef LTTNG_UST_DEBUG */
{
return true;
}
#else /* #ifdef LTTNG_UST_DEBUG */
-static inline bool ust_err_debug_enabled(void)
+static inline bool lttng_ust_logging_debug_enabled(void)
- return ust_err_loglevel == UST_ERR_LOGLEVEL_DEBUG;
+ return lttng_ust_log_level == LTTNG_UST_LOG_LEVEL_DEBUG;
}
#endif /* #else #ifdef LTTNG_UST_DEBUG */
}
#endif /* #else #ifdef LTTNG_UST_DEBUG */
#define UST_COMPONENT libust
#endif
#define UST_COMPONENT libust
#endif
-/* To stringify the expansion of a define */
-#define UST_XSTR(d) UST_STR(d)
-#define UST_STR(s) #s
-
-#define UST_ERR_MAX_LEN 512
+#define LTTNG_UST_LOG_MAX_LEN 512
/*
* 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.
*/
/*
* 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.
*/
-/* Can't use dynamic allocation. Limit ourselves to UST_ERR_MAX_LEN chars. */
+/* Can't use dynamic allocation. Limit ourselves to LTTNG_UST_LOG_MAX_LEN chars. */
/* Add end of string in case of buffer overflow. */
#define sigsafe_print_err(fmt, args...) \
do { \
/* Add end of string in case of buffer overflow. */
#define sigsafe_print_err(fmt, args...) \
do { \
- if (ust_err_debug_enabled()) { \
- char ____buf[UST_ERR_MAX_LEN]; \
+ if (lttng_ust_logging_debug_enabled()) { \
+ char ____buf[LTTNG_UST_LOG_MAX_LEN]; \
int ____saved_errno; \
\
____saved_errno = errno; /* signal-safety */ \
int ____saved_errno; \
\
____saved_errno = errno; /* signal-safety */ \
-#define UST_STR_COMPONENT UST_XSTR(UST_COMPONENT)
+#define LTTNG_UST_STR_COMPONENT lttng_ust_stringify(UST_COMPONENT)
#define ERRMSG(fmt, args...) \
do { \
#define ERRMSG(fmt, args...) \
do { \
- sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n", \
+ sigsafe_print_err(LTTNG_UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" lttng_ust_stringify(__LINE__) ")\n", \
(long) getpid(), \
(long) lttng_gettid(), \
## args, __func__); \
(long) getpid(), \
(long) lttng_gettid(), \
## args, __func__); \
*/
#define PERROR(call, args...) \
do { \
*/
#define PERROR(call, args...) \
do { \
- if (ust_err_debug_enabled()) { \
+ if (lttng_ust_logging_debug_enabled()) { \
char perror_buf[200] = "Error in strerror_r()"; \
strerror_r(errno, perror_buf, \
sizeof(perror_buf)); \
char perror_buf[200] = "Error in strerror_r()"; \
strerror_r(errno, perror_buf, \
sizeof(perror_buf)); \
*/
#define PERROR(call, args...) \
do { \
*/
#define PERROR(call, args...) \
do { \
- if (ust_err_debug_enabled()) { \
+ if (lttng_ust_logging_debug_enabled()) { \
char *perror_buf; \
char perror_tmp[200]; \
perror_buf = strerror_r(errno, perror_tmp, \
char *perror_buf; \
char perror_tmp[200]; \
perror_buf = strerror_r(errno, perror_tmp, \
} while(0)
#define WARN_ON_ONCE(condition) WARN_ON(condition)
} while(0)
#define WARN_ON_ONCE(condition) WARN_ON(condition)
-#endif /* _USTERR_SIGNAL_SAFE_H */
+#endif /* _UST_COMMON_LOGGING_H */
static
void ustctl_init(void)
{
static
void ustctl_init(void)
{
- ust_err_init();
- lttng_ust_getenv_init(); /* Needs ust_err_init() to be completed. */
+ lttng_ust_logging_init();
+ lttng_ust_getenv_init(); /* Needs lttng_ust_logging_init() to be completed. */
lttng_ust_clock_init();
lttng_ust_ring_buffer_clients_init();
lttng_ust_counter_clients_init();
lttng_ust_clock_init();
lttng_ust_ring_buffer_clients_init();
lttng_ust_counter_clients_init();
static
void _lttng_ust_dl_init(void)
{
static
void _lttng_ust_dl_init(void)
{
+ lttng_ust_logging_init();
"Please upgrade your kernel "
"(fix is commit 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae in Linux kernel "
"mainline). LTTng-UST will use polling mode fallback.");
"Please upgrade your kernel "
"(fix is commit 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae in Linux kernel "
"mainline). LTTng-UST will use polling mode fallback.");
- if (ust_err_debug_enabled())
+ if (lttng_ust_logging_debug_enabled())
PERROR("futex");
goto end_wait;
}
PERROR("futex");
goto end_wait;
}
* sessiond (otherwise leading to errors when trying to create
* sessiond before the init functions are completed).
*/
* sessiond (otherwise leading to errors when trying to create
* sessiond before the init functions are completed).
*/
- ust_err_init();
- lttng_ust_getenv_init(); /* Needs ust_err_init() to be completed. */
+ lttng_ust_logging_init();
+ lttng_ust_getenv_init(); /* Needs lttng_ust_logging_init() to be completed. */
lttng_ust_tp_init();
lttng_ust_init_fd_tracker();
lttng_ust_clock_init();
lttng_ust_tp_init();
lttng_ust_init_fd_tracker();
lttng_ust_clock_init();
DBG("just registered a tracepoints section from %p and having %d tracepoints",
tracepoints_start, tracepoints_count);
DBG("just registered a tracepoints section from %p and having %d tracepoints",
tracepoints_start, tracepoints_count);
- if (ust_err_debug_enabled()) {
+ if (lttng_ust_logging_debug_enabled()) {
int i;
for (i = 0; i < tracepoints_count; i++) {
int i;
for (i = 0; i < tracepoints_count; i++) {
{
if (uatomic_xchg(&initialized, 1) == 1)
return;
{
if (uatomic_xchg(&initialized, 1) == 1)
return;
+ lttng_ust_logging_init();
void lttng_ust_common_init(void)
{
/* Initialize logging for liblttng-ust-common */
void lttng_ust_common_init(void)
{
/* Initialize logging for liblttng-ust-common */
+ lttng_ust_logging_init();
/*
* Initialize the fd-tracker, other libraries using it should also call
/*
* Initialize the fd-tracker, other libraries using it should also call