X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Fevents.h;h=80fbdcf2f5b634b9a720bec49c3aa8f69edd384e;hp=a08518b8a0e0aad7cc29485a283508816d4626e4;hb=325392affbbb6aaf2caf13836e7ba7c0d29c90a3;hpb=8673030f3cb8d157a30e79af524fd5cca253025e

diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h
index a08518b8..80fbdcf2 100644
--- a/include/babeltrace/ctf/events.h
+++ b/include/babeltrace/ctf/events.h
@@ -24,12 +24,9 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/iterator.h>
 
-struct ctf_stream;
-struct ctf_stream_event;
 struct definition;
-struct bt_ctf_iter;
+struct bt_ctf_event;
 
 /*
  * the top-level scopes in CTF
@@ -70,50 +67,6 @@ enum ctf_string_encoding {
 	CTF_STRING_UNKNOWN,
 };
 
-/*
- * the structure to manipulate events
- */
-struct bt_ctf_event {
-	struct ctf_stream *stream;
-	struct ctf_stream_event *event;
-};
-
-/*
- * bt_ctf_iter_read_event: Read the iterator's current event data.
- *
- * @iter: trace collection iterator (input)
- * @stream: stream containing event at current position (output)
- * @event: current event (output)
- * Return 0 on success, negative error value on error.
- */
-struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
-
-/*
- * bt_ctf_iter_create - Allocate a CTF trace collection iterator.
- *
- * begin_pos and end_pos are optional parameters to specify the position
- * at which the trace collection should be seeked upon iterator
- * creation, and the position at which iteration will start returning
- * "EOF".
- *
- * By default, if begin_pos is NULL, a BT_SEEK_CUR is performed at
- * creation. By default, if end_pos is NULL, a BT_SEEK_END (end of
- * trace) is the EOF criterion.
- */
-struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
-		struct bt_iter_pos *begin_pos,
-		struct bt_iter_pos *end_pos);
-
-/*
- * bt_ctf_get_iter - get iterator from ctf iterator.
- */
-struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter);
-
-/*
- * bt_ctf_iter_destroy - Free a CTF trace collection iterator.
- */
-void bt_ctf_iter_destroy(struct bt_ctf_iter *iter);
-
 /*
  * bt_ctf_get_top_level_scope: return a definition of the top-level scope
  *
@@ -124,49 +77,49 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter);
  * between the enum and the actual definition of top-level scopes.
  * On error return NULL.
  */
-struct definition *bt_ctf_get_top_level_scope(struct bt_ctf_event *event,
+const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *event,
 		enum bt_ctf_scope scope);
 
 /*
  * bt_ctf_event_get_name: returns the name of the event or NULL on error
  */
-const char *bt_ctf_event_name(struct bt_ctf_event *event);
+const char *bt_ctf_event_name(const struct bt_ctf_event *event);
 
 /*
  * bt_ctf_get_timestamp_raw: returns the timestamp of the event as written in
  * the packet or -1ULL on error
  */
-uint64_t bt_ctf_get_timestamp_raw(struct bt_ctf_event *event);
+uint64_t bt_ctf_get_timestamp_raw(const struct bt_ctf_event *event);
 
 /*
  * bt_ctf_get_timestamp: returns the timestamp of the event offsetted with the
  * system clock source or -1ULL on error
  */
-uint64_t bt_ctf_get_timestamp(struct bt_ctf_event *event);
+uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *event);
 
 /*
  * bt_ctf_get_field_list: set list pointer to an array of definition
  * pointers and set count to the number of elements in the array.
  * Return 0 on success and a negative value on error.
  */
-int bt_ctf_get_field_list(struct bt_ctf_event *event,
-		struct definition *scope,
+int bt_ctf_get_field_list(const struct bt_ctf_event *event,
+		const struct definition *scope,
 		struct definition const * const **list,
 		unsigned int *count);
 
 /*
  * bt_ctf_get_field: returns the definition of a specific field
  */
-struct definition *bt_ctf_get_field(struct bt_ctf_event *event,
-		struct definition *scope,
+const struct definition *bt_ctf_get_field(const struct bt_ctf_event *event,
+		const struct definition *scope,
 		const char *field);
 
 /*
  * bt_ctf_get_index: if the field is an array or a sequence, return the element
  * at position index, otherwise return NULL;
  */
-struct definition *bt_ctf_get_index(struct bt_ctf_event *event,
-		struct definition *field,
+const struct definition *bt_ctf_get_index(const struct bt_ctf_event *event,
+		const struct definition *field,
 		unsigned int index);
 
 /*