X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=libkernelctl%2Flibkernelctl.c;h=47d749778912082da78afa47cf1f90a914ddf04e;hp=cfac1fa5c80ce32faa603315e2e5afa0a7142ca1;hb=ca3c5ac0cf100d80352a1a81936b5adc47942f35;hpb=8d609afd07d40f27a17e6a0fe61ea3a54e111896

diff --git a/libkernelctl/libkernelctl.c b/libkernelctl/libkernelctl.c
index cfac1fa5c..47d749778 100644
--- a/libkernelctl/libkernelctl.c
+++ b/libkernelctl/libkernelctl.c
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,50 +21,120 @@
 
 #include "kernel-ioctl.h"
 #include "libkernelctl.h"
-#include "lttngerr.h"
 
-int kernctl_create_channel(int fd, struct lttng_kernel_channel *chops)
+int kernctl_create_session(int fd)
+{
+	return ioctl(fd, LTTNG_KERNEL_SESSION);
+}
+
+/* open the metadata global channel */
+int kernctl_open_metadata(int fd, struct lttng_channel_attr *chops)
+{
+	return ioctl(fd, LTTNG_KERNEL_METADATA, chops);
+}
+
+int kernctl_create_channel(int fd, struct lttng_channel_attr *chops)
 {
 	return ioctl(fd, LTTNG_KERNEL_CHANNEL, chops);
 }
 
+int kernctl_create_stream(int fd)
+{
+	return ioctl(fd, LTTNG_KERNEL_STREAM);
+}
+
 int kernctl_create_event(int fd, struct lttng_kernel_event *ev)
 {
 	return ioctl(fd, LTTNG_KERNEL_EVENT, ev);
 }
 
-int kernctl_create_session(int fd)
+int kernctl_add_context(int fd, struct lttng_kernel_context *ctx)
 {
-	return ioctl(fd, LTTNG_KERNEL_SESSION);
+	return ioctl(fd, LTTNG_KERNEL_CONTEXT, ctx);
 }
 
-int kernctl_create_stream(int fd)
+
+/* Enable event, channel and session ioctl */
+int kernctl_enable(int fd)
 {
-	return ioctl(fd, LTTNG_KERNEL_STREAM);
+	return ioctl(fd, LTTNG_KERNEL_ENABLE);
 }
 
-/* returns the maximum size for sub-buffers. */
-int kernctl_get_max_subbuf_size(int fd, unsigned long *len)
+/* Disable event, channel and session ioctl */
+int kernctl_disable(int fd)
 {
-	return ioctl(fd, RING_BUFFER_GET_MAX_SUBBUF_SIZE, len);
+	return ioctl(fd, LTTNG_KERNEL_DISABLE);
 }
 
+int kernctl_start_session(int fd)
+{
+	return ioctl(fd, LTTNG_KERNEL_SESSION_START);
+}
+
+int kernctl_stop_session(int fd)
+{
+	return ioctl(fd, LTTNG_KERNEL_SESSION_STOP);
+}
+
+
+int kernctl_tracepoint_list(int fd)
+{
+	return ioctl(fd, LTTNG_KERNEL_TRACEPOINT_LIST);
+}
+
+int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v)
+{
+	return ioctl(fd, LTTNG_KERNEL_TRACER_VERSION, v);
+}
+
+int kernctl_wait_quiescent(int fd)
+{
+	return ioctl(fd, LTTNG_KERNEL_WAIT_QUIESCENT);
+}
+
+int kernctl_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
+{
+	return ioctl(fd, LTTNG_KERNEL_CALIBRATE, calibrate);
+}
+
+
+int kernctl_buffer_flush(int fd)
+{
+	return ioctl(fd, RING_BUFFER_FLUSH);
+}
+
+
+/* Buffer operations */
+
+/* For mmap mode, readable without "get" operation */
+
 /* returns the length to mmap. */
 int kernctl_get_mmap_len(int fd, unsigned long *len)
 {
 	return ioctl(fd, RING_BUFFER_GET_MMAP_LEN, len);
 }
 
+/* returns the maximum size for sub-buffers. */
+int kernctl_get_max_subbuf_size(int fd, unsigned long *len)
+{
+	return ioctl(fd, RING_BUFFER_GET_MAX_SUBBUF_SIZE, len);
+}
+
+/*
+ * For mmap mode, operate on the current packet (between get/put or
+ * get_next/put_next).
+ */
+
 /* returns the offset of the subbuffer belonging to the mmap reader. */
 int kernctl_get_mmap_read_offset(int fd, unsigned long *off)
 {
 	return ioctl(fd, RING_BUFFER_GET_MMAP_READ_OFFSET, off);
 }
 
-/* Get exclusive read access to the next sub-buffer that can be read. */
-int kernctl_get_next_subbuf(int fd)
+/* returns the size of the current sub-buffer, without padding (for mmap). */
+int kernctl_get_subbuf_size(int fd, unsigned long *len)
 {
-	return ioctl(fd, RING_BUFFER_GET_NEXT_SUBBUF);
+	return ioctl(fd, RING_BUFFER_GET_SUBBUF_SIZE, len);
 }
 
 /* returns the size of the current sub-buffer, without padding (for mmap). */
@@ -73,23 +143,12 @@ int kernctl_get_padded_subbuf_size(int fd, unsigned long *len)
 	return ioctl(fd, RING_BUFFER_GET_PADDED_SUBBUF_SIZE, len);
 }
 
-/* Get exclusive read access to the specified sub-buffer position */
-int kernctl_get_subbuf(int fd, unsigned long *len)
-{
-	return ioctl(fd, RING_BUFFER_GET_SUBBUF, len);
-}
-
-/* returns the size of the current sub-buffer, without padding (for mmap). */
-int kernctl_get_subbuf_size(int fd, unsigned long *len)
+/* Get exclusive read access to the next sub-buffer that can be read. */
+int kernctl_get_next_subbuf(int fd)
 {
-	return ioctl(fd, RING_BUFFER_GET_SUBBUF_SIZE, len);
+	return ioctl(fd, RING_BUFFER_GET_NEXT_SUBBUF);
 }
 
-/* open the metadata global channel */
-int kernctl_open_metadata(int fd, struct lttng_kernel_channel *chops)
-{
-	return ioctl(fd, LTTNG_KERNEL_METADATA, chops);
-}
 
 /* Release exclusive sub-buffer access, move consumer forward. */
 int kernctl_put_next_subbuf(int fd)
@@ -97,11 +156,7 @@ int kernctl_put_next_subbuf(int fd)
 	return ioctl(fd, RING_BUFFER_PUT_NEXT_SUBBUF);
 }
 
-/* Release exclusive sub-buffer access */
-int kernctl_put_subbuf(int fd)
-{
-	return ioctl(fd, RING_BUFFER_PUT_SUBBUF);
-}
+/* snapshot */
 
 /* Get a snapshot of the current ring buffer producer and consumer positions */
 int kernctl_snapshot(int fd)
@@ -121,22 +176,14 @@ int kernctl_snapshot_get_produced(int fd, unsigned long *pos)
 	return ioctl(fd, RING_BUFFER_SNAPSHOT_GET_PRODUCED, pos);
 }
 
-int kernctl_start_session(int fd)
-{
-	return ioctl(fd, LTTNG_KERNEL_SESSION_START);
-}
-
-int kernctl_stop_session(int fd)
-{
-	return ioctl(fd, LTTNG_KERNEL_SESSION_STOP);
-}
-
-int kernctl_tracepoint_list(int fd)
+/* Get exclusive read access to the specified sub-buffer position */
+int kernctl_get_subbuf(int fd, unsigned long *len)
 {
-	return ioctl(fd, LTTNG_KERNEL_TRACEPOINT_LIST);
+	return ioctl(fd, RING_BUFFER_GET_SUBBUF, len);
 }
 
-int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v)
+/* Release exclusive sub-buffer access */
+int kernctl_put_subbuf(int fd)
 {
-	return ioctl(fd, LTTNG_KERNEL_TRACER_VERSION, v);
+	return ioctl(fd, RING_BUFFER_PUT_SUBBUF);
 }