projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: Add backward compatibility for --group-output-by-session
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
lttng-relayd.h
diff --git
a/src/bin/lttng-relayd/lttng-relayd.h
b/src/bin/lttng-relayd/lttng-relayd.h
index 896925f9e16be3e10655d00e5253051b3098107c..748083ddfa65e145a6ebde0a98ea9575db35ce86 100644
(file)
--- a/
src/bin/lttng-relayd/lttng-relayd.h
+++ b/
src/bin/lttng-relayd/lttng-relayd.h
@@
-1,6
+1,10
@@
+#ifndef LTTNG_RELAYD_H
+#define LTTNG_RELAYD_H
+
/*
* Copyright (C) 2012 - Julien Desfossez <jdesfossez@efficios.com>
* David Goulet <dgoulet@efficios.com>
/*
* 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,
*
* 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,
@@
-16,16
+20,14
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 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/wfcqueue.h>
#include <common/hashtable/hashtable.h>
#include <limits.h>
#include <urcu.h>
#include <urcu/wfcqueue.h>
#include <common/hashtable/hashtable.h>
+struct sessiond_trace_chunk_registry;
+
/*
* Queue used to enqueue relay requests
*/
/*
* Queue used to enqueue relay requests
*/
@@
-35,28
+37,30
@@
struct relay_conn_queue {
int32_t futex;
};
int32_t futex;
};
-struct relay_local_data {
- struct lttng_ht *sessions_ht;
+enum relay_group_output_by {
+ RELAYD_GROUP_OUTPUT_BY_UNKNOWN,
+ RELAYD_GROUP_OUTPUT_BY_HOST,
+ RELAYD_GROUP_OUTPUT_BY_SESSION,
};
};
-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
/*
* 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 *relay_streams_ht;
-
extern struct lttng_ht *viewer_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 *tracing_group_name;
-
extern const char * const config_section_name;
extern const char * const config_section_name;
+extern enum relay_group_output_by opt_group_output_by;
extern int thread_quit_pipe[2];
void lttng_relay_notify_ready(void);
extern int thread_quit_pipe[2];
void lttng_relay_notify_ready(void);
+int lttng_relay_stop_threads(void);
#endif /* LTTNG_RELAYD_H */
#endif /* LTTNG_RELAYD_H */
This page took
0.024895 seconds
and
4
git commands to generate.