projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: move relay_session locking outside of make_viewer_streams
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
globals.c
diff --git
a/src/bin/lttng-sessiond/globals.c
b/src/bin/lttng-sessiond/globals.c
index 82a51512ad4e1dea80cc263a92be347d6aa45765..ef57a960dd47365b87c6f506d7f1220cb974886d 100644
(file)
--- a/
src/bin/lttng-sessiond/globals.c
+++ b/
src/bin/lttng-sessiond/globals.c
@@
-18,6
+18,9
@@
*/
#include "lttng-sessiond.h"
*/
#include "lttng-sessiond.h"
+#include <common/compat/uuid.h>
+
+lttng_uuid sessiond_uuid;
int ust_consumerd64_fd = -1;
int ust_consumerd32_fd = -1;
int ust_consumerd64_fd = -1;
int ust_consumerd32_fd = -1;
@@
-30,11
+33,9
@@
struct notification_thread_handle *notification_thread_handle;
struct lttng_ht *agent_apps_ht_by_sock = NULL;
struct lttng_ht *agent_apps_ht_by_sock = NULL;
-int kernel_tracer_fd = -1;
struct lttng_kernel_tracer_version kernel_tracer_version;
struct lttng_kernel_tracer_abi_version kernel_tracer_abi_version;
struct lttng_kernel_tracer_version kernel_tracer_version;
struct lttng_kernel_tracer_abi_version kernel_tracer_abi_version;
-int apps_cmd_notify_pipe[2] = { -1, -1 };
int kernel_poll_pipe[2] = { -1, -1 };
pid_t ppid;
int kernel_poll_pipe[2] = { -1, -1 };
pid_t ppid;
@@
-49,8
+50,6
@@
struct consumer_data kconsumer_data = {
.channel_monitor_pipe = -1,
.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
.lock = PTHREAD_MUTEX_INITIALIZER,
.channel_monitor_pipe = -1,
.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
.lock = PTHREAD_MUTEX_INITIALIZER,
- .cond = PTHREAD_COND_INITIALIZER,
- .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
};
struct consumer_data ustconsumer64_data = {
};
struct consumer_data ustconsumer64_data = {
@@
-60,8
+59,6
@@
struct consumer_data ustconsumer64_data = {
.channel_monitor_pipe = -1,
.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
.lock = PTHREAD_MUTEX_INITIALIZER,
.channel_monitor_pipe = -1,
.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
.lock = PTHREAD_MUTEX_INITIALIZER,
- .cond = PTHREAD_COND_INITIALIZER,
- .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
};
struct consumer_data ustconsumer32_data = {
};
struct consumer_data ustconsumer32_data = {
@@
-71,9
+68,15
@@
struct consumer_data ustconsumer32_data = {
.channel_monitor_pipe = -1,
.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
.lock = PTHREAD_MUTEX_INITIALIZER,
.channel_monitor_pipe = -1,
.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
.lock = PTHREAD_MUTEX_INITIALIZER,
- .cond = PTHREAD_COND_INITIALIZER,
- .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
};
enum consumerd_state ust_consumerd_state;
enum consumerd_state kernel_consumerd_state;
};
enum consumerd_state ust_consumerd_state;
enum consumerd_state kernel_consumerd_state;
+
+static void __attribute__((constructor)) init_sessiond_uuid(void)
+{
+ if (lttng_uuid_generate(sessiond_uuid)) {
+ ERR("Failed to generate a session daemon UUID");
+ abort();
+ }
+}
This page took
0.025911 seconds
and
4
git commands to generate.