projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright ownership transfer
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
dispatch.c
diff --git
a/src/bin/lttng-sessiond/dispatch.c
b/src/bin/lttng-sessiond/dispatch.c
index 22380fcdd58d4f1cdc878be9096ad8bf93a05db5..e764af7f2981c9568009888dc9db1f9b51eb97b2 100644
(file)
--- a/
src/bin/lttng-sessiond/dispatch.c
+++ b/
src/bin/lttng-sessiond/dispatch.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2011
David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011
EfficiOS Inc.
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
@@
-67,7
+67,8
@@
static void update_ust_app(int app_sock)
continue;
}
session_lock(sess);
continue;
}
session_lock(sess);
- if (!sess->active || !sess->ust_session) {
+ if (!sess->active || !sess->ust_session ||
+ !sess->ust_session->active) {
goto unlock_session;
}
goto unlock_session;
}
@@
-289,7
+290,7
@@
static void *thread_dispatch_ust_registration(void *data)
ust_cmd->sock, ust_cmd->reg_msg.name,
ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
ust_cmd->sock, ust_cmd->reg_msg.name,
ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
- if (ust_cmd->reg_msg.type ==
UST
CTL_SOCKET_CMD) {
+ if (ust_cmd->reg_msg.type ==
LTTNG_UST_
CTL_SOCKET_CMD) {
wait_node = zmalloc(sizeof(*wait_node));
if (!wait_node) {
PERROR("zmalloc wait_node dispatch");
wait_node = zmalloc(sizeof(*wait_node));
if (!wait_node) {
PERROR("zmalloc wait_node dispatch");
This page took
0.024199 seconds
and
4
git commands to generate.