projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: move utils_create_lock_file to its own file
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.cpp
diff --git
a/src/bin/lttng-sessiond/main.cpp
b/src/bin/lttng-sessiond/main.cpp
index 8d59952d6d404b408dba3c77eb0838615790baa4..3e5d8eeeaca01791c742ca2d4c58fa3f733c14fb 100644
(file)
--- a/
src/bin/lttng-sessiond/main.cpp
+++ b/
src/bin/lttng-sessiond/main.cpp
@@
-52,6
+52,7
@@
#include <common/futex.hpp>
#include <common/ini-config/ini-config.hpp>
#include <common/kernel-consumer/kernel-consumer.hpp>
#include <common/futex.hpp>
#include <common/ini-config/ini-config.hpp>
#include <common/kernel-consumer/kernel-consumer.hpp>
+#include <common/lockfile.hpp>
#include <common/logging-utils.hpp>
#include <common/path.hpp>
#include <common/relayd/relayd.hpp>
#include <common/logging-utils.hpp>
#include <common/path.hpp>
#include <common/relayd/relayd.hpp>
@@
-1403,7
+1404,7
@@
static void sessiond_uuid_log()
/*
* main
*/
/*
* main
*/
-
int
main(int argc, char **argv)
+
static int _
main(int argc, char **argv)
{
int ret = 0, retval = 0;
const char *env_app_timeout;
{
int ret = 0, retval = 0;
const char *env_app_timeout;
@@
-1975,3
+1976,13
@@
exit_set_signal_handler:
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
+
+int main(int argc, char **argv)
+{
+ try {
+ return _main(argc, argv);
+ } catch (const std::exception& e) {
+ ERR_FMT("Unhandled exception caught by main thread: %s", e.what());
+ abort();
+ }
+}
This page took
0.023002 seconds
and
4
git commands to generate.