X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=72adf50aa42d50970511ebbae357f5bc8778c492;hp=5bfecdb47deb0a8e2b2be9d872a5072f286cba3b;hb=18eace3ba4aeaa6b869c8ad9ec1273381b4cbdee;hpb=3f2c5fcc29e125fd43d1c63e422a389e82a3379f diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index 5bfecdb47..72adf50aa 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 @@ -25,12 +24,21 @@ /* 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 +struct lttng_filter_bytecode; +struct lttng_ust_filter_bytecode; + extern int ust_consumerd64_fd, ust_consumerd32_fd; +struct ust_app_ht_key { + const char *name; + const struct lttng_ust_filter_bytecode *filter; + enum lttng_ust_loglevel_type loglevel; +}; + /* * Application registration data structure. */ @@ -46,17 +54,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; @@ -71,8 +78,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_ht *ctx; struct lttng_ht_node_str node; + struct lttng_ust_filter_bytecode *filter; }; struct ust_app_channel { @@ -107,6 +114,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 */ @@ -119,8 +128,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 @@ -140,6 +149,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, @@ -162,11 +172,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); -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_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); @@ -201,7 +211,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) @@ -304,13 +319,6 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, 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) { @@ -340,6 +348,13 @@ 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 */