struct ust_registry_session {
/*
- * With multiple writers and readers, use this lock to access the registry.
- * Can nest within the ust app session lock.
+ * With multiple writers and readers, use this lock to access
+ * the registry. Can nest within the ust app session lock.
+ * Also acts as a registry serialization lock. Used by registry
+ * readers to serialize the registry information sent from the
+ * sessiond to the consumerd.
+ * The consumer socket lock nests within this lock.
*/
pthread_mutex_t lock;
/* Next channel ID available for a newly registered channel. */
uint32_t next_channel_id;
/* Once this value reaches UINT32_MAX, no more id can be allocated. */
uint32_t used_channel_id;
+ /* Next enumeration ID available. */
+ uint64_t next_enum_id;
/* Universal unique identifier used by the tracer. */
unsigned char uuid[UUID_LEN];
size_t metadata_len, metadata_alloc_len;
/* Length of bytes sent to the consumer. */
size_t metadata_len_sent;
+
+ char root_shm_path[PATH_MAX];
+ char shm_path[PATH_MAX];
+ char metadata_path[PATH_MAX];
+ int metadata_fd; /* file-backed metadata FD */
+
/*
- * Hash table containing channels sent by the UST tracer. MUST be accessed
- * with a RCU read side lock acquired.
+ * Hash table containing channels sent by the UST tracer. MUST
+ * be accessed with a RCU read side lock acquired.
*/
struct lttng_ht *channels;
- /* Unique key to identify the metadata on the consumer side. */
+ /*
+ * Unique key to identify the metadata on the consumer side.
+ */
uint64_t metadata_key;
/*
* Indicates if the metadata is closed on the consumer side. This is to
* deletes its sessions.
*/
unsigned int metadata_closed;
+
+ /* User and group owning the session. */
+ uid_t uid;
+ gid_t gid;
+
+ /* Enumerations table. */
+ struct lttng_ht *enums;
+
+ /*
+ * Copy of the tracer version when the first app is registered.
+ * It is used if we need to regenerate the metadata.
+ */
+ uint32_t major;
+ uint32_t minor;
};
struct ust_registry_channel {
size_t nr_ctx_fields;
struct ustctl_field *ctx_fields;
struct lttng_ht_node_u64 node;
+ /* For delayed reclaim */
+ struct rcu_head rcu_head;
};
/*
/* Name of the event returned by the tracer. */
char name[LTTNG_UST_SYM_NAME_LEN];
char *signature;
- int loglevel;
+ int loglevel_value;
size_t nr_fields;
struct ustctl_field *fields;
char *model_emf_uri;
- struct lttng_ust_object_data *obj;
/*
* Flag for this channel if the metadata was dumped once during
* registration. 0 means no, 1 yes.
struct lttng_ht_node_u64 node;
};
+struct ust_registry_enum {
+ char name[LTTNG_UST_SYM_NAME_LEN];
+ struct ustctl_enum_entry *entries;
+ size_t nr_entries;
+ uint64_t id; /* enum id in session */
+ /* Enumeration node in session hash table. */
+ struct lttng_ht_node_str node;
+ /* For delayed reclaim. */
+ struct rcu_head rcu_head;
+};
+
/*
* Validate that the id has reached the maximum allowed or not.
*
uint32_t uint32_t_alignment,
uint32_t uint64_t_alignment,
uint32_t long_alignment,
- int byte_order);
+ int byte_order,
+ uint32_t major,
+ uint32_t minor,
+ const char *root_shm_path,
+ const char *shm_path,
+ uid_t euid,
+ gid_t egid);
void ust_registry_session_destroy(struct ust_registry_session *session);
int ust_registry_create_event(struct ust_registry_session *session,
uint64_t chan_key, int session_objd, int channel_objd, char *name,
- char *sig, size_t nr_fields, struct ustctl_field *fields, int loglevel,
- char *model_emf_uri, int buffer_type, uint32_t *event_id_p);
+ char *sig, size_t nr_fields, struct ustctl_field *fields,
+ int loglevel_value, char *model_emf_uri, int buffer_type,
+ uint32_t *event_id_p, struct ust_app *app);
struct ust_registry_event *ust_registry_find_event(
struct ust_registry_channel *chan, char *name, char *sig);
void ust_registry_destroy_event(struct ust_registry_channel *chan,
/* app can be NULL for registry shared across applications. */
int ust_metadata_session_statedump(struct ust_registry_session *session,
- struct ust_app *app);
+ struct ust_app *app, uint32_t major, uint32_t minor);
int ust_metadata_channel_statedump(struct ust_registry_session *session,
struct ust_registry_channel *chan);
int ust_metadata_event_statedump(struct ust_registry_session *session,
struct ust_registry_channel *chan,
struct ust_registry_event *event);
+int ust_registry_create_or_find_enum(struct ust_registry_session *session,
+ int session_objd, char *name,
+ struct ustctl_enum_entry *entries, size_t nr_entries,
+ uint64_t *enum_id);
+struct ust_registry_enum *
+ ust_registry_lookup_enum_by_id(struct ust_registry_session *session,
+ const char *name, uint64_t id);
#else /* HAVE_LIBLTTNG_UST_CTL */
static inline
int ust_registry_create_event(struct ust_registry_session *session,
uint64_t chan_key, int session_objd, int channel_objd, char *name,
- char *sig, size_t nr_fields, struct ustctl_field *fields, int loglevel,
- char *model_emf_uri, int buffer_type, uint32_t *event_id_p)
+ char *sig, size_t nr_fields, struct ustctl_field *fields,
+ int loglevel_value, char *model_emf_uri, int buffer_type,
+ uint32_t *event_id_p)
{
return 0;
}
{
return 0;
}
+static inline
+int ust_registry_create_or_find_enum(struct ust_registry_session *session,
+ int session_objd, char *name,
+ struct ustctl_enum_entry *entries, size_t nr_entries,
+ uint64_t *enum_id)
+{
+ return 0;
+}
+static inline
+struct ust_registry_enum *
+ ust_registry_lookup_enum_by_id(struct ust_registry_session *session,
+ const char *name, uint64_t id)
+{
+ return NULL;
+}
#endif /* HAVE_LIBLTTNG_UST_CTL */
projects / lttng-tools.git / blobdiff