X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=ef8d0235a019229cf0c4c1b92c33a58275f8a6de;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hp=fc592ebdeee16f68df1a52ad9c0bf2b770ed8466;hpb=5cdb6027a2b78fd93aa7f61174625190b5fc3459;p=lttng-tools.git diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c index fc592ebde..ef8d0235a 100644 --- a/src/bin/lttng/utils.c +++ b/src/bin/lttng/utils.c @@ -16,6 +16,7 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -37,6 +38,7 @@ 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 @@ -278,6 +280,9 @@ const char *get_domain_str(enum lttng_domain_type domain) 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); @@ -316,14 +321,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; } @@ -344,7 +349,7 @@ int check_relayd(void) fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) { - perror("socket check relayd"); + PERROR("socket check relayd"); ret = -1; goto error_socket; } @@ -353,7 +358,7 @@ int check_relayd(void) 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; } @@ -373,7 +378,7 @@ int check_relayd(void) error: if (close(fd) < 0) { - perror("close relayd fd"); + PERROR("close relayd fd"); } error_socket: return ret;