Fix: Remove network stream ID ABI calls
authorJulien Desfossez <jdesfossez@efficios.com>
Wed, 17 Oct 2012 00:44:13 +0000 (20:44 -0400)
committerDavid Goulet <dgoulet@efficios.com>
Fri, 19 Oct 2012 19:42:26 +0000 (15:42 -0400)
This patch removes some experimental kernel ABI calls that were not
supposed to get merged. The kernel support for these calls has never
been introduced in lttng-modules.

I'm not sure how it happened, but it seems that this code got introduced
along with the commit 00e2e675d54dc726a7c8f8887c889cc8ef022003

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
src/common/kernel-ctl/kernel-ctl.c
src/common/kernel-ctl/kernel-ctl.h
src/common/kernel-ctl/kernel-ioctl.h

index a93d25102ad4bb7b2bf6a4afe8ad5d0edd3fb096..e4a268ed48becd506ddbaf955deeacd3ef6d5373 100644 (file)
@@ -378,9 +378,3 @@ int kernctl_put_subbuf(int fd)
 {
        return ioctl(fd, RING_BUFFER_PUT_SUBBUF);
 }
-
-/* Set the stream_id */
-int kernctl_set_stream_id(int fd, unsigned long *stream_id)
-{
-       return ioctl(fd, RING_BUFFER_SET_STREAM_ID, stream_id);
-}
index 85a3a1806fc3d1f03830b63b66580b14b43cb614..ea2aa581928084cdaa4eb9aea4d0ff6ddbfa2277 100644 (file)
@@ -66,7 +66,5 @@ int kernctl_get_subbuf(int fd, unsigned long *pos);
 int kernctl_put_subbuf(int fd);
 
 int kernctl_buffer_flush(int fd);
-int kernctl_set_stream_id(int fd, unsigned long *stream_id);
-int kernctl_get_net_stream_id_offset(int fd, unsigned long *offset);
 
 #endif /* _LTTNG_KERNEL_CTL_H */
index 8e2263294943cece2bc5ac48e1fd3687db556876..75d6da0ccdd9cffe1226c695261a513d3d0bee12 100644 (file)
@@ -46,8 +46,6 @@
 #define RING_BUFFER_GET_MMAP_READ_OFFSET    _IOR(0xF6, 0x0B, unsigned long)
 /* flush the current sub-buffer */
 #define RING_BUFFER_FLUSH                   _IO(0xF6, 0x0C)
-/* map stream to stream id for network streaming */
-#define RING_BUFFER_SET_STREAM_ID           _IOW(0xF6, 0x0D, unsigned long)
 
 /* Old ABI (without support for 32/64 bits compat) */
 /* LTTng file descriptor ioctl */
@@ -71,8 +69,6 @@
 #define LTTNG_KERNEL_OLD_STREAM                 _IO(0xF6, 0x60)
 #define LTTNG_KERNEL_OLD_EVENT                  \
                _IOW(0xF6, 0x61, struct lttng_kernel_old_event)
-#define LTTNG_KERNEL_OLD_STREAM_ID_OFFSET       \
-               _IOR(0xF6, 0x62, unsigned long)
 
 /* Event and Channel FD ioctl */
 #define LTTNG_KERNEL_OLD_CONTEXT                \
This page took 0.034399 seconds and 4 git commands to generate.