From 0f757a272cd66d39c91a4c7bdb54fcab9fab96c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Sun, 23 Oct 2016 21:12:19 -0400 Subject: [PATCH] Hide new bt_ctf_stream_class_* symbols MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- formats/ctf/ir/stream-class.c | 13 ++ .../babeltrace/ctf-ir/stream-class-internal.h | 187 ++++++++++++++++++ include/babeltrace/ctf-ir/stream-class.h | 174 ---------------- 3 files changed, 200 insertions(+), 174 deletions(-) diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c index 326e759e..bdd9c13c 100644 --- a/formats/ctf/ir/stream-class.c +++ b/formats/ctf/ir/stream-class.c @@ -89,6 +89,7 @@ error: return stream_class; } +BT_HIDDEN struct bt_ctf_trace *bt_ctf_stream_class_get_trace( struct bt_ctf_stream_class *stream_class) { @@ -96,6 +97,7 @@ struct bt_ctf_trace *bt_ctf_stream_class_get_trace( stream_class); } +BT_HIDDEN const char *bt_ctf_stream_class_get_name( struct bt_ctf_stream_class *stream_class) { @@ -110,6 +112,7 @@ end: return name; } +BT_HIDDEN int bt_ctf_stream_class_set_name(struct bt_ctf_stream_class *stream_class, const char *name) { @@ -125,6 +128,7 @@ end: return ret; } +BT_HIDDEN struct bt_ctf_clock *bt_ctf_stream_class_get_clock( struct bt_ctf_stream_class *stream_class) { @@ -188,6 +192,7 @@ end: return ret; } +BT_HIDDEN int64_t bt_ctf_stream_class_get_id(struct bt_ctf_stream_class *stream_class) { int64_t ret; @@ -475,6 +480,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_stream_class_get_event_class_count( struct bt_ctf_stream_class *stream_class) { @@ -490,6 +496,7 @@ end: return ret; } +BT_HIDDEN struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class( struct bt_ctf_stream_class *stream_class, int index) { @@ -506,6 +513,7 @@ end: return event_class; } +BT_HIDDEN struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_name( struct bt_ctf_stream_class *stream_class, const char *name) { @@ -532,6 +540,7 @@ end: return event_class; } +BT_HIDDEN struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id( struct bt_ctf_stream_class *stream_class, uint32_t id) { @@ -601,6 +610,7 @@ end: return ret; } +BT_HIDDEN struct bt_ctf_field_type *bt_ctf_stream_class_get_event_header_type( struct bt_ctf_stream_class *stream_class) { @@ -617,6 +627,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_stream_class_set_event_header_type( struct bt_ctf_stream_class *stream_class, struct bt_ctf_field_type *event_header_type) @@ -646,6 +657,7 @@ end: return ret; } +BT_HIDDEN struct bt_ctf_field_type *bt_ctf_stream_class_get_event_context_type( struct bt_ctf_stream_class *stream_class) { @@ -662,6 +674,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_stream_class_set_event_context_type( struct bt_ctf_stream_class *stream_class, struct bt_ctf_field_type *event_context_type) diff --git a/include/babeltrace/ctf-ir/stream-class-internal.h b/include/babeltrace/ctf-ir/stream-class-internal.h index 1bd1ea18..37b11e40 100644 --- a/include/babeltrace/ctf-ir/stream-class-internal.h +++ b/include/babeltrace/ctf-ir/stream-class-internal.h @@ -79,4 +79,191 @@ BT_HIDDEN int bt_ctf_stream_class_set_id_no_check( struct bt_ctf_stream_class *stream_class, uint32_t id); +/* + * bt_ctf_stream_class_get_trace: Get a stream class' associated trace. + * + * @param stream_class Stream class. + * + * Returns the stream class' associated trace, NULL on error. + */ +BT_HIDDEN +struct bt_ctf_trace *bt_ctf_stream_class_get_trace( + struct bt_ctf_stream_class *stream_class); + +/* + * bt_ctf_stream_class_get_name: Get a stream class' name. + * + * @param stream_class Stream class. + * + * Returns the stream class' name, NULL on error. + */ +BT_HIDDEN +const char *bt_ctf_stream_class_get_name( + struct bt_ctf_stream_class *stream_class); + +/* + * bt_ctf_stream_class_set_name: Set a stream class' name. + * + * @param stream_class Stream class. + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_stream_class_set_name(struct bt_ctf_stream_class *stream_class, + const char *name); + +/* + * bt_ctf_stream_class_get_clock: get the clock associated with a stream class. + * + * @param stream_class Stream class. + * + * Returns a clock instance, NULL on error. + */ +BT_HIDDEN +struct bt_ctf_clock *bt_ctf_stream_class_get_clock( + struct bt_ctf_stream_class *stream_class); + +/* + * bt_ctf_stream_class_get_id: Get a stream class' id. + * + * @param stream_class Stream class. + * + * Returns the stream class' id, a negative value on error. + */ +BT_HIDDEN +int64_t bt_ctf_stream_class_get_id( + struct bt_ctf_stream_class *stream_class); + +/* + * bt_ctf_stream_class_set_id: Set a stream class' id. + * + * Set a stream class' id. Must be unique trace-wise. + * Note that stream classes are assigned a unique id when a stream instance + * is created for the first time from a trace or writer. + * + * @param stream_class Stream class. + * @param id Stream class id. + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class, + uint32_t id); + +/* + * bt_ctf_stream_class_get_event_class_count: Get a stream class' event class + * count. + * + * @param stream_class Stream class. + * + * Returns the stream class' event count, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_stream_class_get_event_class_count( + struct bt_ctf_stream_class *stream_class); + +/* + * bt_ctf_stream_class_get_event_class: Get stream class event class by index. + * + * @param stream_class Stream class. + * @param index Index of field. + * + * Returns event class, NULL on error. + */ +BT_HIDDEN +struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class( + struct bt_ctf_stream_class *stream_class, int index); + +/* + * bt_ctf_stream_class_get_event_class_by_name: Get stream class event class by + * name. + * + * @param stream_class Stream class. + * @param name Event name. + * + * Returns event class, NULL on error. + */ +BT_HIDDEN +struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_name( + struct bt_ctf_stream_class *stream_class, const char *name); + +/* + * bt_ctf_stream_class_get_event_class_by_name: Get stream class event class by + * ID. + * + * @param stream_class Stream class. + * @param id Event class ID. + * + * Returns event class, NULL on error. + */ +BT_HIDDEN +struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id( + struct bt_ctf_stream_class *stream_class, uint32_t id); + +/* + * bt_ctf_stream_class_set_packet_context_type: set the stream class' packet + * context type. + * + * @param stream_class Stream class. + * @param packet_context_type Packet context type (must be a structure). + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_stream_class_set_packet_context_type( + struct bt_ctf_stream_class *stream_class, + struct bt_ctf_field_type *packet_context_type); + +/* + * bt_ctf_stream_class_get_event_header_type: get the stream class' + * event header type. + * + * @param stream_class Stream class. + * + * Returns the stream event header's type (a structure), NULL on error. + */ +BT_HIDDEN +struct bt_ctf_field_type *bt_ctf_stream_class_get_event_header_type( + struct bt_ctf_stream_class *stream_class); + +/* + * bt_ctf_stream_class_set_event_header_type: set the stream class' + * event header type. + * + * @param stream_class Stream class. + * @param event_header_type Event header type (must be a structure). + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_stream_class_set_event_header_type( + struct bt_ctf_stream_class *stream_class, + struct bt_ctf_field_type *event_header_type); + +/* + * bt_ctf_stream_class_get_event_context_type: get the stream class' + * event context type. + * + * @param stream_class Stream class. + * + * Returns the stream event context's type (a structure), NULL on error. + */ +BT_HIDDEN +struct bt_ctf_field_type *bt_ctf_stream_class_get_event_context_type( + struct bt_ctf_stream_class *stream_class); + +/* + * bt_ctf_stream_class_set_event_context_type: set the stream class' + * event context type. + * + * @param stream_class Stream class. + * @param event_context_type Event context type (must be a structure). + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_stream_class_set_event_context_type( + struct bt_ctf_stream_class *stream_class, + struct bt_ctf_field_type *event_context_type); + #endif /* BABELTRACE_CTF_IR_STREAM_CLASS_INTERNAL_H */ diff --git a/include/babeltrace/ctf-ir/stream-class.h b/include/babeltrace/ctf-ir/stream-class.h index 433fc563..5ec3366b 100644 --- a/include/babeltrace/ctf-ir/stream-class.h +++ b/include/babeltrace/ctf-ir/stream-class.h @@ -65,71 +65,6 @@ struct bt_ctf_clock; */ extern struct bt_ctf_stream_class *bt_ctf_stream_class_create(const char *name); -/* - * bt_ctf_stream_class_get_trace: Get a stream class' associated trace. - * - * @param stream_class Stream class. - * - * Returns the stream class' associated trace, NULL on error. - */ -extern struct bt_ctf_trace *bt_ctf_stream_class_get_trace( - struct bt_ctf_stream_class *stream_class); - -/* - * bt_ctf_stream_class_get_name: Get a stream class' name. - * - * @param stream_class Stream class. - * - * Returns the stream class' name, NULL on error. - */ -extern const char *bt_ctf_stream_class_get_name( - struct bt_ctf_stream_class *stream_class); - -/* - * bt_ctf_stream_class_set_name: Set a stream class' name. - * - * @param stream_class Stream class. - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_stream_class_set_name( - struct bt_ctf_stream_class *stream_class, const char *name); - -/* - * bt_ctf_stream_class_get_clock: get the clock associated with a stream class. - * - * @param stream_class Stream class. - * - * Returns a clock instance, NULL on error. - */ -extern struct bt_ctf_clock *bt_ctf_stream_class_get_clock( - struct bt_ctf_stream_class *stream_class); - -/* - * bt_ctf_stream_class_get_id: Get a stream class' id. - * - * @param stream_class Stream class. - * - * Returns the stream class' id, a negative value on error. - */ -extern int64_t bt_ctf_stream_class_get_id( - struct bt_ctf_stream_class *stream_class); - -/* - * bt_ctf_stream_class_set_id: Set a stream class' id. - * - * Set a stream class' id. Must be unique trace-wise. - * Note that stream classes are assigned a unique id when a stream instance - * is created for the first time from a trace or writer. - * - * @param stream_class Stream class. - * @param id Stream class id. - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_stream_class_set_id( - struct bt_ctf_stream_class *stream_class, uint32_t id); - /* * bt_ctf_stream_class_set_clock: assign a clock to a stream class. * @@ -151,52 +86,6 @@ extern int bt_ctf_stream_class_add_event_class( struct bt_ctf_stream_class *stream_class, struct bt_ctf_event_class *event_class); -/* - * bt_ctf_stream_class_get_event_class_count: Get a stream class' event class - * count. - * - * @param stream_class Stream class. - * - * Returns the stream class' event count, a negative value on error. - */ -extern int bt_ctf_stream_class_get_event_class_count( - struct bt_ctf_stream_class *stream_class); - -/* - * bt_ctf_stream_class_get_event_class: Get stream class event class by index. - * - * @param stream_class Stream class. - * @param index Index of field. - * - * Returns event class, NULL on error. - */ -extern struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class( - struct bt_ctf_stream_class *stream_class, int index); - -/* - * bt_ctf_stream_class_get_event_class_by_name: Get stream class event class by - * name. - * - * @param stream_class Stream class. - * @param name Event name. - * - * Returns event class, NULL on error. - */ -extern struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_name( - struct bt_ctf_stream_class *stream_class, const char *name); - -/* - * bt_ctf_stream_class_get_event_class_by_name: Get stream class event class by - * ID. - * - * @param stream_class Stream class. - * @param id Event class ID. - * - * Returns event class, NULL on error. - */ -extern struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id( - struct bt_ctf_stream_class *stream_class, uint32_t id); - /* * bt_ctf_stream_class_get_packet_context_type: get the stream class' packet * context type. @@ -208,69 +97,6 @@ extern struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id( extern struct bt_ctf_field_type *bt_ctf_stream_class_get_packet_context_type( struct bt_ctf_stream_class *stream_class); -/* - * bt_ctf_stream_class_set_packet_context_type: set the stream class' packet - * context type. - * - * @param stream_class Stream class. - * @param packet_context_type Packet context type (must be a structure). - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_stream_class_set_packet_context_type( - struct bt_ctf_stream_class *stream_class, - struct bt_ctf_field_type *packet_context_type); - -/* - * bt_ctf_stream_class_get_event_header_type: get the stream class' - * event header type. - * - * @param stream_class Stream class. - * - * Returns the stream event header's type (a structure), NULL on error. - */ -extern struct bt_ctf_field_type * -bt_ctf_stream_class_get_event_header_type( - struct bt_ctf_stream_class *stream_class); - -/* - * bt_ctf_stream_class_set_event_header_type: set the stream class' - * event header type. - * - * @param stream_class Stream class. - * @param event_header_type Event header type (must be a structure). - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_stream_class_set_event_header_type( - struct bt_ctf_stream_class *stream_class, - struct bt_ctf_field_type *event_header_type); - -/* - * bt_ctf_stream_class_get_event_context_type: get the stream class' - * event context type. - * - * @param stream_class Stream class. - * - * Returns the stream event context's type (a structure), NULL on error. - */ -extern struct bt_ctf_field_type * -bt_ctf_stream_class_get_event_context_type( - struct bt_ctf_stream_class *stream_class); - -/* - * bt_ctf_stream_class_set_event_context_type: set the stream class' - * event context type. - * - * @param stream_class Stream class. - * @param event_context_type Event context type (must be a structure). - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_stream_class_set_event_context_type( - struct bt_ctf_stream_class *stream_class, - struct bt_ctf_field_type *event_context_type); - #ifdef __cplusplus } #endif -- 2.34.1