projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Docs: comment typo fix (accomodates -> accommodates)
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
lttng-sessiond.h
diff --git
a/src/bin/lttng-sessiond/lttng-sessiond.h
b/src/bin/lttng-sessiond/lttng-sessiond.h
index 6ee1fe9510ef4d91c64ce6a00034c46101d723cb..25e410b25c67fce9d42d80406b382877f4d2ae07 100644
(file)
--- a/
src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/
src/bin/lttng-sessiond/lttng-sessiond.h
@@
-1,5
+1,6
@@
/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
/*
* 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,
*
* 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,
@@
-18,9
+19,8
@@
#ifndef _LTT_SESSIOND_H
#define _LTT_SESSIOND_H
#ifndef _LTT_SESSIOND_H
#define _LTT_SESSIOND_H
-#define _LGPL_SOURCE
#include <urcu.h>
#include <urcu.h>
-#include <urcu/wfqueue.h>
+#include <urcu/wf
c
queue.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/compat/poll.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/compat/poll.h>
@@
-28,6
+28,8
@@
#include "session.h"
#include "ust-app.h"
#include "session.h"
#include "ust-app.h"
+#include "notification-thread.h"
+#include "sessiond-config.h"
extern const char default_home_dir[],
default_tracing_group[],
extern const char default_home_dir[],
default_tracing_group[],
@@
-37,6
+39,8
@@
extern const char default_home_dir[],
/* Set in main.c at boot time of the daemon */
extern int kernel_tracer_fd;
/* 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.
/*
* This contains extra data needed for processing a command received by the
* session daemon from the lttng client.
@@
-53,16
+57,17
@@
struct command_ctx {
struct ust_command {
int sock;
struct ust_register_msg reg_msg;
struct ust_command {
int sock;
struct ust_register_msg reg_msg;
- struct cds_wfq_node node;
+ struct cds_wf
c
q_node node;
};
/*
};
/*
- * Queue used to enqueue UST registration request (ust_comman
t) and protect
ed
+ * Queue used to enqueue UST registration request (ust_comman
d) and synchroniz
ed
* by a futex with a scheme N wakers / 1 waiters. See futex.c/.h
*/
struct ust_cmd_queue {
int32_t futex;
* 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;
};
/*
};
/*
@@
-103,10
+108,8
@@
extern int ht_cleanup_pipe[2];
*/
extern long page_size;
*/
extern long page_size;
-/*
- * Global set once in main(). JUL TCP port for registration.
- */
-extern unsigned int jul_tcp_port;
+/* Application health monitoring */
+extern struct health_app *health_sessiond;
/*
* Section name to look for in the daemon configuration file.
/*
* Section name to look for in the daemon configuration file.
@@
-116,11
+119,11
@@
extern const char * const config_section_name;
/* Is this daemon root or not. */
extern int is_root;
/* Is this daemon root or not. */
extern int is_root;
-int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
-int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
-
-void *thread_ht_cleanup(void *data);
+extern struct sessiond_config config;
+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);
void sessiond_notify_ready(void);
+void sessiond_signal_parents(void);
#endif /* _LTT_SESSIOND_H */
#endif /* _LTT_SESSIOND_H */
This page took
0.026543 seconds
and
4
git commands to generate.