projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: close wait_fd on kernel tracing
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 80834941d9c278e181d129e9959489a518c4d938..4eacb3c890ff27f33d5a985b868a68dce7d65abc 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-110,7
+110,7
@@
static int build_network_session_path(char *dst, size_t size,
tmp_urls, kdata_port, tmp_uurl, udata_port);
} else {
int dport;
tmp_urls, kdata_port, tmp_uurl, udata_port);
} else {
int dport;
- if (kuri) {
+ if (kuri
|| (!kuri && !uuri)
) {
dport = kdata_port;
} else {
/* No kernel URI, use the UST port. */
dport = kdata_port;
} else {
/* No kernel URI, use the UST port. */
@@
-306,8
+306,12
@@
static int list_lttng_kernel_events(char *channel_name,
case LTTNG_KERNEL_TRACEPOINT:
(*events)[i].type = LTTNG_EVENT_TRACEPOINT;
break;
case LTTNG_KERNEL_TRACEPOINT:
(*events)[i].type = LTTNG_EVENT_TRACEPOINT;
break;
- case LTTNG_KERNEL_KPROBE:
case LTTNG_KERNEL_KRETPROBE:
case LTTNG_KERNEL_KRETPROBE:
+ (*events)[i].type = LTTNG_EVENT_FUNCTION;
+ memcpy(&(*events)[i].attr.probe, &event->event->u.kprobe,
+ sizeof(struct lttng_kernel_kprobe));
+ break;
+ case LTTNG_KERNEL_KPROBE:
(*events)[i].type = LTTNG_EVENT_PROBE;
memcpy(&(*events)[i].attr.probe, &event->event->u.kprobe,
sizeof(struct lttng_kernel_kprobe));
(*events)[i].type = LTTNG_EVENT_PROBE;
memcpy(&(*events)[i].attr.probe, &event->event->u.kprobe,
sizeof(struct lttng_kernel_kprobe));
@@
-376,20
+380,24
@@
static int add_uri_to_consumer(struct consumer_output *consumer,
case LTTNG_DST_IPV6:
DBG2("Setting network URI to consumer");
case LTTNG_DST_IPV6:
DBG2("Setting network URI to consumer");
- consumer->type = CONSUMER_DST_NET;
-
- if ((uri->stype == LTTNG_STREAM_CONTROL &&
+ if (consumer->type == CONSUMER_DST_NET) {
+ if ((uri->stype == LTTNG_STREAM_CONTROL &&
consumer->dst.net.control_isset) ||
(uri->stype == LTTNG_STREAM_DATA &&
consumer->dst.net.data_isset)) {
consumer->dst.net.control_isset) ||
(uri->stype == LTTNG_STREAM_DATA &&
consumer->dst.net.data_isset)) {
- ret = LTTNG_ERR_URL_EXIST;
- goto error;
+ ret = LTTNG_ERR_URL_EXIST;
+ goto error;
+ }
+ } else {
+ memset(&consumer->dst.net, 0, sizeof(consumer->dst.net));
}
}
+ consumer->type = CONSUMER_DST_NET;
+
/* Set URI into consumer output object */
ret = consumer_set_network_uri(consumer, uri);
if (ret < 0) {
/* Set URI into consumer output object */
ret = consumer_set_network_uri(consumer, uri);
if (ret < 0) {
- ret =
LTTNG_ERR_FATAL
;
+ ret =
-ret
;
goto error;
} else if (ret == 1) {
/*
goto error;
} else if (ret == 1) {
/*
@@
-430,6
+438,8
@@
static int add_uri_to_consumer(struct consumer_output *consumer,
break;
}
break;
}
+ ret = LTTNG_OK;
+
error:
return ret;
}
error:
return ret;
}
@@
-474,22
+484,15
@@
error:
* On success, the relayd_sock pointer is set to the created socket.
* Else, it's stays untouched and a lttcomm error code is returned.
*/
* On success, the relayd_sock pointer is set to the created socket.
* Else, it's stays untouched and a lttcomm error code is returned.
*/
-static int create_connect_relayd(struct consumer_output *output,
- const char *session_name, struct lttng_uri *uri,
- struct lttcomm_sock **relayd_sock)
+static int create_connect_relayd(struct lttng_uri *uri,
+ struct lttcomm_relayd_sock **relayd_sock)
{
int ret;
{
int ret;
- struct lttcomm_
sock *
sock;
+ struct lttcomm_
relayd_sock *r
sock;
- /* Create socket object from URI */
- sock = lttcomm_alloc_sock_from_uri(uri);
- if (sock == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
-
- ret = lttcomm_create_sock(sock);
- if (ret < 0) {
+ rsock = lttcomm_alloc_relayd_sock(uri, RELAYD_VERSION_COMM_MAJOR,
+ RELAYD_VERSION_COMM_MINOR);
+ if (!rsock) {
ret = LTTNG_ERR_FATAL;
goto error;
}
ret = LTTNG_ERR_FATAL;
goto error;
}
@@
-500,7
+503,7
@@
static int create_connect_relayd(struct consumer_output *output,
* state to be in poll execution.
*/
health_poll_entry();
* state to be in poll execution.
*/
health_poll_entry();
- ret = relayd_connect(sock);
+ ret = relayd_connect(
r
sock);
health_poll_exit();
if (ret < 0) {
ERR("Unable to reach lttng-relayd");
health_poll_exit();
if (ret < 0) {
ERR("Unable to reach lttng-relayd");
@@
-513,8
+516,7
@@
static int create_connect_relayd(struct consumer_output *output,
DBG3("Creating relayd stream socket from URI");
/* Check relayd version */
DBG3("Creating relayd stream socket from URI");
/* Check relayd version */
- ret = relayd_version_check(sock, RELAYD_VERSION_COMM_MAJOR,
- RELAYD_VERSION_COMM_MINOR);
+ ret = relayd_version_check(rsock);
if (ret < 0) {
ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
goto close_sock;
if (ret < 0) {
ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
goto close_sock;
@@
-528,18
+530,15
@@
static int create_connect_relayd(struct consumer_output *output,
goto close_sock;
}
goto close_sock;
}
- *relayd_sock = sock;
+ *relayd_sock =
r
sock;
return LTTNG_OK;
close_sock:
return LTTNG_OK;
close_sock:
- if (sock) {
- (void) relayd_close(sock);
- }
+ /* The returned value is not useful since we are on an error path. */
+ (void) relayd_close(rsock);
free_sock:
free_sock:
- if (sock) {
- lttcomm_destroy_sock(sock);
- }
+ free(rsock);
error:
return ret;
}
error:
return ret;
}
@@
-552,13
+551,14
@@
static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
struct consumer_socket *consumer_sock)
{
int ret;
struct consumer_socket *consumer_sock)
{
int ret;
- struct lttcomm_
sock *
sock = NULL;
+ struct lttcomm_
relayd_sock *r
sock = NULL;
/* Connect to relayd and make version check if uri is the control. */
/* Connect to relayd and make version check if uri is the control. */
- ret = create_connect_relayd(
consumer, session->name, relayd_uri, &
sock);
+ ret = create_connect_relayd(
relayd_uri, &r
sock);
if (ret != LTTNG_OK) {
if (ret != LTTNG_OK) {
- goto
close_sock
;
+ goto
error
;
}
}
+ assert(rsock);
/* If the control socket is connected, network session is ready */
if (relayd_uri->stype == LTTNG_STREAM_CONTROL) {
/* If the control socket is connected, network session is ready */
if (relayd_uri->stype == LTTNG_STREAM_CONTROL) {
@@
-578,8
+578,8
@@
static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
}
/* Send relayd socket to consumer. */
}
/* Send relayd socket to consumer. */
- ret = consumer_send_relayd_socket(consumer_sock,
sock
,
-
consumer,
relayd_uri->stype, session->id);
+ ret = consumer_send_relayd_socket(consumer_sock,
rsock, consumer
,
+ relayd_uri->stype, session->id);
if (ret < 0) {
ret = LTTNG_ERR_ENABLE_CONSUMER_FAIL;
goto close_sock;
if (ret < 0) {
ret = LTTNG_ERR_ENABLE_CONSUMER_FAIL;
goto close_sock;
@@
-600,11
+600,10
@@
static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
*/
close_sock:
*/
close_sock:
- if (sock) {
- (void) relayd_close(sock);
- lttcomm_destroy_sock(sock);
- }
+ (void) relayd_close(rsock);
+ free(rsock);
+error:
if (ret != LTTNG_OK) {
/*
* On error, nullify the consumer sequence index so streams are not
if (ret != LTTNG_OK) {
/*
* On error, nullify the consumer sequence index so streams are not
@@
-612,7
+611,6
@@
close_sock:
*/
uatomic_set(&consumer->net_seq_index, -1);
}
*/
uatomic_set(&consumer->net_seq_index, -1);
}
-
return ret;
}
return ret;
}
@@
-1108,7
+1106,7
@@
int cmd_add_context(struct ltt_session *session, int domain,
if (chan_count == 0) {
struct lttng_channel *attr;
/* Create default channel */
if (chan_count == 0) {
struct lttng_channel *attr;
/* Create default channel */
- attr = channel_new_default_attr(domain);
+ attr = channel_new_default_attr(domain
, usess->buffer_type
);
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
@@
-1168,7
+1166,8
@@
int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
kchan = trace_kernel_get_channel_by_name(channel_name,
session->kernel_session);
if (kchan == NULL) {
kchan = trace_kernel_get_channel_by_name(channel_name,
session->kernel_session);
if (kchan == NULL) {
- attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
+ attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL,
+ LTTNG_BUFFER_GLOBAL);
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
@@
-1218,7
+1217,8
@@
int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
channel_name);
if (uchan == NULL) {
/* Create default channel */
channel_name);
if (uchan == NULL) {
/* Create default channel */
- attr = channel_new_default_attr(LTTNG_DOMAIN_UST);
+ attr = channel_new_default_attr(LTTNG_DOMAIN_UST,
+ usess->buffer_type);
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
@@
-1288,7
+1288,8
@@
int cmd_enable_event_all(struct ltt_session *session,
session->kernel_session);
if (kchan == NULL) {
/* Create default channel */
session->kernel_session);
if (kchan == NULL) {
/* Create default channel */
- attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
+ attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL,
+ LTTNG_BUFFER_GLOBAL);
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
@@
-1352,7
+1353,8
@@
int cmd_enable_event_all(struct ltt_session *session,
channel_name);
if (uchan == NULL) {
/* Create default channel */
channel_name);
if (uchan == NULL) {
/* Create default channel */
- attr = channel_new_default_attr(LTTNG_DOMAIN_UST);
+ attr = channel_new_default_attr(LTTNG_DOMAIN_UST,
+ usess->buffer_type);
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
if (attr == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
@@
-1650,7
+1652,7
@@
int cmd_set_consumer_uri(int domain, struct ltt_session *session,
for (i = 0; i < nb_uri; i++) {
ret = add_uri_to_consumer(consumer, &uris[i], domain, session->name);
for (i = 0; i < nb_uri; i++) {
ret = add_uri_to_consumer(consumer, &uris[i], domain, session->name);
- if (ret
< 0
) {
+ if (ret
!= LTTNG_OK
) {
goto error;
}
}
goto error;
}
}
@@
-1669,7
+1671,6
@@
int cmd_create_session_uri(char *name, struct lttng_uri *uris,
size_t nb_uri, lttng_sock_cred *creds)
{
int ret;
size_t nb_uri, lttng_sock_cred *creds)
{
int ret;
- char *path = NULL;
struct ltt_session *session;
assert(name);
struct ltt_session *session;
assert(name);
@@
-1694,7
+1695,7
@@
int cmd_create_session_uri(char *name, struct lttng_uri *uris,
}
/* Create tracing session in the registry */
}
/* Create tracing session in the registry */
- ret = session_create(name,
path,
LTTNG_SOCK_GET_UID_CRED(creds),
+ ret = session_create(name, LTTNG_SOCK_GET_UID_CRED(creds),
LTTNG_SOCK_GET_GID_CRED(creds));
if (ret != LTTNG_OK) {
goto session_error;
LTTNG_SOCK_GET_GID_CRED(creds));
if (ret != LTTNG_OK) {
goto session_error;
@@
-1830,7
+1831,7
@@
int cmd_register_consumer(struct ltt_session *session, int domain,
const char *sock_path, struct consumer_data *cdata)
{
int ret, sock;
const char *sock_path, struct consumer_data *cdata)
{
int ret, sock;
- struct consumer_socket *socket;
+ struct consumer_socket *socket
= NULL
;
assert(session);
assert(cdata);
assert(session);
assert(cdata);
@@
-1890,9
+1891,12
@@
int cmd_register_consumer(struct ltt_session *session, int domain,
goto error;
}
goto error;
}
- ret
=
LTTNG_OK;
+ ret
urn
LTTNG_OK;
error:
error:
+ if (socket) {
+ consumer_destroy_socket(socket);
+ }
return ret;
}
return ret;
}
@@
-1928,6
+1932,7
@@
ssize_t cmd_list_domains(struct ltt_session *session,
if (session->ust_session != NULL) {
(*domains)[index].type = LTTNG_DOMAIN_UST;
if (session->ust_session != NULL) {
(*domains)[index].type = LTTNG_DOMAIN_UST;
+ (*domains)[index].buf_type = session->ust_session->buffer_type;
index++;
}
index++;
}
@@
-2067,9
+2072,9
@@
void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
(ksess && ksess->consumer->type == CONSUMER_DST_NET) ||
(usess && usess->consumer->type == CONSUMER_DST_NET)) {
ret = build_network_session_path(sessions[i].path,
(ksess && ksess->consumer->type == CONSUMER_DST_NET) ||
(usess && usess->consumer->type == CONSUMER_DST_NET)) {
ret = build_network_session_path(sessions[i].path,
- sizeof(session[i].path), session);
+ sizeof(session
s
[i].path), session);
} else {
} else {
- ret = snprintf(sessions[i].path, sizeof(session[i].path), "%s",
+ ret = snprintf(sessions[i].path, sizeof(session
s
[i].path), "%s",
session->consumer->dst.trace_path);
}
if (ret < 0) {
session->consumer->dst.trace_path);
}
if (ret < 0) {
This page took
0.028414 seconds
and
4
git commands to generate.