X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Ftrace-ust.h;h=2b133e8c473239088eacddb637982266447a4df9;hb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;hp=9a236626931f58fbe566cd1b5a3fe301c9a85e2d;hpb=44d3bd014f6ad217cff7e7c3dfaad76b1927c37b;p=lttng-tools.git diff --git a/ltt-sessiond/trace-ust.h b/ltt-sessiond/trace-ust.h index 9a2366269..2b133e8c4 100644 --- a/ltt-sessiond/trace-ust.h +++ b/ltt-sessiond/trace-ust.h @@ -19,39 +19,55 @@ #ifndef _LTT_TRACE_UST_H #define _LTT_TRACE_UST_H +#include #include +#include #include - #include -#include /* - * UST session list. + * FIXME: temporary workaround: we use a lttng-tools local version of + * lttng-ust-abi.h if UST is not found. Eventually, we should use our + * own internal structures within lttng-tools instead of relying on the + * UST ABI. */ -struct ltt_ust_session_list { - unsigned int count; - struct cds_list_head head; -}; +#ifdef CONFIG_CONFIG_LTTNG_TOOLS_HAVE_UST +#include +#else +#include "lttng-ust-abi.h" +#endif + +#include "../hashtable/rculfhash.h" -/* UST event list */ -struct ltt_ust_event_list { + +/* UST Stream list */ +struct ltt_ust_stream_list { unsigned int count; struct cds_list_head head; }; -/* UST Channel list */ -struct ltt_ust_channel_list { - unsigned int count; - struct cds_list_head head; +/* Context hash table nodes */ +struct ltt_ust_context { + struct lttng_ust_context ctx; + struct cds_lfht_node node; }; /* UST event */ struct ltt_ust_event { int handle; int enabled; - struct lttng_ust_context ctx; + struct object_data *obj; struct lttng_ust_event attr; + struct cds_lfht *ctx; + struct cds_lfht_node node; +}; + +/* UST stream */ +struct ltt_ust_stream { + /* TODO hashtable */ + struct object_data *obj; struct cds_list_head list; + char *pathname; }; /* UST channel */ @@ -60,40 +76,73 @@ struct ltt_ust_channel { int enabled; char name[LTTNG_UST_SYM_NAME_LEN]; char trace_path[PATH_MAX]; /* Trace file path name */ - struct lttng_ust_context ctx; + struct object_data *obj; + + unsigned int stream_count; + struct ltt_ust_stream_list stream_list; struct lttng_ust_channel attr; - struct ltt_ust_event_list events; - struct cds_list_head list; + struct cds_lfht *ctx; + struct cds_lfht *events; + struct cds_lfht_node node; }; /* UST Metadata */ struct ltt_ust_metadata { int handle; - char *trace_path; /* Trace file path name */ + struct object_data *obj; + char pathname[PATH_MAX]; /* Trace file path name */ struct lttng_ust_channel attr; + struct object_data *stream_obj; +}; + +/* UST domain global (LTTNG_DOMAIN_UST) */ +struct ltt_ust_domain_global { + struct cds_lfht *channels; +}; + +/* UST domain pid (LTTNG_DOMAIN_UST_PID) */ +struct ltt_ust_domain_pid { + pid_t pid; + struct cds_lfht *channels; + struct cds_lfht_node node; +}; + +/* UST domain exec name (LTTNG_DOMAIN_UST_EXEC_NAME) */ +struct ltt_ust_domain_exec { + char exec_name[LTTNG_UST_SYM_NAME_LEN]; + struct cds_lfht *channels; + struct cds_lfht_node node; }; /* UST session */ struct ltt_ust_session { + int sock; /* socket to send cmds to app */ int handle; int enabled; - int uconsumer_fds_sent; + int consumer_fds_sent; + int consumer_fd; char path[PATH_MAX]; - struct lttng_domain domain; struct ltt_ust_metadata *metadata; - struct ltt_ust_channel_list channels; - struct cds_list_head list; + struct object_data *obj; + struct ltt_ust_domain_global domain_global; + /* + * Those two hash tables contains data for a specific UST domain and a HT + * of channels for each. See ltt_ust_domain_exec and ltt_ust_domain_pid + * data structures. + */ + struct cds_lfht *domain_pid; + struct cds_lfht *domain_exec; }; +#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST + /* * Lookup functions. NULL is returned if not found. */ -struct ltt_ust_event *trace_ust_get_event_by_name( - char *name, struct ltt_ust_channel *channel); -struct ltt_ust_channel *trace_ust_get_channel_by_name( - char *name, struct ltt_ust_session *session); -struct ltt_ust_session *trace_ust_get_session_by_pid( - struct ltt_ust_session_list *session_list, pid_t pid); +struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht, + char *name); +struct ltt_ust_channel *trace_ust_find_channel_by_name(struct cds_lfht *ht, + char *name); /* * Create functions malloc() the data structure. @@ -114,4 +163,69 @@ void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata); void trace_ust_destroy_channel(struct ltt_ust_channel *channel); void trace_ust_destroy_event(struct ltt_ust_event *event); +#else + +static inline +struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht, + char *name) +{ + return NULL; +} + +static inline +struct ltt_ust_channel *trace_ust_find_channel_by_name(struct cds_lfht *ht, + char *name) +{ + return NULL; +} + +static inline +struct ltt_ust_session *trace_ust_get_session_by_pid( + struct ltt_ust_session_list *session_list, pid_t pid) +{ + return NULL; +} + +static inline +struct ltt_ust_session *trace_ust_create_session(char *path, pid_t pid, + struct lttng_domain *domain) +{ + return NULL; +} +static inline +struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr, + char *path) +{ + return NULL; +} +static inline +struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev) +{ + return NULL; +} +static inline +struct ltt_ust_metadata *trace_ust_create_metadata(char *path) +{ + return NULL; +} + +static inline +void trace_ust_destroy_session(struct ltt_ust_session *session) +{ +} +static inline +void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata) +{ +} +static inline +void trace_ust_destroy_channel(struct ltt_ust_channel *channel) +{ +} +static inline +void trace_ust_destroy_event(struct ltt_ust_event *event) +{ +} + +#endif + #endif /* _LTT_TRACE_UST_H */