X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng-share.h;h=38598bcea2de5b02b8868a45a3a4cce0bcd8a43f;hp=d076ef3ade5d172d2ef63b9f34168e2b2701a817;hb=71615260f4e0d7a58bf64a837c081af2d155ef9d;hpb=b389abbe14d653f704fcf8f952539cc5ce775c53

diff --git a/include/lttng-share.h b/include/lttng-share.h
index d076ef3ad..38598bcea 100644
--- a/include/lttng-share.h
+++ b/include/lttng-share.h
@@ -19,46 +19,27 @@
 #ifndef _LTTNG_SHARE_H
 #define _LTTNG_SHARE_H
 
-#include <asm/types.h>
-#include <stdint.h>
-
-typedef uint32_t u32;
-typedef uint64_t u64;
-
-typedef __s64 s64;
-
 /* Default channel attributes */
-#define DEFAULT_CHANNEL_NAME			"channel0"
-#define DEFAULT_CHANNEL_OVERWRITE		0       /* usec */
+#define DEFAULT_CHANNEL_NAME            "channel0"
+#define DEFAULT_CHANNEL_OVERWRITE       0       /* usec */
 /* DEFAULT_CHANNEL_SUBBUF_SIZE must always be a power of 2 */
-#define DEFAULT_CHANNEL_SUBBUF_SIZE		4096    /* bytes */
+#define DEFAULT_CHANNEL_SUBBUF_SIZE     4096    /* bytes */
 /* DEFAULT_CHANNEL_SUBBUF_NUM must always be a power of 2 */
-#define DEFAULT_CHANNEL_SUBBUF_NUM		8
-#define DEFAULT_CHANNEL_SWITCH_TIMER		0       /* usec */
+#define DEFAULT_CHANNEL_SUBBUF_NUM      8
+#define DEFAULT_CHANNEL_SWITCH_TIMER    0       /* usec */
 #define DEFAULT_CHANNEL_READ_TIMER		200     /* usec */
-#define DEFAULT_CHANNEL_OUTPUT			LTTNG_EVENT_MMAP
+#define DEFAULT_CHANNEL_OUTPUT          LTTNG_EVENT_MMAP
 
-#define DEFAULT_METADATA_SUBBUF_SIZE		4096
-#define DEFAULT_METADATA_SUBBUF_NUM		8
-//TODO: keeping value to 8 currently because consumer is only spawned after
-//start, so it cannot empty the metadata buffer at trace start.
-//#define DEFAULT_METADATA_SUBBUF_NUM		2
+#define DEFAULT_METADATA_SUBBUF_SIZE    4096
+#define DEFAULT_METADATA_SUBBUF_NUM     2
 
 /* Kernel has different defaults */
 
 /* DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE must always be a power of 2 */
-#define DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE	262144    /* bytes */
+#define DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE  262144    /* bytes */
 /* DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM must always be a power of 2 */
-#define DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM	4
+#define DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM   4
 /* See lttng-kernel.h enum lttng_kernel_output for channel output */
-#define DEFAULT_KERNEL_CHANNEL_OUTPUT		LTTNG_EVENT_SPLICE
-
-/*
- * lttng user-space instrumentation type
- */
-enum lttng_ust_instrumentation {
-	LTTNG_UST_TRACEPOINT,
-	LTTNG_UST_MARKER,
-};
+#define DEFAULT_KERNEL_CHANNEL_OUTPUT       LTTNG_EVENT_SPLICE
 
 #endif /* _LTTNG_SHARE_H */