From e214aefe02458931926c04d4cb793c825696d15c Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Tue, 17 Apr 2018 10:27:31 -0400 Subject: [PATCH] ctf-writer: Split clock and clock-class declarations and definitions Split the clock_class functions of ctf-writer in its own header file. clock_class deserves it. Signed-off-by: Francis Deslauriers --- include/babeltrace/ctf-writer/clock-class.h | 96 +++++++++++++++++++++ include/babeltrace/ctf-writer/clock.h | 53 ------------ tests/lib/test_ctf_writer.c | 1 + 3 files changed, 97 insertions(+), 53 deletions(-) create mode 100644 include/babeltrace/ctf-writer/clock-class.h diff --git a/include/babeltrace/ctf-writer/clock-class.h b/include/babeltrace/ctf-writer/clock-class.h new file mode 100644 index 000000000..ae074b82d --- /dev/null +++ b/include/babeltrace/ctf-writer/clock-class.h @@ -0,0 +1,96 @@ +#ifndef BABELTRACE_CTF_WRITER_CLOCK_CLASS_H +#define BABELTRACE_CTF_WRITER_CLOCK_CLASS_H + +/* + * BabelTrace - CTF Writer: Clock Class + * + * Copyright 2013, 2014 Jérémie Galarneau + * + * Author: Jérémie Galarneau + * + * 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 + +#ifdef __cplusplus +extern "C" { +#endif + +struct bt_ctf_clock_class; + +extern struct bt_ctf_clock_class *bt_ctf_clock_class_create(const char *name, + uint64_t freq); + +extern const char *bt_ctf_clock_class_get_name( + struct bt_ctf_clock_class *clock_class); + +extern int bt_ctf_clock_class_set_name(struct bt_ctf_clock_class *clock_class, + const char *name); + +extern const char *bt_ctf_clock_class_get_description( + struct bt_ctf_clock_class *clock_class); + +extern int bt_ctf_clock_class_set_description( + struct bt_ctf_clock_class *clock_class, + const char *desc); + +extern uint64_t bt_ctf_clock_class_get_frequency( + struct bt_ctf_clock_class *clock_class); + +extern int bt_ctf_clock_class_set_frequency( + struct bt_ctf_clock_class *clock_class, uint64_t freq); + +extern uint64_t bt_ctf_clock_class_get_precision( + struct bt_ctf_clock_class *clock_class); + +extern int bt_ctf_clock_class_set_precision( + struct bt_ctf_clock_class *clock_class, uint64_t precision); + +extern int bt_ctf_clock_class_get_offset_s( + struct bt_ctf_clock_class *clock_class, int64_t *seconds); + +extern int bt_ctf_clock_class_set_offset_s( + struct bt_ctf_clock_class *clock_class, int64_t seconds); + +extern int bt_ctf_clock_class_get_offset_cycles( + struct bt_ctf_clock_class *clock_class, int64_t *cycles); + +extern int bt_ctf_clock_class_set_offset_cycles( + struct bt_ctf_clock_class *clock_class, int64_t cycles); + +extern bt_bool bt_ctf_clock_class_is_absolute( + struct bt_ctf_clock_class *clock_class); + +extern int bt_ctf_clock_class_set_is_absolute( + struct bt_ctf_clock_class *clock_class, bt_bool is_absolute); + +extern const unsigned char *bt_ctf_clock_class_get_uuid( + struct bt_ctf_clock_class *clock_class); + +extern int bt_ctf_clock_class_set_uuid(struct bt_ctf_clock_class *clock_class, + const unsigned char *uuid); +#ifdef __cplusplus +} +#endif + +#endif /* BABELTRACE_CTF_WRITER_CLOCK_CLASS_H */ diff --git a/include/babeltrace/ctf-writer/clock.h b/include/babeltrace/ctf-writer/clock.h index 909ebe00d..36e191f33 100644 --- a/include/babeltrace/ctf-writer/clock.h +++ b/include/babeltrace/ctf-writer/clock.h @@ -280,59 +280,6 @@ void bt_ctf_clock_put(struct bt_ctf_clock *clock) { bt_ctf_object_put_ref(clock); } - -extern struct bt_ctf_clock_class *bt_ctf_clock_class_create(const char *name, - uint64_t freq); - -extern const char *bt_ctf_clock_class_get_name( - struct bt_ctf_clock_class *clock_class); - -extern int bt_ctf_clock_class_set_name(struct bt_ctf_clock_class *clock_class, - const char *name); - -extern const char *bt_ctf_clock_class_get_description( - struct bt_ctf_clock_class *clock_class); - -extern int bt_ctf_clock_class_set_description( - struct bt_ctf_clock_class *clock_class, - const char *desc); - -extern uint64_t bt_ctf_clock_class_get_frequency( - struct bt_ctf_clock_class *clock_class); - -extern int bt_ctf_clock_class_set_frequency( - struct bt_ctf_clock_class *clock_class, uint64_t freq); - -extern uint64_t bt_ctf_clock_class_get_precision( - struct bt_ctf_clock_class *clock_class); - -extern int bt_ctf_clock_class_set_precision( - struct bt_ctf_clock_class *clock_class, uint64_t precision); - -extern int bt_ctf_clock_class_get_offset_s( - struct bt_ctf_clock_class *clock_class, int64_t *seconds); - -extern int bt_ctf_clock_class_set_offset_s( - struct bt_ctf_clock_class *clock_class, int64_t seconds); - -extern int bt_ctf_clock_class_get_offset_cycles( - struct bt_ctf_clock_class *clock_class, int64_t *cycles); - -extern int bt_ctf_clock_class_set_offset_cycles( - struct bt_ctf_clock_class *clock_class, int64_t cycles); - -extern bt_bool bt_ctf_clock_class_is_absolute( - struct bt_ctf_clock_class *clock_class); - -extern int bt_ctf_clock_class_set_is_absolute( - struct bt_ctf_clock_class *clock_class, bt_bool is_absolute); - -extern const unsigned char *bt_ctf_clock_class_get_uuid( - struct bt_ctf_clock_class *clock_class); - -extern int bt_ctf_clock_class_set_uuid(struct bt_ctf_clock_class *clock_class, - const unsigned char *uuid); - #ifdef __cplusplus } #endif diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index c2cef1173..8dae42920 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include -- 2.34.1