projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass lttng_event struct to the set_filter API call
[deliverable/lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.h
diff --git
a/src/bin/lttng-sessiond/ust-app.h
b/src/bin/lttng-sessiond/ust-app.h
index 906a6a209b1e63eca442e438fbb76497d1937775..605b4a69b5a4a027b5cdde8e5e91d6363720603f 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.h
+++ b/
src/bin/lttng-sessiond/ust-app.h
@@
-24,10
+24,13
@@
/* lttng-ust supported version. */
#define LTTNG_UST_COMM_MAJOR 2 /* comm protocol major version */
/* lttng-ust supported version. */
#define LTTNG_UST_COMM_MAJOR 2 /* comm protocol major version */
-#define UST_APP_MAJOR_VERSION
2 /*
UST version supported */
+#define UST_APP_MAJOR_VERSION
3 /* Internal
UST version supported */
#define UST_APP_EVENT_LIST_SIZE 32
#define UST_APP_EVENT_LIST_SIZE 32
+struct lttng_filter_bytecode;
+struct lttng_ust_filter_bytecode;
+
extern int ust_consumerd64_fd, ust_consumerd32_fd;
/*
extern int ust_consumerd64_fd, ust_consumerd32_fd;
/*
@@
-45,17
+48,16
@@
struct ust_register_msg {
};
/*
};
/*
- * Global applications HT used by the session daemon.
+ * Global applications HT used by the session daemon. This table is indexed by
+ * PID using the pid_n node and pid value of an ust_app.
*/
struct lttng_ht *ust_app_ht;
*/
struct lttng_ht *ust_app_ht;
-struct lttng_ht *ust_app_sock_key_map;
-
-struct ust_app_key {
- pid_t pid;
- int sock;
- struct lttng_ht_node_ulong node;
-};
+/*
+ * Global applications HT used by the session daemon. This table is indexed by
+ * socket using the sock_n node and sock value of an ust_app.
+ */
+struct lttng_ht *ust_app_ht_by_sock;
struct ust_app_ctx {
int handle;
struct ust_app_ctx {
int handle;
@@
-70,8
+72,8
@@
struct ust_app_event {
struct lttng_ust_object_data *obj;
struct lttng_ust_event attr;
char name[LTTNG_UST_SYM_NAME_LEN];
struct lttng_ust_object_data *obj;
struct lttng_ust_event attr;
char name[LTTNG_UST_SYM_NAME_LEN];
- struct lttng_ht *ctx;
struct lttng_ht_node_str node;
struct lttng_ht_node_str node;
+ struct lttng_ust_filter_bytecode *filter;
};
struct ust_app_channel {
};
struct ust_app_channel {
@@
-106,6
+108,8
@@
struct ust_app_session {
* and a linked list is kept of all running traceable app.
*/
struct ust_app {
* and a linked list is kept of all running traceable app.
*/
struct ust_app {
+ int sock;
+ pid_t pid;
pid_t ppid;
uid_t uid; /* User ID that owns the apps */
gid_t gid; /* Group ID that owns the apps */
pid_t ppid;
uid_t uid; /* User ID that owns the apps */
gid_t gid; /* Group ID that owns the apps */
@@
-118,8
+122,8
@@
struct ust_app {
uint32_t v_minor; /* Verion minor number */
char name[17]; /* Process name (short) */
struct lttng_ht *sessions;
uint32_t v_minor; /* Verion minor number */
char name[17]; /* Process name (short) */
struct lttng_ht *sessions;
- struct lttng_ht_node_ulong
node
;
- struct
ust_app_key key
;
+ struct lttng_ht_node_ulong
pid_n
;
+ struct
lttng_ht_node_ulong sock_n
;
};
#ifdef HAVE_LIBLTTNG_UST_CTL
};
#ifdef HAVE_LIBLTTNG_UST_CTL
@@
-139,6
+143,7
@@
int ust_app_stop_trace_all(struct ltt_ust_session *usess);
int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app);
int ust_app_destroy_trace_all(struct ltt_ust_session *usess);
int ust_app_list_events(struct lttng_event **events);
int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app);
int ust_app_destroy_trace_all(struct ltt_ust_session *usess);
int ust_app_list_events(struct lttng_event **events);
+int ust_app_list_event_fields(struct lttng_event_field **fields);
int ust_app_create_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan);
int ust_app_create_event_glb(struct ltt_ust_session *usess,
int ust_app_create_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan);
int ust_app_create_event_glb(struct ltt_ust_session *usess,
@@
-161,11
+166,11
@@
int ust_app_enable_all_event_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan);
int ust_app_disable_event_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
struct ltt_ust_channel *uchan);
int ust_app_disable_event_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
-int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess,
- struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
- struct ltt_ust_context *uctx);
int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx);
int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx);
+int ust_app_set_filter_event_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
+ struct lttng_filter_bytecode *bytecode);
void ust_app_global_update(struct ltt_ust_session *usess, int sock);
void ust_app_clean_list(void);
void ust_app_global_update(struct ltt_ust_session *usess, int sock);
void ust_app_clean_list(void);
@@
-200,7
+205,12
@@
int ust_app_stop_trace_all(struct ltt_ust_session *usess)
static inline
int ust_app_list_events(struct lttng_event **events)
{
static inline
int ust_app_list_events(struct lttng_event **events)
{
- return 0;
+ return -ENOSYS;
+}
+static inline
+int ust_app_list_event_fields(struct lttng_event_field **fields)
+{
+ return -ENOSYS;
}
static inline
int ust_app_register(struct ust_register_msg *msg, int sock)
}
static inline
int ust_app_register(struct ust_register_msg *msg, int sock)
@@
-303,13
+313,6
@@
int ust_app_enable_event_glb(struct ltt_ust_session *usess,
return 0;
}
static inline
return 0;
}
static inline
-int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess,
- struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
- struct ltt_ust_context *uctx)
-{
- return 0;
-}
-static inline
int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx)
{
int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx)
{
@@
-339,6
+342,13
@@
int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
{
return 0;
}
{
return 0;
}
+static inline
+int ust_app_set_filter_event_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
+ struct lttng_filter_bytecode *bytecode)
+{
+ return 0;
+}
#endif /* HAVE_LIBLTTNG_UST_CTL */
#endif /* HAVE_LIBLTTNG_UST_CTL */
This page took
0.026839 seconds
and
5
git commands to generate.