From 989230347c35745e860f3b7cacf7a7253642cb75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Sun, 23 Oct 2016 15:02:50 -0400 Subject: [PATCH] Hide new bt_ctf_clock_* 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/clock.c | 14 +++ formats/ctf/ir/event.c | 1 + include/babeltrace/ctf-ir/clock-internal.h | 129 +++++++++++++++++++++ include/babeltrace/ctf-ir/clock.h | 108 +---------------- include/babeltrace/ctf-writer/clock.h | 18 --- 5 files changed, 148 insertions(+), 122 deletions(-) diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c index 9256bc1f..67a96010 100644 --- a/formats/ctf/ir/clock.c +++ b/formats/ctf/ir/clock.c @@ -113,6 +113,7 @@ error: return clock; } +BT_HIDDEN const char *bt_ctf_clock_get_name(struct bt_ctf_clock *clock) { const char *ret = NULL; @@ -129,6 +130,7 @@ end: return ret; } +BT_HIDDEN const char *bt_ctf_clock_get_description(struct bt_ctf_clock *clock) { const char *ret = NULL; @@ -159,6 +161,7 @@ end: return ret; } +BT_HIDDEN uint64_t bt_ctf_clock_get_frequency(struct bt_ctf_clock *clock) { uint64_t ret = -1ULL; @@ -186,6 +189,7 @@ end: return ret; } +BT_HIDDEN uint64_t bt_ctf_clock_get_precision(struct bt_ctf_clock *clock) { uint64_t ret = -1ULL; @@ -213,6 +217,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_clock_get_offset_s(struct bt_ctf_clock *clock, int64_t *offset_s) { int ret = 0; @@ -241,6 +246,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_clock_get_offset(struct bt_ctf_clock *clock, int64_t *offset) { int ret = 0; @@ -269,6 +275,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_clock_get_is_absolute(struct bt_ctf_clock *clock) { int ret = -1; @@ -296,6 +303,7 @@ end: return ret; } +BT_HIDDEN const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock) { const unsigned char *ret; @@ -310,6 +318,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock, const unsigned char *uuid) { int ret = 0; @@ -325,6 +334,7 @@ end: return ret; } +static uint64_t ns_from_value(uint64_t frequency, uint64_t value) { uint64_t ns; @@ -338,6 +348,7 @@ uint64_t ns_from_value(uint64_t frequency, uint64_t value) return ns; } +BT_HIDDEN int bt_ctf_clock_get_time(struct bt_ctf_clock *clock, int64_t *time) { int ret = 0; @@ -396,6 +407,7 @@ end: return ret; } +BT_HIDDEN uint64_t bt_ctf_clock_get_value(struct bt_ctf_clock *clock) { uint64_t ret = -1ULL; @@ -417,6 +429,7 @@ end: return ret; } +BT_HIDDEN int bt_ctf_clock_set_value(struct bt_ctf_clock *clock, uint64_t value) { int ret = 0; @@ -521,6 +534,7 @@ void bt_ctf_clock_destroy(struct bt_object *obj) g_free(clock); } +BT_HIDDEN int64_t bt_ctf_clock_ns_from_value(struct bt_ctf_clock *clock, uint64_t value) { int64_t ns = -1ULL; diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c index 3ea59eaa..b1b98b1f 100644 --- a/formats/ctf/ir/event.c +++ b/formats/ctf/ir/event.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/include/babeltrace/ctf-ir/clock-internal.h b/include/babeltrace/ctf-ir/clock-internal.h index 8f7b5f07..75677707 100644 --- a/include/babeltrace/ctf-ir/clock-internal.h +++ b/include/babeltrace/ctf-ir/clock-internal.h @@ -88,4 +88,133 @@ BT_HIDDEN void bt_ctf_clock_serialize(struct bt_ctf_clock *clock, struct metadata_context *context); +/* + * bt_ctf_clock_get_name: get a clock's name. + * + * Get the clock's name. + * + * @param clock Clock instance. + * + * Returns the clock's name, NULL on error. + */ +BT_HIDDEN +const char *bt_ctf_clock_get_name(struct bt_ctf_clock *clock); + +/* + * bt_ctf_clock_get_description: get a clock's description. + * + * Get the clock's description. + * + * @param clock Clock instance. + * + * Returns the clock's description, NULL if unset. + */ +BT_HIDDEN +const char *bt_ctf_clock_get_description(struct bt_ctf_clock *clock); + +/* + * bt_ctf_clock_get_frequency: get a clock's frequency. + * + * Get the clock's frequency (Hz). + * + * @param clock Clock instance. + * + * Returns the clock's frequency, -1ULL on error. + */ +BT_HIDDEN +uint64_t bt_ctf_clock_get_frequency(struct bt_ctf_clock *clock); + +/* + * bt_ctf_clock_get_precision: get a clock's precision. + * + * Get the clock's precision (in clock ticks). + * + * @param clock Clock instance. + * + * Returns the clock's precision, -1ULL on error. + */ +BT_HIDDEN +uint64_t bt_ctf_clock_get_precision(struct bt_ctf_clock *clock); + +/* + * bt_ctf_clock_get_offset_s: get a clock's offset in seconds. + * + * Get the clock's offset in seconds from POSIX.1 Epoch, 1970-01-01. + * + * @param clock Clock instance. + * @param offset_s Pointer to clock offset in seconds (output). + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_clock_get_offset_s(struct bt_ctf_clock *clock, + int64_t *offset_s); + +/* + * bt_ctf_clock_get_offset: get a clock's offset in ticks. + * + * Get the clock's offset in ticks from Epoch + offset_t. + * + * @param clock Clock instance. + * @param offset Clock offset in ticks from Epoch + offset_s (output). + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_clock_get_offset(struct bt_ctf_clock *clock, + int64_t *offset); + +/* + * bt_ctf_clock_get_is_absolute: get a clock's absolute attribute. + * + * Get the clock's absolute attribute. A clock is absolute if the clock is a + * global reference across the trace's other clocks. + * + * @param clock Clock instance. + * + * Returns the clock's absolute attribute, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_clock_get_is_absolute(struct bt_ctf_clock *clock); + +/* + * bt_ctf_clock_get_uuid: get a clock's UUID. + * + * Get the clock's UUID. + * + * @param clock Clock instance. + * + * Returns a pointer to the clock's UUID (16 byte array) on success, + * NULL on error. + */ +BT_HIDDEN +const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock); + +/* + * bt_ctf_clock_set_uuid: set a clock's UUID. + * + * Set a clock's UUID. + * + * @param clock Clock instance. + * @param uuid A 16-byte array containing a UUID. + * + * Returns 0 on success, a negative value on error. + */ +BT_HIDDEN +int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock, + const unsigned char *uuid); + +BT_HIDDEN +int64_t bt_ctf_clock_ns_from_value(struct bt_ctf_clock *clock, + uint64_t value); + +BT_HIDDEN +uint64_t bt_ctf_clock_get_value(struct bt_ctf_clock *clock); + +BT_HIDDEN +int bt_ctf_clock_set_value(struct bt_ctf_clock *clock, uint64_t value); + +BT_HIDDEN +int bt_ctf_clock_get_time(struct bt_ctf_clock *clock, int64_t *time); + #endif /* BABELTRACE_CTF_IR_CLOCK_INTERNAL_H */ diff --git a/include/babeltrace/ctf-ir/clock.h b/include/babeltrace/ctf-ir/clock.h index e35882e0..7665462b 100644 --- a/include/babeltrace/ctf-ir/clock.h +++ b/include/babeltrace/ctf-ir/clock.h @@ -49,28 +49,6 @@ struct bt_ctf_clock; */ extern struct bt_ctf_clock *bt_ctf_clock_create(const char *name); -/* - * bt_ctf_clock_get_name: get a clock's name. - * - * Get the clock's name. - * - * @param clock Clock instance. - * - * Returns the clock's name, NULL on error. - */ -extern const char *bt_ctf_clock_get_name(struct bt_ctf_clock *clock); - -/* - * bt_ctf_clock_get_description: get a clock's description. - * - * Get the clock's description. - * - * @param clock Clock instance. - * - * Returns the clock's description, NULL if unset. - */ -extern const char *bt_ctf_clock_get_description(struct bt_ctf_clock *clock); - /* * bt_ctf_clock_set_description: set a clock's description. * @@ -85,17 +63,6 @@ extern const char *bt_ctf_clock_get_description(struct bt_ctf_clock *clock); extern int bt_ctf_clock_set_description(struct bt_ctf_clock *clock, const char *desc); -/* - * bt_ctf_clock_get_frequency: get a clock's frequency. - * - * Get the clock's frequency (Hz). - * - * @param clock Clock instance. - * - * Returns the clock's frequency, -1ULL on error. - */ -extern uint64_t bt_ctf_clock_get_frequency(struct bt_ctf_clock *clock); - /* * bt_ctf_clock_set_frequency: set a clock's frequency. * @@ -109,17 +76,6 @@ extern uint64_t bt_ctf_clock_get_frequency(struct bt_ctf_clock *clock); extern int bt_ctf_clock_set_frequency(struct bt_ctf_clock *clock, uint64_t freq); -/* - * bt_ctf_clock_get_precision: get a clock's precision. - * - * Get the clock's precision (in clock ticks). - * - * @param clock Clock instance. - * - * Returns the clock's precision, -1ULL on error. - */ -extern uint64_t bt_ctf_clock_get_precision(struct bt_ctf_clock *clock); - /* * bt_ctf_clock_set_precision: set a clock's precision. * @@ -133,19 +89,6 @@ extern uint64_t bt_ctf_clock_get_precision(struct bt_ctf_clock *clock); extern int bt_ctf_clock_set_precision(struct bt_ctf_clock *clock, uint64_t precision); -/* - * bt_ctf_clock_get_offset_s: get a clock's offset in seconds. - * - * Get the clock's offset in seconds from POSIX.1 Epoch, 1970-01-01. - * - * @param clock Clock instance. - * @param offset_s Pointer to clock offset in seconds (output). - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_clock_get_offset_s(struct bt_ctf_clock *clock, - int64_t *offset_s); - /* * bt_ctf_clock_set_offset_s: set a clock's offset in seconds. * @@ -160,19 +103,6 @@ extern int bt_ctf_clock_get_offset_s(struct bt_ctf_clock *clock, extern int bt_ctf_clock_set_offset_s(struct bt_ctf_clock *clock, int64_t offset_s); -/* - * bt_ctf_clock_get_offset: get a clock's offset in ticks. - * - * Get the clock's offset in ticks from Epoch + offset_t. - * - * @param clock Clock instance. - * @param offset Clock offset in ticks from Epoch + offset_s (output). - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_clock_get_offset(struct bt_ctf_clock *clock, - int64_t *offset); - /* * bt_ctf_clock_set_offset: set a clock's offset in ticks. * @@ -186,18 +116,6 @@ extern int bt_ctf_clock_get_offset(struct bt_ctf_clock *clock, extern int bt_ctf_clock_set_offset(struct bt_ctf_clock *clock, int64_t offset); -/* - * bt_ctf_clock_get_is_absolute: get a clock's absolute attribute. - * - * Get the clock's absolute attribute. A clock is absolute if the clock is a - * global reference across the trace's other clocks. - * - * @param clock Clock instance. - * - * Returns the clock's absolute attribute, a negative value on error. - */ -extern int bt_ctf_clock_get_is_absolute(struct bt_ctf_clock *clock); - /* * bt_ctf_clock_set_is_absolute: set a clock's absolute attribute. * @@ -213,32 +131,14 @@ extern int bt_ctf_clock_set_is_absolute(struct bt_ctf_clock *clock, int is_absolute); /* - * bt_ctf_clock_get_uuid: get a clock's UUID. - * - * Get the clock's UUID. + * bt_ctf_clock_set_time: set a clock's current time value. * - * @param clock Clock instance. - * - * Returns a pointer to the clock's UUID (16 byte array) on success, - * NULL on error. - */ -extern const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock); - -/* - * bt_ctf_clock_set_uuid: set a clock's UUID. - * - * Set a clock's UUID. - * - * @param clock Clock instance. - * @param uuid A 16-byte array containing a UUID. + * Set the current time in nanoseconds since the clock's origin (offset and + * offset_s attributes). Defaults to 0. * * Returns 0 on success, a negative value on error. */ -extern int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock, - const unsigned char *uuid); - -extern int64_t bt_ctf_clock_ns_from_value(struct bt_ctf_clock *clock, - uint64_t value); +extern int bt_ctf_clock_set_time(struct bt_ctf_clock *clock, int64_t time); #ifdef __cplusplus } diff --git a/include/babeltrace/ctf-writer/clock.h b/include/babeltrace/ctf-writer/clock.h index 1bacc34e..cb17ca2b 100644 --- a/include/babeltrace/ctf-writer/clock.h +++ b/include/babeltrace/ctf-writer/clock.h @@ -36,24 +36,6 @@ extern "C" { #endif -extern int bt_ctf_clock_get_time(struct bt_ctf_clock *clock, int64_t *time); - -/* - * bt_ctf_clock_set_time: set a clock's current time value. - * - * Set the current time in nanoseconds since the clock's origin (offset and - * offset_s attributes). Defaults to 0. - * - * Returns 0 on success, a negative value on error. - */ -extern int bt_ctf_clock_set_time(struct bt_ctf_clock *clock, - int64_t time); - -extern uint64_t bt_ctf_clock_get_value(struct bt_ctf_clock *clock); - -extern int bt_ctf_clock_set_value(struct bt_ctf_clock *clock, - uint64_t value); - /* * bt_ctf_clock_get and bt_ctf_clock_put: increment and decrement the * refcount of the clock -- 2.34.1