Add git commit id to the version if it's not a tag

[lttng-tools.git] / src / bin / lttng / utils.h

diff --git a/src/bin/lttng/utils.h b/src/bin/lttng/utils.h
index a430b8bdf3e9577ebf5bbcb1e176f519cc9c50fc..d3941279a316d1c306d2dacd2ba839ae70db0a64 100644 (file)
--- a/src/bin/lttng/utils.h
+++ b/src/bin/lttng/utils.h
@@ -19,11 +19,45 @@
 #define _LTTNG_UTILS_H
 
 #include <popt.h>
+#include "version.h"
+
+#include <lttng/lttng.h>
+
+extern char *opt_relayd_path;
+
+struct cmd_struct;
 
-char *expand_full_path(const char *path);
-char *get_config_file_path(void);
 char *get_session_name(void);
-int set_session_name(char *name);
+void list_commands(struct cmd_struct *commands, FILE *ofp);
 void list_cmd_options(FILE *ofp, struct poptOption *options);
 
+/*
+ * Return the minimum order for which x <= (1UL << order).
+ * Return -1 if x is 0.
+ */
+int get_count_order_u32(uint32_t x);
+
+/*
+ * Return the minimum order for which x <= (1UL << order).
+ * Return -1 if x is 0.
+ */
+int get_count_order_u64(uint64_t x);
+
+/*
+ * Return the minimum order for which x <= (1UL << order).
+ * Return -1 if x is 0.
+ */
+int get_count_order_ulong(unsigned long x);
+
+const char *get_domain_str(enum lttng_domain_type domain);
+
+static inline
+void print_missing_domain(void)
+{
+       ERR("Please specify a domain (-k/-u/-j).");
+}
+
+int spawn_relayd(const char *pathname, int port);
+int check_relayd(void);
+
 #endif /* _LTTNG_UTILS_H */