X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.h;h=d3941279a316d1c306d2dacd2ba839ae70db0a64;hp=e609b7086926df453b7ce98a8f81942f30914842;hb=88564da09144e7fd1202fe79aff1371478a69ecf;hpb=679b4943c3b0f451e7f4fbcd804dd8a7a679e253

diff --git a/src/bin/lttng/utils.h b/src/bin/lttng/utils.h
index e609b7086..d3941279a 100644
--- a/src/bin/lttng/utils.h
+++ b/src/bin/lttng/utils.h
@@ -1,29 +1,63 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _LTTNG_UTILS_H
 #define _LTTNG_UTILS_H
 
 #include <popt.h>
+#include "version.h"
+
+#include <lttng/lttng.h>
+
+extern char *opt_relayd_path;
+
+struct cmd_struct;
 
-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 */