X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=d52d4622a9c3f3b1dfa34decf94d20bceaa8ecfa;hp=6041655ddda0f6eb42de5b829cb29688c11f1a24;hb=d07f3d990e51e93befc55d0cfbd228227b1875b1;hpb=feb0f3e5900ff58202ea0c3f227de3c1b8291952

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index 6041655dd..d52d4622a 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -16,23 +16,32 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
+#include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <signal.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <common/error.h>
 #include <common/utils.h>
 
 #include "conf.h"
 #include "utils.h"
+#include "command.h"
 
-/*
- *  get_session_name
- *
- *  Return allocated string with the session name found in the config
- *  directory.
- */
-char *get_session_name(void)
+static const char *str_kernel = "Kernel";
+static const char *str_ust = "UST";
+static const char *str_jul = "JUL";
+static const char *str_log4j = "LOG4J";
+static const char *str_python = "Python";
+
+static
+char *_get_session_name(int quiet)
 {
 	char *path, *session_name = NULL;
 
@@ -43,7 +52,8 @@ char *get_session_name(void)
 	}
 
 	/* Get session name from config */
-	session_name = config_read_session_name(path);
+	session_name = quiet ? config_read_session_name_quiet(path) :
+		config_read_session_name(path);
 	if (session_name == NULL) {
 		goto error;
 	}
@@ -56,6 +66,46 @@ error:
 	return NULL;
 }
 
+/*
+ *  get_session_name
+ *
+ *  Return allocated string with the session name found in the config
+ *  directory.
+ */
+char *get_session_name(void)
+{
+	return _get_session_name(0);
+}
+
+/*
+ *  get_session_name_quiet (no warnings/errors emitted)
+ *
+ *  Return allocated string with the session name found in the config
+ *  directory.
+ */
+char *get_session_name_quiet(void)
+{
+	return _get_session_name(1);
+}
+
+/*
+ *  list_commands
+ *
+ *  List commands line by line. This is mostly for bash auto completion and to
+ *  avoid difficult parsing.
+ */
+void list_commands(struct cmd_struct *commands, FILE *ofp)
+{
+	int i = 0;
+	struct cmd_struct *cmd = NULL;
+
+	cmd = &commands[i];
+	while (cmd->name != NULL) {
+		fprintf(ofp, "%s\n", cmd->name);
+		i++;
+		cmd = &commands[i];
+	}
+}
 
 /*
  * list_cmd_options
@@ -230,3 +280,124 @@ int get_count_order_ulong(unsigned long x)
 
 	return fls_ulong(x - 1);
 }
+
+const char *get_domain_str(enum lttng_domain_type domain)
+{
+	const char *str_dom;
+
+	switch (domain) {
+	case LTTNG_DOMAIN_KERNEL:
+		str_dom = str_kernel;
+		break;
+	case LTTNG_DOMAIN_UST:
+		str_dom = str_ust;
+		break;
+	case LTTNG_DOMAIN_JUL:
+		str_dom = str_jul;
+		break;
+	case LTTNG_DOMAIN_LOG4J:
+		str_dom = str_log4j;
+		break;
+	case LTTNG_DOMAIN_PYTHON:
+		str_dom = str_python;
+		break;
+	default:
+		/* Should not have an unknown domain or else define it. */
+		assert(0);
+	}
+
+	return str_dom;
+}
+
+/*
+ * Spawn a lttng relayd daemon by forking and execv.
+ */
+int spawn_relayd(const char *pathname, int port)
+{
+	int ret = 0;
+	pid_t pid;
+	char url[255];
+
+	if (!port) {
+		port = DEFAULT_NETWORK_VIEWER_PORT;
+	}
+
+	ret = snprintf(url, sizeof(url), "tcp://localhost:%d", port);
+	if (ret < 0) {
+		goto end;
+	}
+
+	MSG("Spawning a relayd daemon");
+	pid = fork();
+	if (pid == 0) {
+		/*
+		 * Spawn session daemon and tell
+		 * it to signal us when ready.
+		 */
+		execlp(pathname, "lttng-relayd", "-L", url, NULL);
+		/* execlp only returns if error happened */
+		if (errno == ENOENT) {
+			ERR("No relayd found. Use --relayd-path.");
+		} else {
+			PERROR("execlp");
+		}
+		kill(getppid(), SIGTERM);	/* wake parent */
+		exit(EXIT_FAILURE);
+	} else if (pid > 0) {
+		goto end;
+	} else {
+		PERROR("fork");
+		ret = -1;
+		goto end;
+	}
+
+end:
+	return ret;
+}
+
+/*
+ * Check if relayd is alive.
+ *
+ * Return 1 if found else 0 if NOT found. Negative value on error.
+ */
+int check_relayd(void)
+{
+	int ret, fd;
+	struct sockaddr_in sin;
+
+	fd = socket(AF_INET, SOCK_STREAM, 0);
+	if (fd < 0) {
+		PERROR("socket check relayd");
+		ret = -1;
+		goto error_socket;
+	}
+
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(DEFAULT_NETWORK_VIEWER_PORT);
+	ret = inet_pton(sin.sin_family, "127.0.0.1", &sin.sin_addr);
+	if (ret < 1) {
+		PERROR("inet_pton check relayd");
+		ret = -1;
+		goto error;
+	}
+
+	/*
+	 * A successful connect means the relayd exists thus returning 0 else a
+	 * negative value means it does NOT exists.
+	 */
+	ret = connect(fd, &sin, sizeof(sin));
+	if (ret < 0) {
+		/* Not found. */
+		ret = 0;
+	} else {
+		/* Already spawned. */
+		ret = 1;
+	}
+
+error:
+	if (close(fd) < 0) {
+		PERROR("close relayd fd");
+	}
+error_socket:
+	return ret;
+}