X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fust-app.hpp;h=2aa79df444c0229c003afe8b02f1801fb30bb5e0;hb=66cefebdc;hp=34376a63df9ded3af5ca1ef0bd26b20a319cb639;hpb=b0f2e8db59fcadc8f4b06a94175792be3c431004;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.hpp b/src/bin/lttng-sessiond/ust-app.hpp
index 34376a63d..2aa79df44 100644
--- a/src/bin/lttng-sessiond/ust-app.hpp
+++ b/src/bin/lttng-sessiond/ust-app.hpp
@@ -19,6 +19,7 @@
 #include "ust-registry.hpp"
 #include "ust-registry-session.hpp"
 #include "session.hpp"
+#include "ust-field-convert.hpp"
 
 #define UST_APP_EVENT_LIST_SIZE 32
 
@@ -105,7 +106,7 @@ struct ust_app_ctx {
 };
 
 struct ust_app_event {
-	int enabled;
+	bool enabled;
 	int handle;
 	struct lttng_ust_abi_object_data *obj;
 	struct lttng_ust_abi_event attr;
@@ -116,7 +117,7 @@ struct ust_app_event {
 };
 
 struct ust_app_event_notifier_rule {
-	int enabled;
+	bool enabled;
 	uint64_t error_counter_index;
 	int handle;
 	struct lttng_ust_abi_object_data *obj;
@@ -144,7 +145,7 @@ struct ust_app_stream {
 };
 
 struct ust_app_channel {
-	int enabled;
+	bool enabled;
 	int handle;
 	/*
 	 * Unique key used to identify the channel on the consumer side.
@@ -195,9 +196,9 @@ struct ust_app_session {
 	 */
 	pthread_mutex_t lock;
 
-	int enabled;
+	bool enabled;
 	/* started: has the session been in started state at any time ? */
-	int started;  /* allows detection of start vs restart. */
+	bool 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. */
@@ -324,21 +325,28 @@ struct ust_app {
 	 * (ust_app_event_notifier_rule) by their token's value.
 	 */
 	struct lttng_ht *token_to_event_notifier_rule_ht;
+
+	lttng::sessiond::ust::ctl_field_quirks ctl_field_quirks() const;
 };
 
+/*
+ * Due to a bug in g++ < 7.1, this specialization must be enclosed in the fmt namespace,
+ * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480.
+ */
+namespace fmt {
 template <>
-struct fmt::formatter<ust_app> : fmt::formatter<std::string> {
-	template <typename FormatCtx>
-	typename FormatCtx::iterator format(const ust_app& app, FormatCtx& ctx)
+struct formatter<ust_app> : formatter<std::string> {
+	template <typename FormatContextType>
+	typename FormatContextType::iterator format(const ust_app& app, FormatContextType& ctx)
 	{
-		return fmt::format_to(ctx.out(),
+		return format_to(ctx.out(),
 				"{{ procname = `{}`, ppid = {}, pid = {}, uid = {}, gid = {}, version = {}.{}, registration time = {} }}",
 				app.name, app.ppid, app.pid, app.uid, app.gid, app.v_major,
 				app.v_minor,
 				lttng::utils::time_to_iso8601_str(app.registration_time));
 	}
 };
-
+} /* namespace fmt */
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
 
@@ -366,12 +374,12 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
 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_global_update_event_notifier_rules(struct ust_app *app);
-void ust_app_global_update_all_event_notifier_rules(void);
+void ust_app_global_update_all_event_notifier_rules();
 
-void ust_app_clean_list(void);
-int ust_app_ht_alloc(void);
+void ust_app_clean_list();
+int ust_app_ht_alloc();
 struct ust_app *ust_app_find_by_pid(pid_t pid);
-struct ust_app_stream *ust_app_alloc_stream(void);
+struct ust_app_stream *ust_app_alloc_stream();
 int ust_app_recv_registration(int sock, struct ust_register_msg *msg);
 int ust_app_recv_notify(int sock);
 void ust_app_add(struct ust_app *app);
@@ -408,7 +416,7 @@ enum lttng_error_code ust_app_open_packets(struct ltt_session *session);
 int ust_app_setup_event_notifier_group(struct ust_app *app);
 
 static inline
-int ust_app_supported(void)
+int ust_app_supported()
 {
 	return 1;
 }