X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=3f6eca1262d971c9d784cf4f092f6ac904337691;hp=67c09692f33ddc72d76b6fbea665b8bf97bdee73;hb=cc04e512f711c00920d9e8a5f083e841c5f08273;hpb=e0c7ec2b3d96dd7ddd9375c5f72239a733d0cf24 diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index 67c09692f..3f6eca126 100644 --- a/src/bin/lttng-sessiond/ust-app.h +++ b/src/bin/lttng-sessiond/ust-app.h @@ -1,19 +1,18 @@ /* * Copyright (C) 2011 - David Goulet * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 - * of the License. + * 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, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef _LTT_UST_APP_H @@ -24,10 +23,14 @@ #include "trace-ust.h" /* lttng-ust supported version. */ -#define UST_APP_MAJOR_VERSION 1 +#define LTTNG_UST_COMM_MAJOR 2 /* comm protocol major version */ +#define UST_APP_MAJOR_VERSION 2 /* UST version supported */ #define UST_APP_EVENT_LIST_SIZE 32 +struct lttng_filter_bytecode; +struct lttng_ust_filter_bytecode; + 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_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; @@ -72,6 +74,7 @@ struct ust_app_event { char name[LTTNG_UST_SYM_NAME_LEN]; struct lttng_ht *ctx; struct lttng_ht_node_str node; + struct lttng_ust_filter_bytecode *filter; }; struct ust_app_channel { @@ -106,6 +109,8 @@ struct ust_app_session { * 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 */ @@ -118,8 +123,8 @@ struct ust_app { 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 @@ -139,6 +144,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_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, @@ -166,6 +172,9 @@ int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess, 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); @@ -173,6 +182,7 @@ void ust_app_ht_alloc(void); struct lttng_ht *ust_app_get_ht(void); struct ust_app *ust_app_find_by_pid(pid_t pid); int ust_app_validate_version(int sock); +int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate); #else /* HAVE_LIBLTTNG_UST_CTL */ @@ -199,7 +209,12 @@ int ust_app_stop_trace_all(struct ltt_ust_session *usess) 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) @@ -333,6 +348,18 @@ int ust_app_validate_version(int sock) { return 0; } +static inline +int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate) +{ + 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 */