X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-abi.c;fp=src%2Flttng-abi.c;h=cd9466568221f3427ebad590f140b137251f32f0;hb=83006ee0d75381816540c339e5dda7aba72fafa3;hp=1f0939815262e5e2209d6c3e208a1c113c4b3acc;hpb=5c6ec66ac09a37f1604434a27bafd38364107841;p=lttng-modules.git diff --git a/src/lttng-abi.c b/src/lttng-abi.c index 1f093981..cd946656 100644 --- a/src/lttng-abi.c +++ b/src/lttng-abi.c @@ -1912,7 +1912,7 @@ int lttng_abi_create_event(struct file *channel_file, lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: { - struct lttng_kernel_event_recorder *event; + struct lttng_kernel_event_common *event; struct lttng_event_recorder_enabler *event_enabler; event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, @@ -1925,14 +1925,14 @@ int lttng_abi_create_event(struct file *channel_file, * We tolerate no failure path after event creation. It * will stay invariant for the rest of the session. */ - event = lttng_kernel_event_recorder_create(event_enabler, NULL); + event = lttng_kernel_event_create(&event_enabler->parent, NULL); WARN_ON_ONCE(!event); lttng_event_enabler_destroy(&event_enabler->parent); if (IS_ERR(event)) { ret = PTR_ERR(event); goto event_error; } - priv = event; + priv = container_of(event, struct lttng_kernel_event_recorder, parent); break; } @@ -2153,7 +2153,7 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file, lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: { - struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_event_common *event; struct lttng_event_notifier_enabler *event_notifier_enabler; event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME, @@ -2162,14 +2162,14 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file, ret = -ENOMEM; goto event_notifier_error; } - event_notifier = lttng_event_notifier_create(event_notifier_enabler, NULL); - WARN_ON_ONCE(!event_notifier); + event = lttng_kernel_event_create(&event_notifier_enabler->parent, NULL); + WARN_ON_ONCE(!event); lttng_event_enabler_destroy(&event_notifier_enabler->parent); - if (IS_ERR(event_notifier)) { - ret = PTR_ERR(event_notifier); + if (IS_ERR(event)) { + ret = PTR_ERR(event); goto event_notifier_error; } - priv = event_notifier; + priv = container_of(event, struct lttng_kernel_event_notifier, parent); break; }