projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Possible dereference of null pointers
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
agent.h
diff --git
a/src/bin/lttng-sessiond/agent.h
b/src/bin/lttng-sessiond/agent.h
index 3dbf7179aa8547e28a3c7d5351896a5ced24b17b..50a4fdab353b658a1ea8e0cc62a89ee3fcf1b665 100644
(file)
--- a/
src/bin/lttng-sessiond/agent.h
+++ b/
src/bin/lttng-sessiond/agent.h
@@
-24,15
+24,20
@@
#include <common/hashtable/hashtable.h>
#include <lttng/lttng.h>
#include <common/hashtable/hashtable.h>
#include <lttng/lttng.h>
+/* Agent protocol version that is verified during the agent registration. */
+#define AGENT_MAJOR_VERSION 1
+#define AGENT_MINOR_VERSION 0
+
/*
* Hash table that contains the agent app created upon registration indexed by
/*
* Hash table that contains the agent app created upon registration indexed by
- * socket.
+ * socket.
Global to the session daemon.
*/
*/
-struct lttng_ht *agent_apps_ht_by_sock;
+
extern
struct lttng_ht *agent_apps_ht_by_sock;
struct agent_ht_key {
const char *name;
struct agent_ht_key {
const char *name;
- int loglevel;
+ int loglevel_value;
+ enum lttng_loglevel_type loglevel_type;
};
/*
};
/*
@@
-43,6
+48,8
@@
struct agent_register_msg {
/* This maps to a lttng_domain_type. */
uint32_t domain;
uint32_t pid;
/* This maps to a lttng_domain_type. */
uint32_t domain;
uint32_t pid;
+ uint32_t major_version;
+ uint32_t minor_version;
};
/*
};
/*
@@
-52,7
+59,7
@@
struct agent_register_msg {
*/
struct agent_app {
/*
*/
struct agent_app {
/*
- * PID sent during registration of a
AGENT
application.
+ * PID sent during registration of a
n agent
application.
*/
pid_t pid;
*/
pid_t pid;
@@
-74,7
+81,7
@@
struct agent_app {
struct agent_event {
/* Name of the event. */
char name[LTTNG_SYMBOL_NAME_LEN];
struct agent_event {
/* Name of the event. */
char name[LTTNG_SYMBOL_NAME_LEN];
- int loglevel;
+ int loglevel
_value
;
enum lttng_loglevel_type loglevel_type;
/*
enum lttng_loglevel_type loglevel_type;
/*
@@
-85,8
+92,10
@@
struct agent_event {
/* Hash table node of the agent domain object. */
struct lttng_ht_node_str node;
/* Hash table node of the agent domain object. */
struct lttng_ht_node_str node;
- /*
Bytecode filter associated with the event
. NULL if none. */
+ /*
Filter associated with the event
. NULL if none. */
struct lttng_filter_bytecode *filter;
struct lttng_filter_bytecode *filter;
+ char *filter_expression;
+ struct lttng_event_exclusion *exclusion;
};
/*
};
/*
@@
-111,8
+120,10
@@
struct agent {
struct lttng_ht_node_u64 node;
};
struct lttng_ht_node_u64 node;
};
-/* Setup agent subsystem. */
-int agent_setup(void);
+/* Allocate agent apps hash table */
+int agent_app_ht_alloc(void);
+/* Clean-up agent apps hash table */
+void agent_app_ht_clean(void);
/* Initialize an already allocated agent domain. */
int agent_init(struct agent *agt);
/* Initialize an already allocated agent domain. */
int agent_init(struct agent *agt);
@@
-122,13
+133,18
@@
void agent_add(struct agent *agt, struct lttng_ht *ht);
/* Agent event API. */
struct agent_event *agent_create_event(const char *name,
/* Agent event API. */
struct agent_event *agent_create_event(const char *name,
- struct lttng_filter_bytecode *filter);
+ enum lttng_loglevel_type loglevel_type, int loglevel_value,
+ struct lttng_filter_bytecode *filter,
+ char *filter_expression);
void agent_add_event(struct agent_event *event, struct agent *agt);
void agent_add_event(struct agent_event *event, struct agent *agt);
-struct agent_event *agent_find_event(const char *name, int loglevel,
- struct agent *agt);
-struct agent_event *agent_find_event_by_name(const char *name,
+struct agent_event *agent_find_event(const char *name,
+ enum lttng_loglevel_type loglevel_type, int loglevel_value,
struct agent *agt);
struct agent *agt);
+void agent_find_events_by_name(const char *name, struct agent *agt,
+ struct lttng_ht_iter* iter);
+void agent_event_next_duplicate(const char *name,
+ struct agent *agt, struct lttng_ht_iter* iter);
void agent_delete_event(struct agent_event *event, struct agent *agt);
void agent_destroy_event(struct agent_event *event);
void agent_delete_event(struct agent_event *event, struct agent *agt);
void agent_destroy_event(struct agent_event *event);
@@
-139,6
+155,7
@@
void agent_add_app(struct agent_app *app);
void agent_delete_app(struct agent_app *app);
struct agent_app *agent_find_app_by_sock(int sock);
void agent_destroy_app(struct agent_app *app);
void agent_delete_app(struct agent_app *app);
struct agent_app *agent_find_app_by_sock(int sock);
void agent_destroy_app(struct agent_app *app);
+void agent_destroy_app_by_sock(int sock);
int agent_send_registration_done(struct agent_app *app);
/* Agent action API */
int agent_send_registration_done(struct agent_app *app);
/* Agent action API */
@@
-147,6
+164,7
@@
int agent_enable_event(struct agent_event *event,
int agent_disable_event(struct agent_event *event,
enum lttng_domain_type domain);
void agent_update(struct agent *agt, int sock);
int agent_disable_event(struct agent_event *event,
enum lttng_domain_type domain);
void agent_update(struct agent *agt, int sock);
-int agent_list_events(struct lttng_event **events);
+int agent_list_events(struct lttng_event **events,
+ enum lttng_domain_type domain);
#endif /* LTTNG_SESSIOND_AGENT_H */
#endif /* LTTNG_SESSIOND_AGENT_H */
This page took
0.02471 seconds
and
4
git commands to generate.