+#ifndef LTTNG_RELAYD_H
+#define LTTNG_RELAYD_H
+
/*
* Copyright (C) 2012 - Julien Desfossez <jdesfossez@efficios.com>
* David Goulet <dgoulet@efficios.com>
+ * 2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.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,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LTTNG_RELAYD_H
-#define LTTNG_RELAYD_H
-
-#define _LGPL_SOURCE
#include <limits.h>
#include <urcu.h>
-#include <urcu/wfqueue.h>
-#include <urcu/list.h>
+#include <urcu/wfcqueue.h>
#include <common/hashtable/hashtable.h>
-#include <common/index/ctf-index.h>
-#include "ctf-trace.h"
-#include "session.h"
+struct sessiond_trace_chunk_registry;
/*
* Queue used to enqueue relay requests
*/
-struct relay_cmd_queue {
- struct cds_wfq_queue queue;
+struct relay_conn_queue {
+ struct cds_wfcq_head head;
+ struct cds_wfcq_tail tail;
int32_t futex;
};
-enum connection_type {
- RELAY_DATA = 1,
- RELAY_CONTROL = 2,
- RELAY_VIEWER_COMMAND = 3,
- RELAY_VIEWER_NOTIFICATION = 4,
-};
-
-/*
- * Internal structure to map a socket with the corresponding session.
- * A hashtable indexed on the socket FD is used for the lookups.
- */
-struct relay_command {
- struct lttcomm_sock *sock;
- struct relay_session *session;
- struct cds_wfq_node node;
- struct lttng_ht_node_ulong sock_n;
- struct rcu_head rcu_node;
- enum connection_type type;
- /* protocol version to use for this session */
- uint32_t major;
- uint32_t minor;
- uint64_t session_id;
- struct cds_list_head recv_head;
- unsigned int version_check_done:1;
-};
-
-struct relay_local_data {
- struct lttng_ht *sessions_ht;
-};
-
-extern char *opt_output_path;
-
/*
* Contains stream indexed by ID. This is important since many commands lookup
* streams only by ID thus also keeping them in this hash table makes the
- * search O(1) instead of iterating over the ctf_traces_ht of the session.
+ * search O(1).
*/
+extern struct lttng_ht *sessions_ht;
extern struct lttng_ht *relay_streams_ht;
-
extern struct lttng_ht *viewer_streams_ht;
-extern struct lttng_ht *indexes_ht;
+extern struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry;
+extern char *opt_output_path;
extern const char *tracing_group_name;
-
extern const char * const config_section_name;
+extern int thread_quit_pipe[2];
+
void lttng_relay_notify_ready(void);
+int lttng_relay_stop_threads(void);
#endif /* LTTNG_RELAYD_H */