Hide new bt_ctf_stream_* symbols
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 24 Oct 2016 01:17:26 +0000 (21:17 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 24 Oct 2016 17:25:31 +0000 (13:25 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
formats/ctf/ir/stream.c
include/Makefile.am
include/babeltrace/ctf-ir/stream-internal.h
include/babeltrace/ctf-ir/stream.h [deleted file]
include/babeltrace/ctf-writer/stream.h

index 56abfcea5f89fe1f78f47241428fcc20d3688361..c757be71a0b40f62e079483d7a28a3357d7edf4b 100644 (file)
@@ -633,6 +633,7 @@ end:
        return packet_context;
 }
 
+BT_HIDDEN
 int bt_ctf_stream_set_packet_context(struct bt_ctf_stream *stream,
                struct bt_ctf_field *field)
 {
@@ -659,6 +660,7 @@ end:
        return ret;
 }
 
+BT_HIDDEN
 struct bt_ctf_field *bt_ctf_stream_get_packet_header(
                struct bt_ctf_stream *stream)
 {
@@ -676,6 +678,7 @@ end:
        return packet_header;
 }
 
+BT_HIDDEN
 int bt_ctf_stream_set_packet_header(struct bt_ctf_stream *stream,
                struct bt_ctf_field *field)
 {
@@ -996,6 +999,7 @@ end:
        return ret;
 }
 
+BT_HIDDEN
 const char *bt_ctf_stream_get_name(struct bt_ctf_stream *stream)
 {
        const char *name = NULL;
index 441d3ba51030b5706d04520550210d764820634b..02141d4b772b102bb68c3cd415a2bdc03dd82cab 100644 (file)
@@ -27,7 +27,6 @@ babeltracectfirinclude_HEADERS = \
        babeltrace/ctf-ir/field-types.h \
        babeltrace/ctf-ir/event.h \
        babeltrace/ctf-ir/event-class.h \
-       babeltrace/ctf-ir/stream.h \
        babeltrace/ctf-ir/stream-class.h \
        babeltrace/ctf-ir/trace.h \
        babeltrace/ctf-ir/utils.h
index dc392f4ad907fce01be034de6d089e7360aa1788..d7d77e6b761d867cfd4799ab91dfdc2ae9b9e896 100644 (file)
@@ -57,4 +57,81 @@ BT_HIDDEN
 void bt_ctf_stream_update_clock_value(struct bt_ctf_stream *stream,
                struct bt_ctf_field *value_field);
 
+BT_HIDDEN
+const char *bt_ctf_stream_get_name(struct bt_ctf_stream *stream);
+
+BT_HIDDEN
+struct bt_ctf_stream *bt_ctf_stream_create(
+               struct bt_ctf_stream_class *stream_class,
+               const char *name);
+
+/*
+ * bt_ctf_stream_get_discarded_events_count: get the number of discarded
+ * events associated with this stream.
+ *
+ * Note that discarded events are not stored if the stream's packet
+ * context has no "events_discarded" field. An error will be returned
+ * in that case.
+ *
+ * @param stream Stream instance.
+ *
+ * Returns the number of discarded events, a negative value on error.
+ */
+BT_HIDDEN
+int bt_ctf_stream_get_discarded_events_count(
+               struct bt_ctf_stream *stream, uint64_t *count);
+
+/*
+ * bt_ctf_stream_get_stream_class: get a stream's class.
+ *
+ * @param stream Stream instance.
+ *
+ * Returns the stream's class, NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_stream_class *bt_ctf_stream_get_class(
+               struct bt_ctf_stream *stream);
+
+/*
+ * bt_ctf_stream_get_packet_header: get a stream's packet header.
+ *
+ * @param stream Stream instance.
+ *
+ * Returns a field instance on success, NULL on error.
+ */
+BT_HIDDEN
+struct bt_ctf_field *bt_ctf_stream_get_packet_header(
+               struct bt_ctf_stream *stream);
+
+/*
+ * bt_ctf_stream_set_packet_header: set a stream's packet header.
+ *
+ * The packet header's type must match the trace's packet header
+ * type.
+ *
+ * @param stream Stream instance.
+ * @param packet_header Packet header instance.
+ *
+ * Returns a field instance on success, NULL on error.
+ */
+BT_HIDDEN
+int bt_ctf_stream_set_packet_header(struct bt_ctf_stream *stream,
+               struct bt_ctf_field *packet_header);
+
+/*
+ * bt_ctf_stream_set_packet_context: set a stream's packet context.
+ *
+ * The packet context's type must match the stream class' packet
+ * context type.
+ *
+ * @param stream Stream instance.
+ * @param packet_context Packet context field instance.
+ *
+ * Returns a field instance on success, NULL on error.
+ */
+BT_HIDDEN
+int bt_ctf_stream_set_packet_context(struct bt_ctf_stream *stream,
+               struct bt_ctf_field *packet_context);
+
+
 #endif /* BABELTRACE_CTF_WRITER_STREAM_INTERNAL_H */
diff --git a/include/babeltrace/ctf-ir/stream.h b/include/babeltrace/ctf-ir/stream.h
deleted file mode 100644 (file)
index a08e327..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef BABELTRACE_CTF_IR_STREAM_H
-#define BABELTRACE_CTF_IR_STREAM_H
-
-/*
- * BabelTrace - CTF IR: Stream
- *
- * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * The Common Trace Format (CTF) Specification is available at
- * http://www.efficios.com/ctf
- */
-
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_ctf_event;
-struct bt_ctf_stream;
-
-extern struct bt_ctf_stream *bt_ctf_stream_create(
-               struct bt_ctf_stream_class *stream_class,
-               const char *name);
-
-extern const char *bt_ctf_stream_get_name(struct bt_ctf_stream *stream);
-
-/*
- * bt_ctf_stream_get_stream_class: get a stream's class.
- *
- * @param stream Stream instance.
- *
- * Returns the stream's class, NULL on error.
- */
-extern struct bt_ctf_stream_class *bt_ctf_stream_get_class(
-               struct bt_ctf_stream *stream);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_CTF_IR_STREAM_H */
index f8ad7b835b600e18755bee789af89066663cb9b9..73515b90ec6704247a9410deb5b0d679b0f85bc0 100644 (file)
 extern "C" {
 #endif
 
-/*
- * bt_ctf_stream_get_discarded_events_count: get the number of discarded
- * events associated with this stream.
- *
- * Note that discarded events are not stored if the stream's packet
- * context has no "events_discarded" field. An error will be returned
- * in that case.
- *
- * @param stream Stream instance.
- *
- * Returns the number of discarded events, a negative value on error.
- */
-extern int bt_ctf_stream_get_discarded_events_count(
-               struct bt_ctf_stream *stream, uint64_t *count);
-
 /*
  * bt_ctf_stream_append_discarded_events: increment discarded events count.
  *
@@ -85,31 +70,6 @@ extern void bt_ctf_stream_append_discarded_events(struct bt_ctf_stream *stream,
 extern int bt_ctf_stream_append_event(struct bt_ctf_stream *stream,
                struct bt_ctf_event *event);
 
-/*
- * bt_ctf_stream_get_packet_header: get a stream's packet header.
- *
- * @param stream Stream instance.
- *
- * Returns a field instance on success, NULL on error.
- */
-extern struct bt_ctf_field *bt_ctf_stream_get_packet_header(
-               struct bt_ctf_stream *stream);
-
-/*
- * bt_ctf_stream_set_packet_header: set a stream's packet header.
- *
- * The packet header's type must match the trace's packet header
- * type.
- *
- * @param stream Stream instance.
- * @param packet_header Packet header instance.
- *
- * Returns a field instance on success, NULL on error.
- */
-extern int bt_ctf_stream_set_packet_header(
-               struct bt_ctf_stream *stream,
-               struct bt_ctf_field *packet_header);
-
 /*
  * bt_ctf_stream_get_packet_context: get a stream's packet context.
  *
@@ -120,21 +80,6 @@ extern int bt_ctf_stream_set_packet_header(
 extern struct bt_ctf_field *bt_ctf_stream_get_packet_context(
                struct bt_ctf_stream *stream);
 
-/*
- * bt_ctf_stream_set_packet_context: set a stream's packet context.
- *
- * The packet context's type must match the stream class' packet
- * context type.
- *
- * @param stream Stream instance.
- * @param packet_context Packet context field instance.
- *
- * Returns a field instance on success, NULL on error.
- */
-extern int bt_ctf_stream_set_packet_context(
-               struct bt_ctf_stream *stream,
-               struct bt_ctf_field *packet_context);
-
 /*
  * bt_ctf_stream_flush: flush a stream.
  *
This page took 0.02904 seconds and 4 git commands to generate.