projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add jul-app ABI/API and handle registration
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 6d6140b1f891f10c75f4cff539c0f6776b7272aa..05646279a63a48b3f81bbf64d67454b9aaf53a1c 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-2415,6
+2415,7
@@
static int copy_session_consumer(int domain, struct ltt_session *session)
consumer = session->kernel_session->consumer;
dir_name = DEFAULT_KERNEL_TRACE_DIR;
break;
consumer = session->kernel_session->consumer;
dir_name = DEFAULT_KERNEL_TRACE_DIR;
break;
+ case LTTNG_DOMAIN_JUL:
case LTTNG_DOMAIN_UST:
DBG3("Copying tracing session consumer output in UST session");
if (session->ust_session->consumer) {
case LTTNG_DOMAIN_UST:
DBG3("Copying tracing session consumer output in UST session");
if (session->ust_session->consumer) {
@@
-2458,6
+2459,7
@@
static int create_ust_session(struct ltt_session *session,
assert(session->consumer);
switch (domain->type) {
assert(session->consumer);
switch (domain->type) {
+ case LTTNG_DOMAIN_JUL:
case LTTNG_DOMAIN_UST:
break;
default:
case LTTNG_DOMAIN_UST:
break;
default:
@@
-2750,10
+2752,6
@@
static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
break;
case LTTNG_DOMAIN_JUL:
break;
case LTTNG_DOMAIN_JUL:
- {
- ret = LTTNG_ERR_UNKNOWN_DOMAIN;
- goto error;
- }
case LTTNG_DOMAIN_UST:
{
if (!ust_app_supported()) {
case LTTNG_DOMAIN_UST:
{
if (!ust_app_supported()) {
@@
-4628,6
+4626,12
@@
int main(int argc, char **argv)
*/
ust_app_ht_alloc();
*/
ust_app_ht_alloc();
+ /* Initialize JUL domain subsystem. */
+ if ((ret = jul_init()) < 0) {
+ /* ENOMEM at this point. */
+ goto error;
+ }
+
/* After this point, we can safely call cleanup() with "goto exit" */
/*
/* After this point, we can safely call cleanup() with "goto exit" */
/*
This page took
0.025601 seconds
and
4
git commands to generate.