X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=9957b378162b897a8743c8897425da51d27e0cb7;hp=b40465b38ebef7d987381ad82a5353524ef57a7a;hb=3ecec76a3cd1eb6b301d03895ab425976ba28dee;hpb=8960e9cd5adb7e5cdaece135530a457cd65324dc

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index b40465b38..9957b3781 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -36,14 +37,11 @@
 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";
 
-/*
- *  get_session_name
- *
- *  Return allocated string with the session name found in the config
- *  directory.
- */
-char *get_session_name(void)
+static
+char *_get_session_name(int quiet)
 {
 	char *path, *session_name = NULL;
 
@@ -54,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;
 	}
@@ -67,6 +66,28 @@ 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
  *
@@ -274,6 +295,12 @@ const char *get_domain_str(enum lttng_domain_type domain)
 	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);
@@ -312,14 +339,14 @@ int spawn_relayd(const char *pathname, int port)
 		if (errno == ENOENT) {
 			ERR("No relayd found. Use --relayd-path.");
 		} else {
-			perror("execlp");
+			PERROR("execlp");
 		}
 		kill(getppid(), SIGTERM);	/* wake parent */
 		exit(EXIT_FAILURE);
 	} else if (pid > 0) {
 		goto end;
 	} else {
-		perror("fork");
+		PERROR("fork");
 		ret = -1;
 		goto end;
 	}
@@ -340,15 +367,17 @@ int check_relayd(void)
 
 	fd = socket(AF_INET, SOCK_STREAM, 0);
 	if (fd < 0) {
-		perror("socket check relayd");
-		goto error;
+		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");
+		PERROR("inet_pton check relayd");
+		ret = -1;
 		goto error;
 	}
 
@@ -365,8 +394,25 @@ int check_relayd(void)
 		ret = 1;
 	}
 
+error:
+	if (close(fd) < 0) {
+		PERROR("close relayd fd");
+	}
+error_socket:
 	return ret;
+}
 
-error:
-	return -1;
+int print_missing_or_multiple_domains(unsigned int sum)
+{
+	int ret = 0;
+
+	if (sum == 0) {
+		ERR("Please specify a domain (-k/-u/-j).");
+		ret = -1;
+	} else if (sum > 1) {
+		ERR("Multiple domains specified.");
+		ret = -1;
+	}
+
+	return ret;
 }