X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=2aeef263d6bd38c7238db96b0c99de4d230bdee2;hp=b997a4aeab6b7ac0aac7208fa82bacd6e964ce28;hb=834978fd9e2392f20867351ca99bf7bdf31b4f56;hpb=645328ae989e5f50a3a49c1ac34b2fee287a3d7b

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index b997a4aea..2aeef263d 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -32,6 +32,7 @@
 #include "kernel.h"
 #include "kernel-consumer.h"
 #include "kern-modules.h"
+#include "utils.h"
 
 /*
  * Add context on a kernel channel.
@@ -351,6 +352,18 @@ error:
 	return ret;
 }
 
+int kernel_enable_syscall(const char *syscall_name,
+		struct ltt_kernel_channel *channel)
+{
+	return kernctl_enable_syscall(channel->fd, syscall_name);
+}
+
+int kernel_disable_syscall(const char *syscall_name,
+		struct ltt_kernel_channel *channel)
+{
+	return kernctl_disable_syscall(channel->fd, syscall_name);
+}
+
 /*
  * Create kernel metadata, open from the kernel tracer and add it to the
  * kernel session.
@@ -823,13 +836,12 @@ void kernel_destroy_channel(struct ltt_kernel_channel *kchan)
  * Return 0 on success or else return a LTTNG_ERR code.
  */
 int kernel_snapshot_record(struct ltt_kernel_session *ksess,
-		struct snapshot_output *output, int wait, unsigned int nb_streams)
+		struct snapshot_output *output, int wait, uint64_t max_size_per_stream)
 {
 	int err, ret, saved_metadata_fd;
 	struct consumer_socket *socket;
 	struct lttng_ht_iter iter;
 	struct ltt_kernel_metadata *saved_metadata;
-	uint64_t max_size_per_stream = 0;
 
 	assert(ksess);
 	assert(ksess->consumer);
@@ -855,10 +867,6 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		goto error_open_stream;
 	}
 
-	if (output->max_size > 0 && nb_streams > 0) {
-		max_size_per_stream = output->max_size / nb_streams;
-	}
-
 	/* Send metadata to consumer and snapshot everything. */
 	cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
 			socket, node.node) {
@@ -885,17 +893,6 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 
 		/* For each channel, ask the consumer to snapshot it. */
 		cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
-			if (max_size_per_stream &&
-					chan->channel->attr.subbuf_size > max_size_per_stream) {
-				ret = LTTNG_ERR_INVALID;
-				DBG3("Kernel snapshot record maximum stream size %" PRIu64
-						" is smaller than subbuffer size of %" PRIu64,
-						max_size_per_stream, chan->channel->attr.subbuf_size);
-				(void) kernel_consumer_destroy_metadata(socket,
-						ksess->metadata);
-				goto error_consumer;
-			}
-
 			pthread_mutex_lock(socket->lock);
 			ret = consumer_snapshot_channel(socket, chan->fd, output, 0,
 					ksess->uid, ksess->gid,
@@ -947,3 +944,17 @@ error:
 	rcu_read_unlock();
 	return ret;
 }
+
+/*
+ * Get the syscall mask array from the kernel tracer.
+ *
+ * Return 0 on success else a negative value. In both case, syscall_mask should
+ * be freed.
+ */
+int kernel_syscall_mask(int chan_fd, char **syscall_mask, uint32_t *nr_bits)
+{
+	assert(syscall_mask);
+	assert(nr_bits);
+
+	return kernctl_syscall_mask(chan_fd, syscall_mask, nr_bits);
+}