projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use compiler-agnostic defines to silence warning
[lttng-tools.git]
/
src
/
common
/
error.cpp
diff --git
a/src/common/error.cpp
b/src/common/error.cpp
index cafb15f92948b8ee209fae25422ff9459a6da382..32704548c655dd379f8eec7970c352472aa4dcbd 100644
(file)
--- a/
src/common/error.cpp
+++ b/
src/common/error.cpp
@@
-29,10
+29,10
@@
namespace {
int lttng_opt_abort_on_error = -1;
/* TLS variable that contains the time of one single log entry. */
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)
;
+
thread_local struct log_time error_log_time
;
} /* namespace */
} /* namespace */
-
DEFINE_URCU_TLS(const char *, logger_thread_name)
;
+
thread_local const char *logger_thread_name
;
const char *log_add_time()
{
const char *log_add_time()
{
@@
-54,8
+54,8
@@
const char *log_add_time()
}
/* Format time in the TLS variable. */
}
/* Format time in the TLS variable. */
- ret = snprintf(
URCU_TLS(error_log_time)
.str,
- sizeof(
URCU_TLS(error_log_time)
.str),
+ ret = snprintf(
error_log_time
.str,
+ sizeof(
error_log_time
.str),
"%02d:%02d:%02d.%09ld",
tm.tm_hour,
tm.tm_min,
"%02d:%02d:%02d.%09ld",
tm.tm_hour,
tm.tm_min,
@@
-66,7
+66,7
@@
const char *log_add_time()
}
errno = errsv;
}
errno = errsv;
- return
URCU_TLS(error_log_time)
.str;
+ return
error_log_time
.str;
error:
/* Return an empty string on error so logging is not affected. */
error:
/* Return an empty string on error so logging is not affected. */
@@
-79,7
+79,7
@@
void logger_set_thread_name(const char *name, bool set_pthread_name)
int ret;
LTTNG_ASSERT(name);
int ret;
LTTNG_ASSERT(name);
-
URCU_TLS(logger_thread_name)
= name;
+
logger_thread_name
= name;
if (set_pthread_name) {
ret = lttng_thread_setname(name);
if (set_pthread_name) {
ret = lttng_thread_setname(name);
@@
-115,7
+115,7
@@
static const char *lttng_error_code_str(lttng_error_code code)
case LTTNG_ERR_FATAL:
return "Fatal error of the session daemon";
case LTTNG_ERR_SELECT_SESS:
case LTTNG_ERR_FATAL:
return "Fatal error of the session daemon";
case LTTNG_ERR_SELECT_SESS:
- return "A session
MUST
be selected";
+ return "A session
must
be selected";
case LTTNG_ERR_EXIST_SESS:
return "Session name already exists";
case LTTNG_ERR_NO_EVENT:
case LTTNG_ERR_EXIST_SESS:
return "Session name already exists";
case LTTNG_ERR_NO_EVENT:
@@
-161,45
+161,45
@@
static const char *lttng_error_code_str(lttng_error_code code)
case LTTNG_ERR_KERN_LIST_FAIL:
return "Listing kernel events failed";
case LTTNG_ERR_UST_CALIBRATE_FAIL:
case LTTNG_ERR_KERN_LIST_FAIL:
return "Listing kernel events failed";
case LTTNG_ERR_UST_CALIBRATE_FAIL:
- return "U
ST
calibration failed";
+ return "U
ser space tracer
calibration failed";
case LTTNG_ERR_UST_SESS_FAIL:
case LTTNG_ERR_UST_SESS_FAIL:
- return "U
ST create sess
ion failed";
+ return "U
ser space tracer session creat
ion failed";
case LTTNG_ERR_UST_CHAN_FAIL:
case LTTNG_ERR_UST_CHAN_FAIL:
- return "U
ST create channel
failed";
+ return "U
ser space tracer channel creation
failed";
case LTTNG_ERR_UST_CHAN_EXIST:
case LTTNG_ERR_UST_CHAN_EXIST:
- return "U
ST
channel already exist";
+ return "U
ser space tracer
channel already exist";
case LTTNG_ERR_UST_CHAN_NOT_FOUND:
case LTTNG_ERR_UST_CHAN_NOT_FOUND:
- return "U
ST
channel not found";
+ return "U
ser space tracer
channel not found";
case LTTNG_ERR_UST_CHAN_DISABLE_FAIL:
case LTTNG_ERR_UST_CHAN_DISABLE_FAIL:
- return "Disabl
e UST
channel failed";
+ return "Disabl
ing user space tracer
channel failed";
case LTTNG_ERR_UST_CHAN_ENABLE_FAIL:
case LTTNG_ERR_UST_CHAN_ENABLE_FAIL:
- return "Enabl
e UST
channel failed";
+ return "Enabl
ing user space tracer
channel failed";
case LTTNG_ERR_UST_ENABLE_FAIL:
case LTTNG_ERR_UST_ENABLE_FAIL:
- return "Enabl
e UST
event failed";
+ return "Enabl
ing user space
event failed";
case LTTNG_ERR_UST_DISABLE_FAIL:
case LTTNG_ERR_UST_DISABLE_FAIL:
- return "Disabl
e UST
event failed";
+ return "Disabl
ing user space
event failed";
case LTTNG_ERR_UST_META_FAIL:
return "Opening metadata failed";
case LTTNG_ERR_UST_START_FAIL:
case LTTNG_ERR_UST_META_FAIL:
return "Opening metadata failed";
case LTTNG_ERR_UST_START_FAIL:
- return "Starting
UST trace
failed";
+ return "Starting
user space tracer session
failed";
case LTTNG_ERR_UST_STOP_FAIL:
case LTTNG_ERR_UST_STOP_FAIL:
- return "Stopping
UST
trace failed";
+ return "Stopping
user space tracer session
trace failed";
case LTTNG_ERR_UST_CONSUMER64_FAIL:
case LTTNG_ERR_UST_CONSUMER64_FAIL:
- return "64-bit
UST
consumer start failed";
+ return "64-bit
user space trace
consumer start failed";
case LTTNG_ERR_UST_CONSUMER32_FAIL:
case LTTNG_ERR_UST_CONSUMER32_FAIL:
- return "32-bit
UST
consumer start failed";
+ return "32-bit
user space trace
consumer start failed";
case LTTNG_ERR_UST_STREAM_FAIL:
case LTTNG_ERR_UST_STREAM_FAIL:
- return "U
ST create stream
failed";
+ return "U
ser space tracer stream creation
failed";
case LTTNG_ERR_UST_LIST_FAIL:
case LTTNG_ERR_UST_LIST_FAIL:
- return "Listing
UST
events failed";
+ return "Listing
of user space tracer
events failed";
case LTTNG_ERR_UST_EVENT_EXIST:
case LTTNG_ERR_UST_EVENT_EXIST:
- return "U
ST
event already exist";
+ return "U
ser space
event already exist";
case LTTNG_ERR_UST_EVENT_NOT_FOUND:
case LTTNG_ERR_UST_EVENT_NOT_FOUND:
- return "U
ST
event not found";
+ return "U
ser space
event not found";
case LTTNG_ERR_UST_CONTEXT_EXIST:
case LTTNG_ERR_UST_CONTEXT_EXIST:
- return "U
ST context already exist
";
+ return "U
ser space tracing context already exists
";
case LTTNG_ERR_UST_CONTEXT_INVAL:
case LTTNG_ERR_UST_CONTEXT_INVAL:
- return "
UST invalid
context";
+ return "
Invalid user space tracing
context";
case LTTNG_ERR_NEED_ROOT_SESSIOND:
return "Tracing the kernel requires a root lttng-sessiond daemon, as well as \"tracing\" group membership or root user ID for the lttng client";
case LTTNG_ERR_NO_UST:
case LTTNG_ERR_NEED_ROOT_SESSIOND:
return "Tracing the kernel requires a root lttng-sessiond daemon, as well as \"tracing\" group membership or root user ID for the lttng client";
case LTTNG_ERR_NO_UST:
@@
-249,7
+249,7
@@
static const char *lttng_error_code_str(lttng_error_code code)
case LTTNG_ERR_NOT_SUPPORTED:
return "Operation not supported";
case LTTNG_ERR_UST_EVENT_ENABLED:
case LTTNG_ERR_NOT_SUPPORTED:
return "Operation not supported";
case LTTNG_ERR_UST_EVENT_ENABLED:
- return "U
ST event
already enabled";
+ return "U
ser space event rule
already enabled";
case LTTNG_ERR_SET_URL:
return "Error setting URL";
case LTTNG_ERR_URL_EXIST:
case LTTNG_ERR_SET_URL:
return "Error setting URL";
case LTTNG_ERR_URL_EXIST:
This page took
0.027832 seconds
and
4
git commands to generate.