projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Remove unused argument in debug statement
[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 e21f6d0126c66bf3903683e4caadb8b1078ab557..07a6edde0a55720393a9e05d5233bbffdcd024fd 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,7
@@
#include "session.h"
#include "ust-app.h"
#include "session.h"
#include "ust-app.h"
+#include "version.h"
extern const char default_home_dir[],
default_tracing_group[],
extern const char default_home_dir[],
default_tracing_group[],
@@
-53,7
+54,7
@@
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;
};
/*
};
/*
@@
-62,7
+63,8
@@
struct ust_command {
*/
struct ust_cmd_queue {
int32_t futex;
*/
struct ust_cmd_queue {
int32_t futex;
- struct cds_wfq_queue queue;
+ struct cds_wfcq_head head;
+ struct cds_wfcq_tail tail;
};
/*
};
/*
@@
-104,13
+106,27
@@
extern int ht_cleanup_pipe[2];
extern long page_size;
/*
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;
+
+/*
+ * Section name to look for in the daemon configuration file.
+ */
+extern const char * const config_section_name;
+
+/* 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);
int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
+int sessiond_set_ht_cleanup_thread_pollset(struct lttng_poll_event *events,
+ size_t size);
+int sessiond_check_ht_cleanup_quit(int fd, uint32_t events);
+
void *thread_ht_cleanup(void *data);
void *thread_ht_cleanup(void *data);
+void sessiond_notify_ready(void);
+
#endif /* _LTT_SESSIOND_H */
#endif /* _LTT_SESSIOND_H */
This page took
0.025085 seconds
and
4
git commands to generate.