projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Update loglevel ABI"
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 0e92327cd30392102617b3f343b2dd7b113d8cbb..8304de8be394ca034f0726f622fdebe865c7c5df 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-77,7
+77,7
@@
struct consumer_data {
/* Const values */
const char default_home_dir[] = DEFAULT_HOME_DIR;
/* Const values */
const char default_home_dir[] = DEFAULT_HOME_DIR;
-const char default_tracing_group[] =
LTTNG_
DEFAULT_TRACING_GROUP;
+const char default_tracing_group[] = DEFAULT_TRACING_GROUP;
const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR;
const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR;
const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
@@
-314,7
+314,7
@@
error:
static void teardown_kernel_session(struct ltt_session *session)
{
if (!session->kernel_session) {
static void teardown_kernel_session(struct ltt_session *session)
{
if (!session->kernel_session) {
- DBG3("No kernel session when tearingdown session");
+ DBG3("No kernel session when tearing
down session");
return;
}
return;
}
@@
-340,7
+340,7
@@
static void teardown_ust_session(struct ltt_session *session)
int ret;
if (!session->ust_session) {
int ret;
if (!session->ust_session) {
- DBG3("No UST session when tearingdown session");
+ DBG3("No UST session when tearing
down session");
return;
}
return;
}
@@
-397,7
+397,7
@@
static void cleanup(void)
}
free(cmd);
}
free(cmd);
- DBG("Cleaning up all session");
+ DBG("Cleaning up all session
s
");
/* Destroy session list mutex */
if (session_list_ptr != NULL) {
/* Destroy session list mutex */
if (session_list_ptr != NULL) {
@@
-4077,14
+4077,14
@@
static void sighandler(int sig)
{
switch (sig) {
case SIGPIPE:
{
switch (sig) {
case SIGPIPE:
- DBG("SIGPIPE caug
th
");
+ DBG("SIGPIPE caug
ht
");
return;
case SIGINT:
return;
case SIGINT:
- DBG("SIGINT caug
th
");
+ DBG("SIGINT caug
ht
");
stop_threads();
break;
case SIGTERM:
stop_threads();
break;
case SIGTERM:
- DBG("SIGTERM caug
th
");
+ DBG("SIGTERM caug
ht
");
stop_threads();
break;
default:
stop_threads();
break;
default:
@@
-4158,6
+4158,8
@@
int main(int argc, char **argv)
void *status;
const char *home_path;
void *status;
const char *home_path;
+ init_kernel_workarounds();
+
rcu_register_thread();
/* Create thread quit pipe */
rcu_register_thread();
/* Create thread quit pipe */
This page took
0.027664 seconds
and
4
git commands to generate.