X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=8574c1f050b88f387e78e8b06ac80d6c97df5be6;hp=6cc962703e03b11d8475212c4007c12408a32645;hb=890d8fe47755c3bad936389cf48ffa141cff41c9;hpb=46820c8b8f1fbbc15b3afdbb18472b703da1fcd4

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index 6cc962703..8574c1f05 100644
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -16,10 +16,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _LGPL_SOURCE
 #define __USE_LINUX_IOCTL_DEFS
 #include <sys/ioctl.h>
 #include <string.h>
 #include <common/align.h>
+#include <errno.h>
 
 #include "kernel-ctl.h"
 #include "kernel-ioctl.h"
@@ -109,6 +111,7 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops)
 {
 	struct lttng_kernel_channel channel;
 
+	memset(&channel, 0, sizeof(channel));
 	if (lttng_kernel_use_old_abi) {
 		struct lttng_kernel_old_channel old_channel;
 
@@ -140,30 +143,6 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops)
 	return ioctl(fd, LTTNG_KERNEL_CHANNEL, &channel);
 }
 
-int kernctl_enable_syscall(int fd, const char *syscall_name)
-{
-	struct lttng_kernel_event event;
-
-	memset(&event, 0, sizeof(event));
-	strncpy(event.name, syscall_name, sizeof(event.name));
-	event.name[sizeof(event.name) - 1] = '\0';
-	event.instrumentation = LTTNG_KERNEL_SYSCALL;
-	event.u.syscall.enable = 1;
-	return ioctl(fd, LTTNG_KERNEL_EVENT, &event);
-}
-
-int kernctl_disable_syscall(int fd, const char *syscall_name)
-{
-	struct lttng_kernel_event event;
-
-	memset(&event, 0, sizeof(event));
-	strncpy(event.name, syscall_name, sizeof(event.name));
-	event.name[sizeof(event.name) - 1] = '\0';
-	event.instrumentation = LTTNG_KERNEL_SYSCALL;
-	event.u.syscall.enable = 0;
-	return ioctl(fd, LTTNG_KERNEL_EVENT, &event);
-}
-
 int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits)
 {
 	struct lttng_kernel_syscall_mask kmask_len, *kmask = NULL;
@@ -188,6 +167,7 @@ int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits)
 	}
 
 	array_alloc_len = ALIGN(kmask_len.len, 8) >> 3;
+
 	kmask = zmalloc(sizeof(*kmask) + array_alloc_len);
 	if (!kmask) {
 		ret = -1;
@@ -200,7 +180,7 @@ int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits)
 		goto end;
 	}
 
-	new_mask = realloc(syscall_mask, array_alloc_len);
+	new_mask = realloc(*syscall_mask, array_alloc_len);
 	if (!new_mask) {
 		ret = -1;
 		goto end;
@@ -214,6 +194,21 @@ end:
 	return ret;
 }
 
+int kernctl_track_pid(int fd, int pid)
+{
+	return ioctl(fd, LTTNG_KERNEL_SESSION_TRACK_PID, pid);
+}
+
+int kernctl_untrack_pid(int fd, int pid)
+{
+	return ioctl(fd, LTTNG_KERNEL_SESSION_UNTRACK_PID, pid);
+}
+
+int kernctl_list_tracker_pids(int fd)
+{
+	return ioctl(fd, LTTNG_KERNEL_SESSION_LIST_TRACKER_PIDS);
+}
+
 int kernctl_create_stream(int fd)
 {
 	return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_STREAM,
@@ -304,6 +299,25 @@ int kernctl_stop_session(int fd)
 			LTTNG_KERNEL_SESSION_STOP);
 }
 
+int kernctl_filter(int fd, struct lttng_filter_bytecode *filter)
+{
+	struct lttng_kernel_filter_bytecode *kb;
+	uint32_t len;
+	int ret;
+
+	/* Translate bytecode to kernel bytecode */
+	kb = zmalloc(sizeof(*kb) + filter->len);
+	if (!kb)
+		return -ENOMEM;
+	kb->len = len = filter->len;
+	kb->reloc_offset = filter->reloc_table_offset;
+	kb->seqnum = filter->seqnum;
+	memcpy(kb->data, filter->data, len);
+	ret = ioctl(fd, LTTNG_KERNEL_FILTER, kb);
+	free(kb);
+	return ret;
+}
+
 int kernctl_tracepoint_list(int fd)
 {
 	return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_TRACEPOINT_LIST,
@@ -345,6 +359,12 @@ end:
 	return ret;
 }
 
+int kernctl_tracer_abi_version(int fd,
+		struct lttng_kernel_tracer_abi_version *v)
+{
+	return ioctl(fd, LTTNG_KERNEL_TRACER_ABI_VERSION, v);
+}
+
 int kernctl_wait_quiescent(int fd)
 {
 	return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_WAIT_QUIESCENT,