SoW-2020-0002: Trace Hit Counters: trigger error reporting integration

[lttng-tools.git] / src / common / kernel-ctl / kernel-ctl.c

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index 01af4a297652f7dff1e26202ca7a715741f66315..386685c2a593947b154bf87f91757a601d565d92 100644 (file)
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -7,6 +7,7 @@
  *
  */
 
  *
  */
 

+#include "lttng/tracker.h"

 #define _LGPL_SOURCE
 #define __USE_LINUX_IOCTL_DEFS
 #include <sys/ioctl.h>
 #define _LGPL_SOURCE
 #define __USE_LINUX_IOCTL_DEFS
 #include <sys/ioctl.h>


@@ -221,32 +222,32 @@ int kernctl_list_tracker_pids(int fd)
 }
 
 static enum lttng_kernel_tracker_type get_kernel_tracker_type(
 }
 
 static enum lttng_kernel_tracker_type get_kernel_tracker_type(

-               enum lttng_tracker_type type)
+               enum lttng_process_attr process_attr)

 {
 {

-       switch (type) {
-       case LTTNG_TRACKER_PID:
+       switch (process_attr) {
+       case LTTNG_PROCESS_ATTR_PROCESS_ID:

                return LTTNG_KERNEL_TRACKER_PID;
                return LTTNG_KERNEL_TRACKER_PID;

-       case LTTNG_TRACKER_VPID:
+       case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID:

                return LTTNG_KERNEL_TRACKER_VPID;
                return LTTNG_KERNEL_TRACKER_VPID;

-       case LTTNG_TRACKER_UID:
+       case LTTNG_PROCESS_ATTR_USER_ID:

                return LTTNG_KERNEL_TRACKER_UID;
                return LTTNG_KERNEL_TRACKER_UID;

-       case LTTNG_TRACKER_VUID:
+       case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID:

                return LTTNG_KERNEL_TRACKER_VUID;
                return LTTNG_KERNEL_TRACKER_VUID;

-       case LTTNG_TRACKER_GID:
+       case LTTNG_PROCESS_ATTR_GROUP_ID:

                return LTTNG_KERNEL_TRACKER_GID;
                return LTTNG_KERNEL_TRACKER_GID;

-       case LTTNG_TRACKER_VGID:
+       case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID:

                return LTTNG_KERNEL_TRACKER_VGID;
        default:
                return LTTNG_KERNEL_TRACKER_UNKNOWN;
        }
 }
 
                return LTTNG_KERNEL_TRACKER_VGID;
        default:
                return LTTNG_KERNEL_TRACKER_UNKNOWN;
        }
 }
 

-int kernctl_track_id(int fd, enum lttng_tracker_type tracker_type, int id)
+int kernctl_track_id(int fd, enum lttng_process_attr process_attr, int id)

 {
        struct lttng_kernel_tracker_args args;
 
        args.id = id;
 {
        struct lttng_kernel_tracker_args args;
 
        args.id = id;

-       args.type = get_kernel_tracker_type(tracker_type);
+       args.type = get_kernel_tracker_type(process_attr);

        if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) {
                errno = EINVAL;
                return -1;
        if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) {
                errno = EINVAL;
                return -1;


@@ -254,12 +255,12 @@ int kernctl_track_id(int fd, enum lttng_tracker_type tracker_type, int id)
        return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_TRACK_ID, &args);
 }
 
        return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_TRACK_ID, &args);
 }
 

-int kernctl_untrack_id(int fd, enum lttng_tracker_type tracker_type, int id)
+int kernctl_untrack_id(int fd, enum lttng_process_attr process_attr, int id)

 {
        struct lttng_kernel_tracker_args args;
 
        args.id = id;
 {
        struct lttng_kernel_tracker_args args;
 
        args.id = id;

-       args.type = get_kernel_tracker_type(tracker_type);
+       args.type = get_kernel_tracker_type(process_attr);

        if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) {
                errno = EINVAL;
                return -1;
        if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) {
                errno = EINVAL;
                return -1;


@@ -267,12 +268,12 @@ int kernctl_untrack_id(int fd, enum lttng_tracker_type tracker_type, int id)
        return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_UNTRACK_ID, &args);
 }
 
        return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_UNTRACK_ID, &args);
 }
 

-int kernctl_list_tracker_ids(int fd, enum lttng_tracker_type tracker_type)
+int kernctl_list_tracker_ids(int fd, enum lttng_process_attr process_attr)

 {
        struct lttng_kernel_tracker_args args;
 
        args.id = -1;
 {
        struct lttng_kernel_tracker_args args;
 
        args.id = -1;

-       args.type = get_kernel_tracker_type(tracker_type);
+       args.type = get_kernel_tracker_type(process_attr);

        if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) {
                errno = EINVAL;
                return -1;
        if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) {
                errno = EINVAL;
                return -1;


@@ -417,7 +418,51 @@ int kernctl_stop_session(int fd)
                        LTTNG_KERNEL_SESSION_STOP);
 }
 
                        LTTNG_KERNEL_SESSION_STOP);
 }
 

-int kernctl_filter(int fd, struct lttng_filter_bytecode *filter)
+int kernctl_create_trigger_group(int fd)
+{
+       return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_TRIGGER_GROUP_CREATE);
+}
+
+int kernctl_create_trigger_group_notification_fd(int group_fd)
+{
+       return LTTNG_IOCTL_NO_CHECK(group_fd, LTTNG_KERNEL_TRIGGER_GROUP_NOTIFICATION_FD);
+}
+
+int kernctl_create_trigger_group_error_counter(int group_fd, struct lttng_kernel_counter_conf *error_counter_conf)
+{
+       return LTTNG_IOCTL_NO_CHECK(group_fd, LTTNG_KERNEL_COUNTER, error_counter_conf);
+}
+
+int kernctl_counter_get_value(int counter_fd, struct lttng_kernel_counter_value *value)
+{
+       return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_VALUE, value);
+}
+
+int kernctl_create_trigger(int group_fd, struct lttng_kernel_trigger *trigger)
+{
+               return LTTNG_IOCTL_NO_CHECK(group_fd, LTTNG_KERNEL_TRIGGER_CREATE, trigger);
+}
+
+int kernctl_capture(int fd, const struct lttng_bytecode *capture)
+{
+       struct lttng_kernel_capture_bytecode *kb;
+       uint32_t len;
+       int ret;
+
+       /* Translate bytecode to kernel bytecode */
+       kb = zmalloc(sizeof(*kb) + capture->len);
+       if (!kb)
+               return -ENOMEM;
+       kb->len = len = capture->len;
+       kb->reloc_offset = capture->reloc_table_offset;
+       kb->seqnum = capture->seqnum;
+       memcpy(kb->data, capture->data, len);
+       ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_CAPTURE, kb);
+       free(kb);
+       return ret;
+}
+
+int kernctl_filter(int fd, const struct lttng_bytecode *filter)

 {
        struct lttng_kernel_filter_bytecode *kb;
        uint32_t len;
 {
        struct lttng_kernel_filter_bytecode *kb;
        uint32_t len;


@@ -509,6 +554,13 @@ int kernctl_buffer_clear(int fd)
        return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_CLEAR);
 }
 
        return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_CLEAR);
 }
 

+int kernctl_get_next_subbuf_metadata_check(int fd, bool *consistent)
+{
+       return LTTNG_IOCTL_NO_CHECK(fd,
+                       RING_RING_BUFFER_GET_NEXT_SUBBUF_METADATA_CHECK,
+                       consistent);
+}
+

 /* returns the version of the metadata. */
 int kernctl_get_metadata_version(int fd, uint64_t *version)
 {
 /* returns the version of the metadata. */
 int kernctl_get_metadata_version(int fd, uint64_t *version)
 {