From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 2 Nov 2011 17:33:03 +0000 (-0400)
Subject: Move lttng_ust_object_data et lttng_ust_channel_attr to -abi.h
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=92462b01cae094cbb15052c3a4775071319121fb;p=ust.git

Move lttng_ust_object_data et lttng_ust_channel_attr to -abi.h

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/ust/lttng-ust-abi.h b/include/ust/lttng-ust-abi.h
index da2bfb9..5b025ae 100644
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -78,6 +78,25 @@ struct lttng_ust_context {
 	} u;
 };
 
+/*
+ * Tracer channel attributes.
+ */
+struct lttng_ust_channel_attr {
+	int overwrite;				/* 1: overwrite, 0: discard */
+	uint64_t subbuf_size;			/* bytes */
+	uint64_t num_subbuf;			/* power of 2 */
+	unsigned int switch_timer_interval;	/* usec */
+	unsigned int read_timer_interval;	/* usec */
+	enum lttng_ust_output output;		/* splice, mmap */
+};
+
+struct lttng_ust_object_data {
+	int handle;
+	int shm_fd;
+	int wait_fd;
+	uint64_t memory_map_size;
+};
+
 #define _UST_CMD(minor)				(minor)
 #define _UST_CMDR(minor, type)			(minor)
 #define _UST_CMDW(minor, type)			(minor)
diff --git a/include/ust/lttng-ust-ctl.h b/include/ust/lttng-ust-ctl.h
index c37aa00..bba5945 100644
--- a/include/ust/lttng-ust-ctl.h
+++ b/include/ust/lttng-ust-ctl.h
@@ -22,25 +22,6 @@
 
 #include <ust/lttng-ust-abi.h>
 
-/*
- * Tracer channel attributes.
- */
-struct lttng_ust_channel_attr {
-	int overwrite;				/* 1: overwrite, 0: discard */
-	uint64_t subbuf_size;			/* bytes */
-	uint64_t num_subbuf;			/* power of 2 */
-	unsigned int switch_timer_interval;	/* usec */
-	unsigned int read_timer_interval;	/* usec */
-	enum lttng_ust_output output;		/* splice, mmap */
-};
-
-struct lttng_ust_object_data {
-	int handle;
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
-};
-
 int ustctl_register_done(int sock);
 int ustctl_create_session(int sock);
 int ustctl_open_metadata(int sock, int session_handle,
diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c
index d9339e9..386b755 100644
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -43,13 +43,6 @@
 #define MAX_NR_STREAMS	64
 #define MAX_NR_EVENTS	128
 
-struct lttng_ust_object_data {
-	int handle;
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
-};
-
 static int session_handle;
 static struct lttng_ust_object_data metadata_stream_data;
 static struct lttng_ust_object_data metadata_data;
diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c
index 130da70..2869b0e 100644
--- a/tests/ust-multi-test/ust-multi-test.c
+++ b/tests/ust-multi-test/ust-multi-test.c
@@ -51,13 +51,6 @@ const char *evname[] = {
 	"ust_tests_hello_dontexist",
 };
 
-struct lttng_ust_object_data {
-	int handle;
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
-};
-
 static int session_handle[NR_SESSIONS];
 static struct lttng_ust_object_data metadata_stream_data[NR_SESSIONS];
 static struct lttng_ust_object_data metadata_data[NR_SESSIONS];