/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2013 - Raphaƫl Beamonte <raphael.beamonte@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2 only,
#ifndef _LTT_SESSIOND_H
#define _LTT_SESSIOND_H
-#define _LGPL_SOURCE
#include <urcu.h>
-#include <urcu/wfqueue.h>
+#include <urcu/wfcqueue.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/compat/poll.h>
#include "session.h"
#include "ust-app.h"
+#include "version.h"
+#include "notification-thread.h"
extern const char default_home_dir[],
default_tracing_group[],
/* Set in main.c at boot time of the daemon */
extern int kernel_tracer_fd;
+extern struct notification_thread_handle *notification_thread_handle;
+
/*
* This contains extra data needed for processing a command received by the
* session daemon from the lttng client.
struct ust_command {
int sock;
struct ust_register_msg reg_msg;
- struct cds_wfq_node node;
+ struct cds_wfcq_node node;
};
/*
- * Queue used to enqueue UST registration request (ust_commant) and protected
+ * Queue used to enqueue UST registration request (ust_command) and synchronized
* by a futex with a scheme N wakers / 1 waiters. See futex.c/.h
*/
struct ust_cmd_queue {
int32_t futex;
- struct cds_wfq_queue queue;
+ struct cds_wfcq_head head;
+ struct cds_wfcq_tail tail;
};
/*
extern long page_size;
/*
- * Global set once in main(). JUL TCP port for registration.
+ * Global set once in main(). Agent TCP port for registration.
*/
-extern unsigned int jul_tcp_port;
+extern unsigned int agent_tcp_port;
+
+/* Application health monitoring */
+extern struct health_app *health_sessiond;
/*
* Section name to look for in the daemon configuration file.
*/
extern const char * const config_section_name;
-int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
-int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
+/* Is this daemon root or not. */
+extern int is_root;
-void *thread_ht_cleanup(void *data);
+extern const char *tracing_group_name;
+
+int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
+int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
+void sessiond_notify_ready(void);
#endif /* _LTT_SESSIOND_H */