channels[i].attr.read_timer_interval =
uchan->attr.read_timer_interval;
channels[i].enabled = uchan->enabled;
+ channels[i].attr.tracefile_size = uchan->tracefile_size;
+ channels[i].attr.tracefile_count = uchan->tracefile_count;
switch (uchan->attr.output) {
case LTTNG_UST_MMAP:
default:
}
/*
- * Create a list of JUL domain events.
+ * Create a list of agent domain events.
*
* Return number of events in list on success or else a negative value.
*/
-static int list_lttng_jul_events(struct jul_domain *dom,
+static int list_lttng_agent_events(struct agent *agt,
struct lttng_event **events)
{
int i = 0, ret = 0;
unsigned int nb_event = 0;
- struct jul_event *event;
+ struct agent_event *event;
struct lttng_event *tmp_events;
struct lttng_ht_iter iter;
- assert(dom);
+ assert(agt);
assert(events);
- DBG3("Listing JUL events");
+ DBG3("Listing agent events");
- nb_event = lttng_ht_get_count(dom->events);
+ nb_event = lttng_ht_get_count(agt->events);
if (nb_event == 0) {
ret = nb_event;
goto error;
tmp_events = zmalloc(nb_event * sizeof(*tmp_events));
if (!tmp_events) {
- PERROR("zmalloc JUL events session");
+ PERROR("zmalloc agent events session");
ret = -LTTNG_ERR_FATAL;
goto error;
}
rcu_read_lock();
- cds_lfht_for_each_entry(dom->events->ht, &iter.iter, event, node.node) {
+ cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
strncpy(tmp_events[i].name, event->name, sizeof(tmp_events[i].name));
tmp_events[i].name[sizeof(tmp_events[i].name) - 1] = '\0';
tmp_events[i].enabled = event->enabled;
+ tmp_events[i].loglevel = event->loglevel;
+ tmp_events[i].loglevel_type = event->loglevel_type;
i++;
}
rcu_read_unlock();
/* Quiescent wait after starting trace */
kernel_wait_quiescent(kernel_tracer_fd);
- ksess->started = 1;
+ ksess->active = 1;
ret = LTTNG_OK;
attr->attr.switch_timer_interval = 0;
}
+ /*
+ * The ringbuffer (both in user space and kernel) behave badly in overwrite
+ * mode and with less than 2 subbuf so block it right away and send back an
+ * invalid attribute error.
+ */
+ if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
{
channel_name);
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- ret = event_jul_disable(usess, event_name);
+ agt = trace_ust_find_agent(usess, domain);
+ if (!agt) {
+ ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
+ goto error;
+ }
+
+ ret = event_agent_disable(usess, agt, event_name);
if (ret != LTTNG_OK) {
goto error;
}
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- ret = event_jul_disable_all(usess);
+ agt = trace_ust_find_agent(usess, domain);
+ if (!agt) {
+ ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
+ goto error;
+ }
+
+ ret = event_agent_disable_all(usess, agt);
if (ret != LTTNG_OK) {
goto error;
}
return ret;
}
+static int validate_event_name(const char *name)
+{
+ int ret = 0;
+ const char *c = name;
+ const char *event_name_end = c + LTTNG_SYMBOL_NAME_LEN;
+
+ /*
+ * Make sure that unescaped wildcards are only used as the last
+ * character of the event name.
+ */
+ while (c < event_name_end) {
+ switch (*c) {
+ case '\0':
+ goto end;
+ case '\\':
+ c++;
+ break;
+ case '*':
+ if ((c + 1) < event_name_end && *(c + 1)) {
+ /* Wildcard is not the last character */
+ ret = LTTNG_ERR_INVALID_EVENT_NAME;
+ goto end;
+ }
+ default:
+ break;
+ }
+ c++;
+ }
+end:
+ return ret;
+}
+
/*
* Command LTTNG_ENABLE_EVENT processed by the client thread.
*/
assert(event);
assert(channel_name);
+ ret = validate_event_name(event->name);
+ if (ret) {
+ goto error;
+ }
+
rcu_read_lock();
switch (domain->type) {
}
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct lttng_event uevent;
struct lttng_domain tmp_dom;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- /* Create the default JUL tracepoint. */
+ agt = trace_ust_find_agent(usess, domain->type);
+ if (!agt) {
+ agt = agent_create(domain->type);
+ if (!agt) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ agent_add(agt, usess->agents);
+ }
+
+ /* Create the default tracepoint. */
memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
tmp_dom.type = LTTNG_DOMAIN_UST;
ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME,
- &uevent, NULL, NULL, NULL, wpipe);
+ &uevent, filter_expression, filter, NULL, wpipe);
if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
goto error;
}
/* 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, event);
+ ret = event_agent_enable_all(usess, agt, event, filter);
} else {
- ret = event_jul_enable(usess, event);
+ ret = event_agent_enable(usess, agt, event, filter);
}
if (ret != LTTNG_OK) {
goto error;
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct lttng_event uevent, event;
struct lttng_domain tmp_dom;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- /* Create the default JUL tracepoint. */
+ agt = trace_ust_find_agent(usess, domain->type);
+ if (!agt) {
+ agt = agent_create(domain->type);
+ if (!agt) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ agent_add(agt, usess->agents);
+ }
+
+ /* Create the default tracepoint. */
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
if (is_root) {
strncpy(event.name, "*", sizeof(event.name));
event.name[sizeof(event.name) - 1] = '\0';
- ret = event_jul_enable_all(usess, &event);
+ ret = event_agent_enable_all(usess, agt, &event, filter);
if (ret != LTTNG_OK) {
goto error;
}
goto error;
}
break;
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
- nb_events = jul_list_events(events);
+ nb_events = agent_list_events(events);
if (nb_events < 0) {
ret = LTTNG_ERR_UST_LIST_FAIL;
goto error;
/* Flag session that trace should start automatically */
if (usess) {
- usess->start_trace = 1;
+ /*
+ * Even though the start trace might fail, flag this session active so
+ * other application coming in are started by default.
+ */
+ usess->active = 1;
ret = ust_app_start_trace_all(usess);
if (ret < 0) {
}
/* Kernel tracer */
- if (ksession && ksession->started) {
+ if (ksession && ksession->active) {
DBG("Stop kernel tracing");
/* Flush metadata if exist */
kernel_wait_quiescent(kernel_tracer_fd);
- ksession->started = 0;
+ ksession->active = 0;
}
- if (usess && usess->start_trace) {
- usess->start_trace = 0;
+ if (usess && usess->active) {
+ /*
+ * Even though the stop trace might fail, flag this session inactive so
+ * other application coming in are not started by default.
+ */
+ usess->active = 0;
ret = ust_app_stop_trace_all(usess);
if (ret < 0) {
}
}
+ /*
+ * Make sure to set the session in output mode after we set URI since a
+ * session can be created without URL (thus flagged in no output mode).
+ */
+ session->output_traces = 1;
+ if (ksess) {
+ ksess->output_traces = 1;
+ } else if (usess) {
+ usess->output_traces = 1;
+ }
+
/* All good! */
ret = LTTNG_OK;
{
int ret, index = 0;
ssize_t nb_dom = 0;
+ struct agent *agt;
+ struct lttng_ht_iter iter;
if (session->kernel_session != NULL) {
DBG3("Listing domains found kernel domain");
DBG3("Listing domains found UST global domain");
nb_dom++;
- if (session->ust_session->domain_jul.being_used) {
- nb_dom++;
+ cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
+ agt, node.node) {
+ if (agt->being_used) {
+ nb_dom++;
+ }
}
}
(*domains)[index].buf_type = session->ust_session->buffer_type;
index++;
- if (session->ust_session->domain_jul.being_used) {
- (*domains)[index].type = LTTNG_DOMAIN_JUL;
- (*domains)[index].buf_type = session->ust_session->buffer_type;
- index++;
+ cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
+ agt, node.node) {
+ if (agt->being_used) {
+ (*domains)[index].type = agt->domain;
+ (*domains)[index].buf_type = session->ust_session->buffer_type;
+ index++;
+ }
}
}
}
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
if (session->ust_session) {
- nb_event = list_lttng_jul_events(
- &session->ust_session->domain_jul, events);
+ struct lttng_ht_iter iter;
+ struct agent *agt;
+
+ cds_lfht_for_each_entry(session->ust_session->agents->ht,
+ &iter.iter, agt, node.node) {
+ nb_event = list_lttng_agent_events(agt, events);
+ }
}
break;
default:
*/
static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
struct snapshot_output *output, struct ltt_session *session,
- int wait, int nb_streams)
+ int wait, uint64_t max_stream_size)
{
int ret;
goto error_snapshot;
}
- ret = kernel_snapshot_record(ksess, output, wait, nb_streams);
+ ret = kernel_snapshot_record(ksess, output, wait, max_stream_size);
if (ret != LTTNG_OK) {
goto error_snapshot;
}
*/
static int record_ust_snapshot(struct ltt_ust_session *usess,
struct snapshot_output *output, struct ltt_session *session,
- int wait, int nb_streams)
+ int wait, uint64_t max_stream_size)
{
int ret;
goto error_snapshot;
}
- ret = ust_app_snapshot_record(usess, output, wait, nb_streams);
+ ret = ust_app_snapshot_record(usess, output, wait, max_stream_size);
if (ret < 0) {
switch (-ret) {
case EINVAL:
return ret;
}
+/*
+ * Return the biggest subbuffer size of all channels in the given session.
+ */
+static uint64_t get_session_max_subbuf_size(struct ltt_session *session)
+{
+ uint64_t max_size = 0;
+
+ assert(session);
+
+ if (session->kernel_session) {
+ struct ltt_kernel_channel *chan;
+ struct ltt_kernel_session *ksess = session->kernel_session;
+
+ /*
+ * For each channel, add to the max size the size of each subbuffer
+ * multiplied by their sized.
+ */
+ cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
+ if (chan->channel->attr.subbuf_size > max_size) {
+ max_size = chan->channel->attr.subbuf_size;
+ }
+ }
+ }
+
+ if (session->ust_session) {
+ struct lttng_ht_iter iter;
+ struct ltt_ust_channel *uchan;
+ struct ltt_ust_session *usess = session->ust_session;
+
+ cds_lfht_for_each_entry(usess->domain_global.channels->ht, &iter.iter,
+ uchan, node.node) {
+ if (uchan->attr.subbuf_size > max_size) {
+ max_size = uchan->attr.subbuf_size;
+ }
+ }
+ }
+
+ return max_size;
+}
+
/*
* Returns the total number of streams for a session or a negative value
* on error.
*/
-static unsigned int get_total_nb_stream(struct ltt_session *session)
+static unsigned int get_session_nb_streams(struct ltt_session *session)
{
unsigned int total_streams = 0;
unsigned int use_tmp_output = 0;
struct snapshot_output tmp_output;
unsigned int nb_streams, snapshot_success = 0;
+ uint64_t session_max_size = 0, max_stream_size = 0;
assert(session);
}
/*
- * Get the total number of stream of that session which is used by the
- * maximum size of the snapshot feature.
+ * Get the session maximum size for a snapshot meaning it will compute the
+ * size of all streams from all domain.
+ */
+ max_stream_size = get_session_max_subbuf_size(session);
+
+ nb_streams = get_session_nb_streams(session);
+ if (nb_streams) {
+ /*
+ * The maximum size of the snapshot is the number of streams multiplied
+ * by the biggest subbuf size of all channels in a session which is the
+ * maximum stream size available for each stream. The session max size
+ * is now checked against the snapshot max size value given by the user
+ * and if lower, an error is returned.
+ */
+ session_max_size = max_stream_size * nb_streams;
+ }
+
+ DBG3("Snapshot max size is %" PRIu64 " for max stream size of %" PRIu64,
+ session_max_size, max_stream_size);
+
+ /*
+ * If we use a temporary output, check right away if the max size fits else
+ * for each output the max size will be checked.
*/
- nb_streams = get_total_nb_stream(session);
+ if (use_tmp_output &&
+ (tmp_output.max_size != 0 &&
+ tmp_output.max_size < session_max_size)) {
+ ret = LTTNG_ERR_MAX_SIZE_INVALID;
+ goto error;
+ }
if (session->kernel_session) {
struct ltt_kernel_session *ksess = session->kernel_session;
if (use_tmp_output) {
ret = record_kernel_snapshot(ksess, &tmp_output, session,
- wait, nb_streams);
+ wait, max_stream_size);
if (ret != LTTNG_OK) {
goto error;
}
tmp_output.max_size = output->max_size;
}
+ if (tmp_output.max_size != 0 &&
+ tmp_output.max_size < session_max_size) {
+ rcu_read_unlock();
+ ret = LTTNG_ERR_MAX_SIZE_INVALID;
+ goto error;
+ }
+
/* Use temporary name. */
if (*output->name != '\0') {
strncpy(tmp_output.name, output->name,
tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
ret = record_kernel_snapshot(ksess, &tmp_output,
- session, wait, nb_streams);
+ session, wait, max_stream_size);
if (ret != LTTNG_OK) {
rcu_read_unlock();
goto error;
if (use_tmp_output) {
ret = record_ust_snapshot(usess, &tmp_output, session,
- wait, nb_streams);
+ wait, max_stream_size);
if (ret != LTTNG_OK) {
goto error;
}
tmp_output.max_size = output->max_size;
}
+ if (tmp_output.max_size != 0 &&
+ tmp_output.max_size < session_max_size) {
+ rcu_read_unlock();
+ ret = LTTNG_ERR_MAX_SIZE_INVALID;
+ goto error;
+ }
+
/* Use temporary name. */
if (*output->name != '\0') {
strncpy(tmp_output.name, output->name,
tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
ret = record_ust_snapshot(usess, &tmp_output, session,
- wait, nb_streams);
+ wait, max_stream_size);
if (ret != LTTNG_OK) {
rcu_read_unlock();
goto error;