#include "tracepoint-internal.h"
#include "string-utils.h"
+#include "lttng-bytecode.h"
#include "lttng-tracer.h"
#include "lttng-tracer-core.h"
#include "lttng-ust-statedump.h"
+#include "context-internal.h"
#include "ust-events-internal.h"
#include "wait.h"
#include "../libringbuffer/shm.h"
session = zmalloc(sizeof(struct lttng_session));
if (!session)
return NULL;
- if (lttng_session_context_init(&session->ctx)) {
+ if (lttng_context_init_all(&session->ctx)) {
free(session);
return NULL;
}
if (!event_notifier_group)
return NULL;
+ /* Add all contexts. */
+ if (lttng_context_init_all(&event_notifier_group->ctx)) {
+ free(event_notifier_group);
+ return NULL;
+ }
+
CDS_INIT_LIST_HEAD(&event_notifier_group->enablers_head);
CDS_INIT_LIST_HEAD(&event_notifier_group->event_notifiers_head);
for (i = 0; i < LTTNG_UST_EVENT_NOTIFIER_HT_SIZE; i++)
static
void lttng_enabler_destroy(struct lttng_enabler *enabler)
{
- struct lttng_ust_filter_bytecode_node *filter_node, *tmp_filter_node;
+ struct lttng_ust_bytecode_node *filter_node, *tmp_filter_node;
struct lttng_ust_excluder_node *excluder_node, *tmp_excluder_node;
if (!enabler) {
/* Event will be enabled by enabler sync. */
event->enabled = 0;
event->registered = 0;
- CDS_INIT_LIST_HEAD(&event->bytecode_runtime_head);
+ CDS_INIT_LIST_HEAD(&event->filter_bytecode_runtime_head);
CDS_INIT_LIST_HEAD(&event->enablers_ref_head);
event->desc = desc;
event_notifier->registered = 0;
CDS_INIT_LIST_HEAD(&event_notifier->filter_bytecode_runtime_head);
+ CDS_INIT_LIST_HEAD(&event_notifier->capture_bytecode_runtime_head);
CDS_INIT_LIST_HEAD(&event_notifier->enablers_ref_head);
event_notifier->desc = desc;
*/
lttng_enabler_link_bytecode(event->desc,
&session->ctx,
- &event->bytecode_runtime_head,
- lttng_event_enabler_as_enabler(event_enabler));
+ &event->filter_bytecode_runtime_head,
+ <tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head);
/* TODO: merge event context. */
}
return NULL;
event_notifier_enabler->base.format_type = format_type;
CDS_INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head);
+ CDS_INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head);
CDS_INIT_LIST_HEAD(&event_notifier_enabler->base.excluder_head);
event_notifier_enabler->user_token = event_notifier_param->event.token;
+ event_notifier_enabler->num_captures = 0;
memcpy(&event_notifier_enabler->base.event_param.name,
event_notifier_param->event.name,
}
static
-void _lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
- struct lttng_ust_filter_bytecode_node *bytecode)
+void _lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
+ struct lttng_ust_bytecode_node *bytecode)
{
bytecode->enabler = enabler;
cds_list_add_tail(&bytecode->node, &enabler->filter_bytecode_head);
}
-int lttng_event_enabler_attach_bytecode(struct lttng_event_enabler *event_enabler,
- struct lttng_ust_filter_bytecode_node *bytecode)
+int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler,
+ struct lttng_ust_bytecode_node *bytecode)
{
- _lttng_enabler_attach_bytecode(
+ _lttng_enabler_attach_filter_bytecode(
lttng_event_enabler_as_enabler(event_enabler), bytecode);
lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
return 0;
}
-int lttng_event_notifier_enabler_attach_bytecode(
+int lttng_event_notifier_enabler_attach_filter_bytecode(
struct lttng_event_notifier_enabler *event_notifier_enabler,
- struct lttng_ust_filter_bytecode_node *bytecode)
+ struct lttng_ust_bytecode_node *bytecode)
{
- _lttng_enabler_attach_bytecode(
+ _lttng_enabler_attach_filter_bytecode(
lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
bytecode);
return 0;
}
+int lttng_event_notifier_enabler_attach_capture_bytecode(
+ struct lttng_event_notifier_enabler *event_notifier_enabler,
+ struct lttng_ust_bytecode_node *bytecode)
+{
+ bytecode->enabler = lttng_event_notifier_enabler_as_enabler(
+ event_notifier_enabler);
+ cds_list_add_tail(&bytecode->node,
+ &event_notifier_enabler->capture_bytecode_head);
+ event_notifier_enabler->num_captures++;
+
+ lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+ return 0;
+}
+
int lttng_event_notifier_enabler_attach_exclusion(
struct lttng_event_notifier_enabler *event_notifier_enabler,
struct lttng_ust_excluder_node *excluder)
/* Enable filters */
cds_list_for_each_entry(runtime,
- &event->bytecode_runtime_head, node) {
- lttng_filter_sync_state(runtime);
+ &event->filter_bytecode_runtime_head, node) {
+ lttng_bytecode_filter_sync_state(runtime);
}
}
__tracepoint_probe_prune_release_queue();
struct cds_hlist_node *node;
desc = probe_desc->event_desc[i];
+
if (!lttng_desc_match_enabler(desc,
lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)))
continue;
* Link filter bytecodes if not linked yet.
*/
lttng_enabler_link_bytecode(event_notifier->desc,
- &event_notifier_group->ctx, &event_notifier->filter_bytecode_runtime_head,
- lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
+ &event_notifier_group->ctx,
+ &event_notifier->filter_bytecode_runtime_head,
+ <tng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head);
+
+ /*
+ * Link capture bytecodes if not linked yet.
+ */
+ lttng_enabler_link_bytecode(event_notifier->desc,
+ &event_notifier_group->ctx, &event_notifier->capture_bytecode_runtime_head,
+ &event_notifier_enabler->capture_bytecode_head);
+
+ event_notifier->num_captures = event_notifier_enabler->num_captures;
}
end:
return 0;
/* Enable filters */
cds_list_for_each_entry(runtime,
&event_notifier->filter_bytecode_runtime_head, node) {
- lttng_filter_sync_state(runtime);
+ lttng_bytecode_filter_sync_state(runtime);
+ }
+
+ /* Enable captures. */
+ cds_list_for_each_entry(runtime,
+ &event_notifier->capture_bytecode_runtime_head, node) {
+ lttng_bytecode_capture_sync_state(runtime);
}
}
__tracepoint_probe_prune_release_queue();