X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=7bcfd5dc284f61f6d0e85b05f686c970622a4543;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hp=01af4a297652f7dff1e26202ca7a715741f66315;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c index 01af4a297..7bcfd5dc2 100644 --- a/src/common/kernel-ctl/kernel-ctl.c +++ b/src/common/kernel-ctl/kernel-ctl.c @@ -7,13 +7,14 @@ * */ +#include "lttng/tracker.h" #define _LGPL_SOURCE #define __USE_LINUX_IOCTL_DEFS #include #include #include #include -#include +#include #include #include #include @@ -154,6 +155,12 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops) return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_CHANNEL, &channel); } +int kernctl_create_session_counter(int session_fd, struct lttng_kernel_counter_conf *counter_conf) +{ + return LTTNG_IOCTL_NO_CHECK(session_fd, LTTNG_KERNEL_COUNTER, counter_conf); +} + + int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits) { struct lttng_kernel_syscall_mask kmask_len, *kmask = NULL; @@ -221,32 +228,32 @@ int kernctl_list_tracker_pids(int fd) } 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; - case LTTNG_TRACKER_VPID: + case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID: return LTTNG_KERNEL_TRACKER_VPID; - case LTTNG_TRACKER_UID: + case LTTNG_PROCESS_ATTR_USER_ID: return LTTNG_KERNEL_TRACKER_UID; - case LTTNG_TRACKER_VUID: + case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID: return LTTNG_KERNEL_TRACKER_VUID; - case LTTNG_TRACKER_GID: + case LTTNG_PROCESS_ATTR_GROUP_ID: 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; } } -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; - 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; @@ -254,12 +261,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); } -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; - 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; @@ -267,12 +274,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); } -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; - 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; @@ -417,7 +424,97 @@ int kernctl_stop_session(int fd) LTTNG_KERNEL_SESSION_STOP); } -int kernctl_filter(int fd, struct lttng_filter_bytecode *filter) +int kernctl_create_event_notifier_group(int fd) +{ + return LTTNG_IOCTL_NO_CHECK(fd, + LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_CREATE); +} + +int kernctl_create_counter_event(int fd, struct lttng_kernel_counter_event *ev) +{ + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_COUNTER_EVENT, ev); +} + +int kernctl_create_event_notifier_group_notification_fd(int group_fd) +{ + return LTTNG_IOCTL_NO_CHECK(group_fd, + LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD); +} + +int kernctl_create_event_notifier_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_read_value(int counter_fd, + struct lttng_kernel_counter_read *value) +{ + return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_READ, + value); +} + +int kernctl_counter_get_aggregate_value(int counter_fd, + struct lttng_kernel_counter_aggregate *value) +{ + return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_AGGREGATE, + value); +} + +int kernctl_counter_clear(int counter_fd, + struct lttng_kernel_counter_clear *clear) +{ + return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_CLEAR, + clear); +} + +int kernctl_counter_map_descriptor_count(int counter_fd, uint64_t *count) +{ + struct lttng_kernel_counter_map_nr_descriptors nr_desc; + int ret; + + ret = LTTNG_IOCTL_NO_CHECK(counter_fd, + LTTNG_KERNEL_COUNTER_MAP_NR_DESCRIPTORS, &nr_desc); + *count = nr_desc.nr_descriptors; + + return ret; +} + +int kernctl_counter_map_descriptor(int counter_fd, + struct lttng_kernel_counter_map_descriptor *descriptor) +{ + return LTTNG_IOCTL_NO_CHECK(counter_fd, + LTTNG_KERNEL_COUNTER_MAP_DESCRIPTOR, descriptor); +} + +int kernctl_create_event_notifier(int group_fd, + const struct lttng_kernel_event_notifier *event_notifier) +{ + return LTTNG_IOCTL_NO_CHECK(group_fd, + LTTNG_KERNEL_EVENT_NOTIFIER_CREATE, event_notifier); +} + +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; @@ -509,6 +606,13 @@ int kernctl_buffer_clear(int fd) 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) {