Hide new bt_ctf_event_* symbols

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index b1b98b1f726ac65a498fc8b7a3c79693faec7b6d..f16a360beb9a3c06b7546a5676d998cc405b8817 100644 (file)
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -244,6 +244,7 @@ error:
        return event;
 }
 
        return event;
 }
 

+BT_HIDDEN

 struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
 {
        struct bt_ctf_event_class *event_class = NULL;
 struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
 {
        struct bt_ctf_event_class *event_class = NULL;


@@ -258,6 +259,7 @@ end:
        return event_class;
 }
 
        return event_class;
 }
 

+BT_HIDDEN

 struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event)
 {
        struct bt_ctf_stream *stream = NULL;
 struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event)
 {
        struct bt_ctf_stream *stream = NULL;


@@ -283,6 +285,7 @@ end:
        return stream;
 }
 
        return stream;
 }
 

+BT_HIDDEN

 struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
 {
        struct bt_ctf_clock *clock = NULL;
 struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
 {
        struct bt_ctf_clock *clock = NULL;


@@ -350,6 +353,7 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+BT_HIDDEN

 struct bt_ctf_field *bt_ctf_event_get_payload_field(struct bt_ctf_event *event)
 {
        struct bt_ctf_field *payload = NULL;
 struct bt_ctf_field *bt_ctf_event_get_payload_field(struct bt_ctf_event *event)
 {
        struct bt_ctf_field *payload = NULL;


@@ -364,6 +368,7 @@ end:
        return payload;
 }
 
        return payload;
 }
 

+BT_HIDDEN

 int bt_ctf_event_set_payload_field(struct bt_ctf_event *event,
                struct bt_ctf_field *payload)
 {
 int bt_ctf_event_set_payload_field(struct bt_ctf_event *event,
                struct bt_ctf_field *payload)
 {


@@ -416,6 +421,7 @@ end:
        return field;
 }
 
        return field;
 }
 

+BT_HIDDEN

 struct bt_ctf_field *bt_ctf_event_get_payload_by_index(
                struct bt_ctf_event *event, int index)
 {
 struct bt_ctf_field *bt_ctf_event_get_payload_by_index(
                struct bt_ctf_event *event, int index)
 {


@@ -431,6 +437,7 @@ end:
        return field;
 }
 
        return field;
 }
 

+BT_HIDDEN

 struct bt_ctf_field *bt_ctf_event_get_header(
                struct bt_ctf_event *event)
 {
 struct bt_ctf_field *bt_ctf_event_get_header(
                struct bt_ctf_event *event)
 {


@@ -446,6 +453,7 @@ end:
        return header;
 }
 
        return header;
 }
 

+BT_HIDDEN

 int bt_ctf_event_set_header(struct bt_ctf_event *event,
                struct bt_ctf_field *header)
 {
 int bt_ctf_event_set_header(struct bt_ctf_event *event,
                struct bt_ctf_field *header)
 {


@@ -480,6 +488,7 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+BT_HIDDEN

 struct bt_ctf_field *bt_ctf_event_get_event_context(
                struct bt_ctf_event *event)
 {
 struct bt_ctf_field *bt_ctf_event_get_event_context(
                struct bt_ctf_event *event)
 {


@@ -495,6 +504,7 @@ end:
        return context;
 }
 
        return context;
 }
 

+BT_HIDDEN

 int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
                struct bt_ctf_field *context)
 {
 int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
                struct bt_ctf_field *context)
 {


@@ -521,6 +531,7 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+BT_HIDDEN

 struct bt_ctf_field *bt_ctf_event_get_stream_event_context(
                struct bt_ctf_event *event)
 {
 struct bt_ctf_field *bt_ctf_event_get_stream_event_context(
                struct bt_ctf_event *event)
 {


@@ -535,6 +546,7 @@ end:
        return bt_get(stream_event_context);
 }
 
        return bt_get(stream_event_context);
 }
 

+BT_HIDDEN

 int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event,
                struct bt_ctf_field *stream_event_context)
 {
 int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event,
                struct bt_ctf_field *stream_event_context)
 {


@@ -763,6 +775,7 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+BT_HIDDEN

 int bt_ctf_event_set_packet(struct bt_ctf_event *event,
                struct bt_ctf_packet *packet)
 {
 int bt_ctf_event_set_packet(struct bt_ctf_event *event,
                struct bt_ctf_packet *packet)
 {


@@ -858,6 +871,7 @@ int bt_ctf_event_register_stream_clock_values(struct bt_ctf_event *event)
        return ret;
 }
 
        return ret;
 }
 

+BT_HIDDEN

 uint64_t bt_ctf_event_get_clock_value(struct bt_ctf_event *event,
                struct bt_ctf_clock *clock)
 {
 uint64_t bt_ctf_event_get_clock_value(struct bt_ctf_event *event,
                struct bt_ctf_clock *clock)
 {

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index cc10f224015034a9bb9484b91f3b82dba6814608..cdbaef107719adc437a1c2f7132980e4d1d42c39 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -75,4 +75,159 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event);
 BT_HIDDEN
 void bt_ctf_event_freeze(struct bt_ctf_event *event);
 
 BT_HIDDEN
 void bt_ctf_event_freeze(struct bt_ctf_event *event);
 

+/*
+ * bt_ctf_event_get_class: get an event's class.
+ *
+ * @param event Event.
+ *
+ * Returns the event's class, NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event);
+
+/*
+ * bt_ctf_event_get_stream: get an event's associated stream.
+ *
+ * @param event Event.
+ *
+ * Returns the event's associated stream, NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event);
+
+/*
+ * bt_ctf_event_get_clock: get an event's associated clock.
+ *
+ * @param event Event.
+ *
+ * Returns the event's clock, NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event);
+
+/*
+ * bt_ctf_event_get_payload_field: get an event's payload.
+ *
+ * @param event Event instance.
+ *
+ * Returns a field instance on success, NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_field *bt_ctf_event_get_payload_field(struct bt_ctf_event *event);
+
+/*
+ * bt_ctf_event_set_payload_field: set an event's payload.
+ *
+ * @param event Event instance.
+ * @param payload Field instance (must be a structure).
+ *
+ * Returns 0 on success, a negative value on error.
+ */
+BT_HIDDEN
+int bt_ctf_event_set_payload_field(struct bt_ctf_event *event,
+               struct bt_ctf_field *payload);
+
+/*
+ * bt_ctf_event_get_payload_by_index: Get event's field by index.
+ *
+ * Returns the field associated with the provided index. bt_ctf_field_put()
+ * must be called on the returned value. The indexes to be provided are
+ * the same as can be retrieved from the event class.
+ *
+ * @param event Event.
+ * @param index Index of field.
+ *
+ * Returns the event's field, NULL on error.
+ *
+ * Note: Will return an error if the payload's type is not a structure.
+ */
+BT_HIDDEN
+struct bt_ctf_field *bt_ctf_event_get_payload_by_index(
+               struct bt_ctf_event *event, int index);
+
+/*
+ * bt_ctf_event_get_header: get an event's header.
+ *
+ * @param event Event instance.
+ *
+ * Returns a field instance on success, NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_field *bt_ctf_event_get_header(struct bt_ctf_event *event);
+
+/*
+ * bt_ctf_event_get_event_context: Get an event's context
+ *
+ * @param event_class Event class.
+ *
+ * Returns a field on success (a structure), NULL on error.
+ *
+ * Note: This function is named this way instead of the expected
+ * "bt_ctf_event_get_context" in order to work around a name clash with
+ * an unrelated function bearing this name in context.h.
+ */
+BT_HIDDEN
+struct bt_ctf_field *bt_ctf_event_get_event_context(struct bt_ctf_event *event);
+
+/*
+ * bt_ctf_event_get_stream_event_context: Get an event's stream event context
+ *
+ * @param event_class Event class.
+ *
+ * Returns a field on success (a structure), NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_field *bt_ctf_event_get_stream_event_context(
+               struct bt_ctf_event *event);
+
+BT_HIDDEN
+uint64_t bt_ctf_event_get_clock_value(struct bt_ctf_event *event,
+               struct bt_ctf_clock *clock);
+
+/*
+ * bt_ctf_event_set_header: set an event's header.
+ *
+ * The event header's type must match the stream class' event
+ * header type.
+ *
+ * @param event Event instance.
+ * @param header Event header field instance.
+ *
+ * Returns a field instance on success, NULL on error.
+ */
+BT_HIDDEN
+int bt_ctf_event_set_header(
+               struct bt_ctf_event *event,
+               struct bt_ctf_field *header);
+
+/*
+ * bt_ctf_event_set_event_context: Set an event's context
+ *
+ * @param event Event.
+ * @param context Event context field (must match the event class'
+ *     context type).
+ *
+ * Returns 0 on success, a negative value on error.
+ */
+BT_HIDDEN
+int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
+               struct bt_ctf_field *context);
+
+/*
+ * bt_ctf_event_set_stream_event_context: Set an event's stream event context
+ *
+ * @param event Event.
+ * @param context Event stream context field (must match the stream class'
+ *     stream event context type).
+ *
+ * Returns 0 on success, a negative value on error.
+ */
+BT_HIDDEN
+int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event,
+               struct bt_ctf_field *context);
+
+BT_HIDDEN
+int bt_ctf_event_set_packet(struct bt_ctf_event *event,
+               struct bt_ctf_packet *packet);
+

 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */
 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */

diff --git a/include/babeltrace/ctf-ir/event.h b/include/babeltrace/ctf-ir/event.h
index 840627eaa1745ae02710e43fc6710ddd505b47e1..21db6bc7a4e9a9a03c939469cfdd61e579b7bba3 100644 (file)
--- a/include/babeltrace/ctf-ir/event.h
+++ b/include/babeltrace/ctf-ir/event.h
@@ -32,7 +32,6 @@
 
 #include <stdint.h>
 #include <stddef.h>
 
 #include <stdint.h>
 #include <stddef.h>

-#include <babeltrace/values.h>

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -62,57 +61,6 @@ struct bt_ctf_packet;
 extern struct bt_ctf_event *bt_ctf_event_create(
                struct bt_ctf_event_class *event_class);
 
 extern struct bt_ctf_event *bt_ctf_event_create(
                struct bt_ctf_event_class *event_class);
 

-/*
- * bt_ctf_event_get_class: get an event's class.
- *
- * @param event Event.
- *
- * Returns the event's class, NULL on error.
- */
-extern struct bt_ctf_event_class *bt_ctf_event_get_class(
-               struct bt_ctf_event *event);
-
-/*
- * bt_ctf_event_get_stream: get an event's associated stream.
- *
- * @param event Event.
- *
- * Returns the event's associated stream, NULL on error.
- */
-extern struct bt_ctf_stream *bt_ctf_event_get_stream(
-               struct bt_ctf_event *event);
-
-/*
- * bt_ctf_event_get_clock: get an event's associated clock.
- *
- * @param event Event.
- *
- * Returns the event's clock, NULL on error.
- */
-extern struct bt_ctf_clock *bt_ctf_event_get_clock(
-               struct bt_ctf_event *event);
-
-/*
- * bt_ctf_event_get_payload_field: get an event's payload.
- *
- * @param event Event instance.
- *
- * Returns a field instance on success, NULL on error.
- */
-extern struct bt_ctf_field *bt_ctf_event_get_payload_field(
-               struct bt_ctf_event *event);
-
-/*
- * bt_ctf_event_set_payload_field: set an event's payload.
- *
- * @param event Event instance.
- * @param payload Field instance (must be a structure).
- *
- * Returns 0 on success, a negative value on error.
- */
-extern int bt_ctf_event_set_payload_field(struct bt_ctf_event *event,
-               struct bt_ctf_field *payload);
-

 /*
  * bt_ctf_event_get_payload: get an event's field.
  *
 /*
  * bt_ctf_event_get_payload: get an event's field.
  *


@@ -152,102 +100,6 @@ extern int bt_ctf_event_set_payload(struct bt_ctf_event *event,
                const char *name,
                struct bt_ctf_field *value);
 
                const char *name,
                struct bt_ctf_field *value);
 

-/*
- * bt_ctf_event_get_payload_by_index: Get event's field by index.
- *
- * Returns the field associated with the provided index. bt_ctf_field_put()
- * must be called on the returned value. The indexes to be provided are
- * the same as can be retrieved from the event class.
- *
- * @param event Event.
- * @param index Index of field.
- *
- * Returns the event's field, NULL on error.
- *
- * Note: Will return an error if the payload's type is not a structure.
- */
-extern struct bt_ctf_field *bt_ctf_event_get_payload_by_index(
-               struct bt_ctf_event *event, int index);
-
-/*
- * bt_ctf_event_get_header: get an event's header.
- *
- * @param event Event instance.
- *
- * Returns a field instance on success, NULL on error.
- */
-extern struct bt_ctf_field *bt_ctf_event_get_header(
-               struct bt_ctf_event *event);
-
-/*
- * bt_ctf_event_set_header: set an event's header.
- *
- * The event header's type must match the stream class' event
- * header type.
- *
- * @param event Event instance.
- * @param header Event header field instance.
- *
- * Returns a field instance on success, NULL on error.
- */
-extern int bt_ctf_event_set_header(
-               struct bt_ctf_event *event,
-               struct bt_ctf_field *header);
-
-/*
- * bt_ctf_event_get_event_context: Get an event's context
- *
- * @param event_class Event class.
- *
- * Returns a field on success (a structure), NULL on error.
- *
- * Note: This function is named this way instead of the expected
- * "bt_ctf_event_get_context" in order to work around a name clash with
- * an unrelated function bearing this name in context.h.
- */
-extern struct bt_ctf_field *bt_ctf_event_get_event_context(
-               struct bt_ctf_event *event);
-
-/*
- * bt_ctf_event_set_event_context: Set an event's context
- *
- * @param event Event.
- * @param context Event context field (must match the event class'
- *     context type).
- *
- * Returns 0 on success, a negative value on error.
- */
-extern int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
-               struct bt_ctf_field *context);
-
-/*
- * bt_ctf_event_get_stream_event_context: Get an event's stream event context
- *
- * @param event_class Event class.
- *
- * Returns a field on success (a structure), NULL on error.
- */
-extern struct bt_ctf_field *bt_ctf_event_get_stream_event_context(
-               struct bt_ctf_event *event);
-
-/*
- * bt_ctf_event_set_stream_event_context: Set an event's stream event context
- *
- * @param event Event.
- * @param context Event stream context field (must match the stream class'
- *     stream event context type).
- *
- * Returns 0 on success, a negative value on error.
- */
-extern int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event,
-               struct bt_ctf_field *context);
-
-extern int bt_ctf_event_set_packet(struct bt_ctf_event *event,
-               struct bt_ctf_packet *packet);
-
-extern uint64_t bt_ctf_event_get_clock_value(struct bt_ctf_event *event,
-               struct bt_ctf_clock *clock);
-

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif