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. */
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;
};
struct ust_registry_channel {
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.
uint32_t long_alignment,
int byte_order,
uint32_t major,
- uint32_t minor);
+ 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 *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,