projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: improve lttng with live by spawning relayd
[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 d00bf1e3bdde5acb6ff81c650c571304f38a66ef..812c850faa73b9b4efb34b5030c6f46dd22c00d2 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-1439,9
+1439,16
@@
int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
assert(usess);
/* Create the default JUL tracepoint. */
assert(usess);
/* Create the default JUL tracepoint. */
+ memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
- strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+ if (is_root) {
+ strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+ sizeof(uevent.name));
+ } else {
+ strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+ sizeof(uevent.name));
+ }
uevent.name[sizeof(uevent.name) - 1] = '\0';
/*
uevent.name[sizeof(uevent.name) - 1] = '\0';
/*
@@
-1460,7
+1467,7
@@
int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
/* The wild card * means that everything should be enabled. */
if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
/* The wild card * means that everything should be enabled. */
if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
- ret = event_jul_enable_all(usess);
+ ret = event_jul_enable_all(usess
, event
);
} else {
ret = event_jul_enable(usess, event);
}
} else {
ret = event_jul_enable(usess, event);
}
@@
-1644,7
+1651,7
@@
int cmd_enable_event_all(struct ltt_session *session,
}
case LTTNG_DOMAIN_JUL:
{
}
case LTTNG_DOMAIN_JUL:
{
- struct lttng_event uevent;
+ struct lttng_event uevent
, event
;
struct lttng_domain tmp_dom;
struct ltt_ust_session *usess = session->ust_session;
struct lttng_domain tmp_dom;
struct ltt_ust_session *usess = session->ust_session;
@@
-1653,7
+1660,13
@@
int cmd_enable_event_all(struct ltt_session *session,
/* Create the default JUL tracepoint. */
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
/* Create the default JUL tracepoint. */
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
- strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+ if (is_root) {
+ strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+ sizeof(uevent.name));
+ } else {
+ strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+ sizeof(uevent.name));
+ }
uevent.name[sizeof(uevent.name) - 1] = '\0';
/*
uevent.name[sizeof(uevent.name) - 1] = '\0';
/*
@@
-1670,7
+1683,12
@@
int cmd_enable_event_all(struct ltt_session *session,
goto error;
}
goto error;
}
- ret = event_jul_enable_all(usess);
+ event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+ event.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+ strncpy(event.name, "*", sizeof(event.name));
+ event.name[sizeof(event.name) - 1] = '\0';
+
+ ret = event_jul_enable_all(usess, &event);
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-1773,6
+1791,7
@@
error:
int cmd_start_trace(struct ltt_session *session)
{
int ret;
int cmd_start_trace(struct ltt_session *session)
{
int ret;
+ unsigned long nb_chan = 0;
struct ltt_kernel_session *ksession;
struct ltt_ust_session *usess;
struct ltt_kernel_session *ksession;
struct ltt_ust_session *usess;
@@
-1788,6
+1807,21
@@
int cmd_start_trace(struct ltt_session *session)
goto error;
}
goto error;
}
+ /*
+ * Starting a session without channel is useless since after that it's not
+ * possible to enable channel thus inform the client.
+ */
+ if (usess && usess->domain_global.channels) {
+ nb_chan += lttng_ht_get_count(usess->domain_global.channels);
+ }
+ if (ksession) {
+ nb_chan += ksession->channel_count;
+ }
+ if (!nb_chan) {
+ ret = LTTNG_ERR_NO_CHANNEL;
+ goto error;
+ }
+
session->enabled = 1;
/* Kernel tracing */
session->enabled = 1;
/* Kernel tracing */
@@
-2147,7
+2181,14
@@
int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
{
struct lttng_kernel_calibrate kcalibrate;
{
struct lttng_kernel_calibrate kcalibrate;
- kcalibrate.type = calibrate->type;
+ switch (calibrate->type) {
+ case LTTNG_CALIBRATE_FUNCTION:
+ default:
+ /* Default and only possible calibrate option. */
+ kcalibrate.type = LTTNG_KERNEL_CALIBRATE_KRETPROBE;
+ break;
+ }
+
ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate);
if (ret < 0) {
ret = LTTNG_ERR_KERN_ENABLE_FAIL;
ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate);
if (ret < 0) {
ret = LTTNG_ERR_KERN_ENABLE_FAIL;
@@
-2159,7
+2200,14
@@
int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
{
struct lttng_ust_calibrate ucalibrate;
{
struct lttng_ust_calibrate ucalibrate;
- ucalibrate.type = calibrate->type;
+ switch (calibrate->type) {
+ case LTTNG_CALIBRATE_FUNCTION:
+ default:
+ /* Default and only possible calibrate option. */
+ ucalibrate.type = LTTNG_UST_CALIBRATE_TRACEPOINT;
+ break;
+ }
+
ret = ust_app_calibrate_glb(&ucalibrate);
if (ret < 0) {
ret = LTTNG_ERR_UST_CALIBRATE_FAIL;
ret = ust_app_calibrate_glb(&ucalibrate);
if (ret < 0) {
ret = LTTNG_ERR_UST_CALIBRATE_FAIL;
@@
-2458,6
+2506,7
@@
void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
sessions[i].name[NAME_MAX - 1] = '\0';
sessions[i].enabled = session->enabled;
sessions[i].snapshot_mode = session->snapshot_mode;
sessions[i].name[NAME_MAX - 1] = '\0';
sessions[i].enabled = session->enabled;
sessions[i].snapshot_mode = session->snapshot_mode;
+ sessions[i].live_timer_interval = session->live_timer;
i++;
}
}
i++;
}
}
@@
-2832,12
+2881,17
@@
static int record_ust_snapshot(struct ltt_ust_session *usess,
ret = ust_app_snapshot_record(usess, output, wait, nb_streams);
if (ret < 0) {
ret = ust_app_snapshot_record(usess, output, wait, nb_streams);
if (ret < 0) {
- if (ret == -EINVAL) {
+ switch (-ret) {
+ case EINVAL:
ret = LTTNG_ERR_INVALID;
ret = LTTNG_ERR_INVALID;
- goto error_snapshot;
+ break;
+ case ENODATA:
+ ret = LTTNG_ERR_SNAPSHOT_NODATA;
+ break;
+ default:
+ ret = LTTNG_ERR_SNAPSHOT_FAIL;
+ break;
}
}
-
- ret = LTTNG_ERR_SNAPSHOT_FAIL;
goto error_snapshot;
}
goto error_snapshot;
}
This page took
0.025512 seconds
and
4
git commands to generate.