projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: ust session is inactive during ust_app_global_update
[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 a637f23dea8e8e665b3a87b88644cc18a7337bb8..7dc74c324eca79457d050b1d85ffeb7f7cac23cb 100644
(file)
--- a/
src/bin/lttng-sessiond/dispatch.c
+++ b/
src/bin/lttng-sessiond/dispatch.c
@@
-61,7
+61,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;
}
@@
-304,6
+305,7
@@
static void *thread_dispatch_ust_registration(void *data)
}
lttng_fd_put(LTTNG_FD_APPS, 1);
free(ust_cmd);
}
lttng_fd_put(LTTNG_FD_APPS, 1);
free(ust_cmd);
+ ust_cmd = NULL;
goto error;
}
CDS_INIT_LIST_HEAD(&wait_node->head);
goto error;
}
CDS_INIT_LIST_HEAD(&wait_node->head);
@@
-318,7
+320,9
@@
static void *thread_dispatch_ust_registration(void *data)
}
lttng_fd_put(LTTNG_FD_APPS, 1);
free(wait_node);
}
lttng_fd_put(LTTNG_FD_APPS, 1);
free(wait_node);
+ wait_node = NULL;
free(ust_cmd);
free(ust_cmd);
+ ust_cmd = NULL;
continue;
}
/*
continue;
}
/*
@@
-329,6
+333,7
@@
static void *thread_dispatch_ust_registration(void *data)
wait_queue.count++;
free(ust_cmd);
wait_queue.count++;
free(ust_cmd);
+ ust_cmd = NULL;
/*
* We have to continue here since we don't have the notify
* socket and the application MUST be added to the hash table
/*
* We have to continue here since we don't have the notify
* socket and the application MUST be added to the hash table
@@
-349,6
+354,7
@@
static void *thread_dispatch_ust_registration(void *data)
wait_queue.count--;
app = wait_node->app;
free(wait_node);
wait_queue.count--;
app = wait_node->app;
free(wait_node);
+ wait_node = NULL;
DBG3("UST app notify socket %d is set", ust_cmd->sock);
break;
}
DBG3("UST app notify socket %d is set", ust_cmd->sock);
break;
}
@@
-367,6
+373,7
@@
static void *thread_dispatch_ust_registration(void *data)
lttng_fd_put(LTTNG_FD_APPS, 1);
}
free(ust_cmd);
lttng_fd_put(LTTNG_FD_APPS, 1);
}
free(ust_cmd);
+ ust_cmd = NULL;
}
if (app) {
}
if (app) {
This page took
0.024895 seconds
and
4
git commands to generate.