projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the sessiond "ready" counter mechanism
[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 7038e6707347a370471695ac795c5162f1983958..579d49ab8d5c1eff1c16ed8425e4f257dedd687a 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-72,7
+72,6
@@
#include "ust-thread.h"
#include "agent-thread.h"
#include "save.h"
#include "ust-thread.h"
#include "agent-thread.h"
#include "save.h"
-#include "load-session-thread.h"
#include "notification-thread.h"
#include "notification-thread-commands.h"
#include "rotation-thread.h"
#include "notification-thread.h"
#include "notification-thread-commands.h"
#include "rotation-thread.h"
@@
-145,9
+144,6
@@
static const char *config_ignore_options[] = { "help", "version", "config" };
static int apps_cmd_pipe[2] = { -1, -1 };
static int apps_cmd_notify_pipe[2] = { -1, -1 };
static int apps_cmd_pipe[2] = { -1, -1 };
static int apps_cmd_notify_pipe[2] = { -1, -1 };
-/* Pthread, Mutexes and Semaphores */
-static pthread_t load_session_thread;
-
/*
* UST registration command queue. This queue is tied with a futex and uses a N
* wakers / 1 waiter implemented and detailed in futex.c/.h
/*
* UST registration command queue. This queue is tied with a futex and uses a N
* wakers / 1 waiter implemented and detailed in futex.c/.h
@@
-161,9
+157,6
@@
static struct ust_cmd_queue ust_cmd_queue;
static const char *module_proc_lttng = "/proc/lttng";
static const char *module_proc_lttng = "/proc/lttng";
-/* Load session thread information to operate. */
-static struct load_session_thread_data *load_info;
-
/*
* Section name to look for in the daemon configuration file.
*/
/*
* Section name to look for in the daemon configuration file.
*/
@@
-360,11
+353,6
@@
static void sessiond_cleanup(void)
close_consumer_sockets();
close_consumer_sockets();
- if (load_info) {
- load_session_destroy_data(load_info);
- free(load_info);
- }
-
/*
* We do NOT rmdir rundir because there are other processes
* using it, for instance lttng-relayd, which can start in
/*
* We do NOT rmdir rundir because there are other processes
* using it, for instance lttng-relayd, which can start in
@@
-1737,7
+1725,6
@@
static void destroy_all_sessions_and_wait(void)
int main(int argc, char **argv)
{
int ret = 0, retval = 0;
int main(int argc, char **argv)
{
int ret = 0, retval = 0;
- void *status;
const char *env_app_timeout;
struct lttng_pipe *ust32_channel_monitor_pipe = NULL,
*ust64_channel_monitor_pipe = NULL,
const char *env_app_timeout;
struct lttng_pipe *ust32_channel_monitor_pipe = NULL,
*ust64_channel_monitor_pipe = NULL,
@@
-2080,12
+2067,6
@@
int main(int argc, char **argv)
/* Initialize TCP timeout values */
lttcomm_inet_init();
/* Initialize TCP timeout values */
lttcomm_inet_init();
- if (load_session_init_data(&load_info) < 0) {
- retval = -1;
- goto exit_init_data;
- }
- load_info->path = config.load_session_path.value;
-
/* Create health-check thread. */
if (!launch_health_management_thread()) {
retval = -1;
/* Create health-check thread. */
if (!launch_health_management_thread()) {
retval = -1;
@@
-2178,29
+2159,23
@@
int main(int argc, char **argv)
}
}
}
}
- /*
Create session loading thread
. */
- ret =
pthread_create(&load_session_thread, default_pthread_attr()
,
-
thread_load_session, load_info
);
+ /*
Load sessions
. */
+ ret =
config_load_session(config.load_session_path.value
,
+
NULL, 1, 1, NULL
);
if (ret) {
if (ret) {
- errno = ret;
- PERROR("pthread_create load_session_thread");
+ ERR("Session load failed: %s", error_get_str(ret));
retval = -1;
retval = -1;
- stop_threads();
goto exit_load_session;
}
goto exit_load_session;
}
+ /* Initialization completed. */
+ sessiond_signal_parents();
+
/*
* This is where we start awaiting program completion (e.g. through
* signal that asks threads to teardown).
*/
/*
* This is where we start awaiting program completion (e.g. through
* signal that asks threads to teardown).
*/
- ret = pthread_join(load_session_thread, &status);
- if (ret) {
- errno = ret;
- PERROR("pthread_join load_session_thread");
- retval = -1;
- }
-
/* Initiate teardown once activity occurs on the quit pipe. */
sessiond_wait_for_quit_pipe(-1U);
/* Initiate teardown once activity occurs on the quit pipe. */
sessiond_wait_for_quit_pipe(-1U);
This page took
0.024935 seconds
and
4
git commands to generate.