X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftrace-ir%2Ftrace.h;h=36565dfc5e1e0b0bded876e1c11e8ca4f4905b9f;hb=2e90378a2b94006e2743b06e7fe7a1f0e691a56e;hp=67fc1d987114b8f2cda19bf7947701510012ce9d;hpb=5cd6d0e5fa67c2bdd21dc153313618260595d7bc;p=babeltrace.git

diff --git a/include/babeltrace/trace-ir/trace.h b/include/babeltrace/trace-ir/trace.h
index 67fc1d98..36565dfc 100644
--- a/include/babeltrace/trace-ir/trace.h
+++ b/include/babeltrace/trace-ir/trace.h
@@ -2,12 +2,9 @@
 #define BABELTRACE_TRACE_IR_TRACE_H
 
 /*
- * BabelTrace - Trace IR: Trace
- *
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 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
@@ -30,95 +27,30 @@
  * http://www.efficios.com/ctf
  */
 
-/* For bt_bool, bt_uuid */
+/* For bt_bool, bt_trace, bt_trace_class, bt_stream */
 #include <babeltrace/types.h>
 
+/* For bt_trace_status */
+#include <babeltrace/trace-ir/trace-const.h>
+
 #include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_trace;
-struct bt_stream;
-struct bt_stream_class;
-struct bt_field_class;
-struct bt_value;
-struct bt_packet_header_field;
-
-typedef void (* bt_trace_is_static_listener)(
-	struct bt_trace *trace, void *data);
-
-typedef void (* bt_trace_listener_removed)(
-	struct bt_trace *trace, void *data);
-
-extern struct bt_trace *bt_trace_create(void);
-
-extern bt_bool bt_trace_assigns_automatic_stream_class_id(
-		struct bt_trace *trace);
-
-extern int bt_trace_set_assigns_automatic_stream_class_id(
-		struct bt_trace *trace, bt_bool value);
-
-extern const char *bt_trace_get_name(struct bt_trace *trace);
-
-extern int bt_trace_set_name(struct bt_trace *trace, const char *name);
-
-extern bt_uuid bt_trace_get_uuid(struct bt_trace *trace);
-
-extern int bt_trace_set_uuid(struct bt_trace *trace, bt_uuid uuid);
-
-extern uint64_t bt_trace_get_environment_entry_count(struct bt_trace *trace);
-
-extern void bt_trace_borrow_environment_entry_by_index(
-		struct bt_trace *trace, uint64_t index,
-		const char **name, struct bt_value **value);
-
-extern struct bt_value *bt_trace_borrow_environment_entry_value_by_name(
-		struct bt_trace *trace, const char *name);
-
-extern int bt_trace_set_environment_entry_integer(
-		struct bt_trace *trace, const char *name,
-		int64_t value);
-
-extern int bt_trace_set_environment_entry_string(
-		struct bt_trace *trace, const char *name,
-		const char *value);
-
-extern struct bt_field_class *bt_trace_borrow_packet_header_field_class(
-		struct bt_trace *trace);
-
-extern int bt_trace_set_packet_header_field_class(struct bt_trace *trace,
-		struct bt_field_class *packet_header_field_class);
-
-extern uint64_t bt_trace_get_stream_class_count(struct bt_trace *trace);
-
-extern struct bt_stream_class *bt_trace_borrow_stream_class_by_index(
-		struct bt_trace *trace, uint64_t index);
-
-extern struct bt_stream_class *bt_trace_borrow_stream_class_by_id(
-		struct bt_trace *trace, uint64_t id);
-
-extern uint64_t bt_trace_get_stream_count(struct bt_trace *trace);
-
-extern struct bt_stream *bt_trace_borrow_stream_by_index(
-		struct bt_trace *trace, uint64_t index);
-
-extern struct bt_stream *bt_trace_borrow_stream_by_id(
-		struct bt_trace *trace, uint64_t id);
+extern bt_trace_class *bt_trace_borrow_class(bt_trace *trace);
 
-extern bt_bool bt_trace_is_static(struct bt_trace *trace);
+extern bt_trace *bt_trace_create(bt_trace_class *trace_class);
 
-extern int bt_trace_make_static(struct bt_trace *trace);
+extern bt_trace_status bt_trace_set_name(bt_trace *trace,
+		const char *name);
 
-extern int bt_trace_add_is_static_listener(
-		struct bt_trace *trace,
-		bt_trace_is_static_listener listener,
-		bt_trace_listener_removed listener_removed, void *data,
-		uint64_t *listener_id);
+extern bt_stream *bt_trace_borrow_stream_by_index(bt_trace *trace,
+		uint64_t index);
 
-extern int bt_trace_remove_is_static_listener(
-		struct bt_trace *trace, uint64_t listener_id);
+extern bt_stream *bt_trace_borrow_stream_by_id(bt_trace *trace,
+		uint64_t id);
 
 #ifdef __cplusplus
 }