Namespace the struct trace_descriptor

[babeltrace.git] / include / babeltrace / ctf-text / types.h

diff --git a/include/babeltrace/ctf-text/types.h b/include/babeltrace/ctf-text/types.h
index 101873a9d5af801bff4508bef1183728ff75e329..15c833332838eafcbcbaed72806a69733d6424c4 100644 (file)
--- a/include/babeltrace/ctf-text/types.h
+++ b/include/babeltrace/ctf-text/types.h
@@ -17,6 +17,14 @@
  *
  * 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.
  */
 
 #include <sys/mman.h>
@@ -29,22 +37,23 @@
 #include <babeltrace/format.h>
 
 /*
- * Inherit from both struct stream_pos and struct trace_descriptor.
+ * Inherit from both struct bt_stream_pos and struct bt_trace_descriptor.
  */
 struct ctf_text_stream_pos {
-       struct stream_pos parent;
-       struct trace_descriptor trace_descriptor;
+       struct bt_stream_pos parent;
+       struct bt_trace_descriptor trace_descriptor;
        FILE *fp;               /* File pointer. NULL if unset. */
        int depth;
        int dummy;              /* disable output */
        int print_names;        /* print field names */
        int field_nr;
-       uint64_t last_timestamp;        /* to print delta */
+       uint64_t last_real_timestamp;   /* to print delta */
+       uint64_t last_cycles_timestamp; /* to print delta */
        GString *string;        /* Current string */
 };
 
 static inline
-struct ctf_text_stream_pos *ctf_text_pos(struct stream_pos *pos)
+struct ctf_text_stream_pos *ctf_text_pos(struct bt_stream_pos *pos)
 {
        return container_of(pos, struct ctf_text_stream_pos, parent);
 }
@@ -52,14 +61,22 @@ struct ctf_text_stream_pos *ctf_text_pos(struct stream_pos *pos)
 /*
  * Write only is supported for now.
  */
-int ctf_text_integer_write(struct stream_pos *pos, struct definition *definition);
-int ctf_text_float_write(struct stream_pos *pos, struct definition *definition);
-int ctf_text_string_write(struct stream_pos *pos, struct definition *definition);
-int ctf_text_enum_write(struct stream_pos *pos, struct definition *definition);
-int ctf_text_struct_write(struct stream_pos *pos, struct definition *definition);
-int ctf_text_variant_write(struct stream_pos *pos, struct definition *definition);
-int ctf_text_array_write(struct stream_pos *pos, struct definition *definition);
-int ctf_text_sequence_write(struct stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_integer_write(struct bt_stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_float_write(struct bt_stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_string_write(struct bt_stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_enum_write(struct bt_stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_struct_write(struct bt_stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_variant_write(struct bt_stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_array_write(struct bt_stream_pos *pos, struct definition *definition);
+BT_HIDDEN
+int ctf_text_sequence_write(struct bt_stream_pos *pos, struct definition *definition);
 
 static inline
 void print_pos_tabs(struct ctf_text_stream_pos *pos)
@@ -73,15 +90,7 @@ void print_pos_tabs(struct ctf_text_stream_pos *pos)
 /*
  * Check if the field must be printed.
  */
+BT_HIDDEN
 int print_field(struct definition *definition);
 
-static inline
-const char *rem_(const char *str)
-{
-       if (str[0] == '_')
-               return &str[1];
-       else
-               return str;
-}
-
 #endif /* _BABELTRACE_CTF_TEXT_TYPES_H */