projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't put() thread on shutdown failure
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
session.h
diff --git
a/src/bin/lttng-relayd/session.h
b/src/bin/lttng-relayd/session.h
index 1a37cfee2069800be941eeb4f875354270c1ecdc..2410fd483ad8ae74f82902c8aafac152573f506d 100644
(file)
--- a/
src/bin/lttng-relayd/session.h
+++ b/
src/bin/lttng-relayd/session.h
@@
-26,6
+26,7
@@
#include <urcu/list.h>
#include <urcu/ref.h>
#include <urcu/list.h>
#include <urcu/ref.h>
+#include <lttng/constant.h>
#include <common/hashtable/hashtable.h>
/*
#include <common/hashtable/hashtable.h>
/*
@@
-38,8
+39,8
@@
struct relay_session {
* It is used to match a set of streams to their session.
*/
uint64_t id;
* It is used to match a set of streams to their session.
*/
uint64_t id;
- char session_name[NAME_MAX];
- char hostname[HOST_NAME_MAX];
+ char session_name[
LTTNG_
NAME_MAX];
+ char hostname[
LTTNG_
HOST_NAME_MAX];
uint32_t live_timer;
/* Session in snapshot mode. */
uint32_t live_timer;
/* Session in snapshot mode. */
@@
-53,8
+54,6
@@
struct relay_session {
*/
struct urcu_ref ref;
*/
struct urcu_ref ref;
- /* session reflock nests inside ctf_trace reflock. */
- pthread_mutex_t reflock;
pthread_mutex_t lock;
pthread_mutex_t lock;
@@
-66,6
+65,13
@@
struct relay_session {
/* Tell if the session connection has been closed on the streaming side. */
bool connection_closed;
/* Tell if the session connection has been closed on the streaming side. */
bool connection_closed;
+ /*
+ * Tell if the session is currently living in a exiting relayd and
+ * should be cleaned forcefully without waiting for pending data or
+ * pending ctrl data.
+ */
+ bool aborted;
+
/* Contains ctf_trace object of that session indexed by path name. */
struct lttng_ht *ctf_traces_ht;
/* Contains ctf_trace object of that session indexed by path name. */
struct lttng_ht *ctf_traces_ht;
@@
-110,6
+116,8
@@
bool session_get(struct relay_session *session);
void session_put(struct relay_session *session);
int session_close(struct relay_session *session);
void session_put(struct relay_session *session);
int session_close(struct relay_session *session);
+int session_abort(struct relay_session *session);
+
void print_sessions(void);
#endif /* _SESSION_H */
void print_sessions(void);
#endif /* _SESSION_H */
This page took
0.032739 seconds
and
5
git commands to generate.