From: Julien Desfossez <jdesfossez@efficios.com>
Date: Wed, 17 Oct 2012 00:44:13 +0000 (-0400)
Subject: Fix: Remove network stream ID ABI calls
X-Git-Tag: v2.1.0-rc5~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1be4792f346ea9a05cfc0acd38e295417c67d122;p=lttng-tools.git

Fix: Remove network stream ID ABI calls

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>
---

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index a93d25102..e4a268ed4 100644
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -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);
-}
diff --git a/src/common/kernel-ctl/kernel-ctl.h b/src/common/kernel-ctl/kernel-ctl.h
index 85a3a1806..ea2aa5819 100644
--- a/src/common/kernel-ctl/kernel-ctl.h
+++ b/src/common/kernel-ctl/kernel-ctl.h
@@ -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 */
diff --git a/src/common/kernel-ctl/kernel-ioctl.h b/src/common/kernel-ctl/kernel-ioctl.h
index 8e2263294..75d6da0cc 100644
--- a/src/common/kernel-ctl/kernel-ioctl.h
+++ b/src/common/kernel-ctl/kernel-ioctl.h
@@ -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                \