Move declarations to global header

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

diff --git a/ltt-events.h b/ltt-events.h
index 443d185cc292ebe8d6363c4af31b50a30b2c55a7..9e0ad2d74784c6696be40827e9dce816b1ae4a34 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -72,6 +72,77 @@ struct ltt_transport {
        struct ltt_channel_ops ops;
 };
 
+/* Type description */
+
+/* Update the astract_types name table in lttng-types.c along with this enum */
+enum abstract_types {
+       atype_integer,
+       atype_enum,
+       atype_array,
+       atype_sequence,
+       atype_string,
+       NR_ABSTRACT_TYPES,
+};
+
+/* Update the string_encodings name table in lttng-types.c along with this enum */
+enum lttng_string_encodings {
+       lttng_encode_UTF8 = 0,
+       lttng_encode_ASCII = 1,
+       NR_STRING_ENCODINGS,
+};
+
+struct lttng_enum_entry {
+       unsigned long long start, end;  /* start and end are inclusive */
+       const char *string;
+};
+
+struct lttng_enum {
+       const struct lttng_enum_entry *entries;
+       unsigned int len;
+};
+
+struct lttng_type {
+       enum abstract_types atype;
+       const char *name;
+       union {
+               struct {
+                       unsigned int size;              /* in bits */
+                       unsigned short alignment;       /* in bits */
+                       unsigned int signedness:1;
+                       unsigned int reverse_byte_order:1;
+               } integer;
+               struct {
+                       const char *parent_type;
+                       const struct lttng_enum def;
+               } enumeration;
+               struct {
+                       const char *elem_type;
+                       unsigned int length;            /* num. elems. */
+               } array;
+               struct {
+                       const char *elem_type;
+                       const char *length_type;
+               } sequence;
+               struct {
+                       enum lttng_string_encodings encoding;
+               } string;
+       } u;
+} __attribute__((packed));
+
+/* Event field description */
+
+struct lttng_event_field {
+       const char *name;
+       const struct lttng_type type;
+};
+
+struct lttng_event_desc {
+       const struct lttng_event_field *fields;
+       const char *name;
+       void *probe_callback;
+       unsigned int nr_fields;
+};
+
 struct ltt_session *ltt_session_create(void);
 int ltt_session_start(struct ltt_session *session);
 int ltt_session_stop(struct ltt_session *session);

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index a47320b12487d399e88e0fbc0fed76c1db204d71..3a5a3b9cd61c5aeba731e7232b19d398ad5c0584 100644 (file)
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -1,23 +1,11 @@
-#include <lttng.h>
-#include <lttng-types.h>
 #include <linux/debugfs.h>
+#include "lttng.h"
+#include "lttng-types.h"
 #include "../wrapper/vmalloc.h"        /* for wrapper_vmalloc_sync_all() */
 #include "../wrapper/ringbuffer/frontend_types.h"
 #include "../ltt-events.h"
 #include "../ltt-tracer-core.h"
 
-struct lttng_event_field {
-       const char *name;
-       const struct lttng_type type;
-};
-
-struct lttng_event_desc {
-       const struct lttng_event_field *fields;
-       const char *name;
-       void *probe_callback;
-       unsigned int nr_fields;
-};
-
 /*
  * Macro declarations used for all stages.
  */

diff --git a/probes/lttng-types.h b/probes/lttng-types.h
index 0192bffaf2f321f446f71a13901e2ab09fd69663..cbe1dea1c4f4524624cc58ab358df3848d509589 100644 (file)
--- a/probes/lttng-types.h
+++ b/probes/lttng-types.h
@@ -6,7 +6,8 @@
 #define _LTTNG_PROBES_LTTNG_TYPES_H
 
 #include <linux/seq_file.h>
-#include <lttng.h>
+#include "lttng.h"
+#include "../ltt-events.h"
 
 #ifdef __KERNEL__
 # include <asm/byteorder.h>
@@ -27,61 +28,6 @@
 # include <endian.h>
 #endif
 
-/* Update the astract_types name table in lttng-types.c along with this enum */
-enum abstract_types {
-       atype_integer,
-       atype_enum,
-       atype_array,
-       atype_sequence,
-       atype_string,
-       NR_ABSTRACT_TYPES,
-};
-
-/* Update the string_encodings name table in lttng-types.c along with this enum */
-enum lttng_string_encodings {
-       lttng_encode_UTF8 = 0,
-       lttng_encode_ASCII = 1,
-       NR_STRING_ENCODINGS,
-};
-
-struct lttng_enum_entry {
-       unsigned long long start, end;  /* start and end are inclusive */
-       const char *string;
-};
-
-struct lttng_enum {
-       const struct lttng_enum_entry *entries;
-       unsigned int len;
-};
-
-struct lttng_type {
-       enum abstract_types atype;
-       const char *name;
-       union {
-               struct {
-                       unsigned int size;              /* in bits */
-                       unsigned short alignment;       /* in bits */
-                       unsigned int signedness:1;
-                       unsigned int reverse_byte_order:1;
-               } integer;
-               struct {
-                       const char *parent_type;
-                       const struct lttng_enum def;
-               } enumeration;
-               struct {
-                       const char *elem_type;
-                       unsigned int length;            /* num. elems. */
-               } array;
-               struct {
-                       const char *elem_type;
-                       const char *length_type;
-               } sequence;
-               struct {
-                       enum lttng_string_encodings encoding;
-               } string;
-       } u;
-} __attribute__((packed));
-
 void lttng_print_event_type(struct seq_file *m, unsigned int indent,
                            const struct lttng_type *type);