/*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
* Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* SPDX-License-Identifier: GPL-2.0-only
#define _LTT_UST_APP_H
#include <stdint.h>
+#include <urcu/ref.h>
#include <common/index-allocator.h>
#include <common/uuid.h>
const char *name;
const struct lttng_bytecode *filter;
enum lttng_ust_abi_loglevel_type loglevel_type;
+ int loglevel_value;
const struct lttng_event_exclusion *exclusion;
};
* Application registration data structure.
*/
struct ust_register_msg {
- enum ustctl_socket_type type;
+ enum lttng_ust_ctl_socket_type type;
uint32_t major;
uint32_t minor;
uint32_t abi_major;
unsigned int expected_stream_count;
char name[LTTNG_UST_ABI_SYM_NAME_LEN];
struct lttng_ust_abi_object_data *obj;
- struct ustctl_consumer_channel_attr attr;
+ struct lttng_ust_ctl_consumer_channel_attr attr;
struct ust_app_stream_list streams;
/* Session pointer that owns this object. */
struct ust_app_session *session;
unsigned int live_timer_interval; /* usec */
/* Metadata channel attributes. */
- struct ustctl_consumer_channel_attr metadata_attr;
+ struct lttng_ust_ctl_consumer_channel_attr metadata_attr;
char root_shm_path[PATH_MAX];
char shm_path[PATH_MAX];
* and a linked list is kept of all running traceable app.
*/
struct ust_app {
+ /*
+ * The lifetime of 'sock' holds a reference to the application; the
+ * application management thread will release a reference to the
+ * application if the application dies.
+ */
+ struct urcu_ref ref;
int sock;
pthread_mutex_t sock_lock; /* Protects sock protocol. */
int ust_app_register(struct ust_register_msg *msg, int sock);
int ust_app_register_done(struct ust_app *app);
int ust_app_version(struct ust_app *app);
-void ust_app_unregister(int sock);
+void ust_app_unregister_by_socket(int sock);
int ust_app_start_trace_all(struct ltt_ust_session *usess);
int ust_app_stop_trace_all(struct ltt_ust_session *usess);
int ust_app_destroy_trace_all(struct ltt_ust_session *usess);
void ust_app_notify_sock_unregister(int sock);
ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
struct consumer_socket *socket, int send_zero_data);
-void ust_app_destroy(struct ust_app *app);
enum lttng_error_code ust_app_snapshot_record(
const struct ltt_ust_session *usess,
const struct consumer_output *output, int wait,
return 1;
}
+bool ust_app_supports_notifiers(const struct ust_app *app);
+bool ust_app_supports_counters(const struct ust_app *app);
+
+bool ust_app_get(struct ust_app *app);
+void ust_app_put(struct ust_app *app);
+
#else /* HAVE_LIBLTTNG_UST_CTL */
static inline
return -ENOSYS;
}
static inline
-void ust_app_unregister(int sock)
+void ust_app_unregister_by_socket(int sock)
{
}
static inline
return 0;
}
static inline
-void ust_app_destroy(struct ust_app *app)
-{
- return;
-}
-static inline
enum lttng_error_code ust_app_snapshot_record(struct ltt_ust_session *usess,
const struct consumer_output *output, int wait, uint64_t max_stream_size)
{
return 0;
}
static inline
+bool ust_app_supports_notifiers(const struct ust_app *app)
+{
+ return false;
+}
+static inline
+bool ust_app_supports_counters(const struct ust_app *app)
+{
+ return false;
+}
+static inline
struct ust_app *ust_app_find_by_sock(int sock)
{
return NULL;
return 0;
}
+static inline
+void ust_app_get(struct ust_app *app)
+{
+}
+
+static inline
+void ust_app_put(struct ust_app *app)
+{
+}
+
#endif /* HAVE_LIBLTTNG_UST_CTL */
#endif /* _LTT_UST_APP_H */