* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef _LTT_UST_APP_H
+#ifndef _LTT_UST_APP_H
#define _LTT_UST_APP_H
#include <stdint.h>
#include <common/compat/uuid.h>
-#include "agent.h"
#include "trace-ust.h"
#include "ust-registry.h"
struct ust_app_ht_key {
const char *name;
- const struct lttng_ust_filter_bytecode *filter;
- enum lttng_ust_loglevel_type loglevel;
- const struct lttng_ust_event_exclusion *exclusion;
+ const struct lttng_filter_bytecode *filter;
+ enum lttng_ust_loglevel_type loglevel_type;
+ const struct lttng_event_exclusion *exclusion;
};
/*
struct lttng_ust_event attr;
char name[LTTNG_UST_SYM_NAME_LEN];
struct lttng_ht_node_str node;
- struct lttng_ust_filter_bytecode *filter;
- struct lttng_ust_event_exclusion *exclusion;
+ struct lttng_filter_bytecode *filter;
+ struct lttng_event_exclusion *exclusion;
};
struct ust_app_stream {
int started; /* allows detection of start vs restart. */
int handle; /* used has unique identifier for app session */
+ bool deleted; /* Session deleted flag. Check with lock held. */
+
/*
* Tracing session ID. Multiple ust app session can have the same tracing
* session id making this value NOT unique to the object.
uint64_t id; /* Unique session identifier */
struct lttng_ht *channels; /* Registered channels */
struct lttng_ht_node_u64 node;
+ /*
+ * Node indexed by UST session object descriptor (handle). Stored in the
+ * ust_sessions_objd hash table in the ust_app object.
+ */
+ struct lttng_ht_node_ulong ust_objd_node;
char path[PATH_MAX];
/* UID/GID of the application owning the session */
uid_t uid;
/* Metadata channel attributes. */
struct ustctl_consumer_channel_attr metadata_attr;
+
+ char root_shm_path[PATH_MAX];
+ char shm_path[PATH_MAX];
};
/*
*/
struct ust_app {
int sock;
+ pthread_mutex_t sock_lock; /* Protects sock protocol. */
+
int notify_sock;
pid_t pid;
pid_t ppid;
* Hash table containing ust_app_channel indexed by channel objd.
*/
struct lttng_ht *ust_objd;
+ /*
+ * Hash table containing ust_app_session indexed by objd.
+ */
+ struct lttng_ht *ust_sessions_objd;
/*
* If this application is of the agent domain and this is non negative then
#ifdef HAVE_LIBLTTNG_UST_CTL
int ust_app_register(struct ust_register_msg *msg, int sock);
-static inline
-int ust_app_register_done(int sock)
-{
- return ustctl_register_done(sock);
-}
+int ust_app_register_done(struct ust_app *app);
int ust_app_version(struct ust_app *app);
void ust_app_unregister(int sock);
int ust_app_start_trace_all(struct ltt_ust_session *usess);
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx);
-void ust_app_global_update(struct ltt_ust_session *usess, int sock);
+void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app);
+void ust_app_global_update_all(struct ltt_ust_session *usess);
void ust_app_clean_list(void);
int ust_app_ht_alloc(void);
return -ENOSYS;
}
static inline
-int ust_app_register_done(int sock)
+int ust_app_register_done(struct ust_app *app)
{
return -ENOSYS;
}
return 0;
}
static inline
-void ust_app_global_update(struct ltt_ust_session *usess, int sock)
+void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
{}
static inline
int ust_app_disable_channel_glb(struct ltt_ust_session *usess,