X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ftrace.h;h=91b09f80eb409be76244dd7c4ff55a333344c194;hb=3230ee6b4f3a704958b761daecae835c56938bc9;hp=07daabe3adf7fac6c9da0d979a26e9d94181ee7d;hpb=b2e0c9076135f47110af2d96dfaee397c597bc90;p=babeltrace.git
diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace/ctf-ir/trace.h
index 07daabe3..91b09f80 100644
--- a/include/babeltrace/ctf-ir/trace.h
+++ b/include/babeltrace/ctf-ir/trace.h
@@ -94,7 +94,7 @@ As a reminder, here's the structure of a CTF packet:
@imgpacketstructure
A trace class also contains zero or more
-\link ctfirclockclass clock classes\endlink.
+\link ctfirclockclass CTF IR clock classes\endlink.
@todo
Elaborate about clock classes irt clock values.
@@ -116,7 +116,7 @@ except for:
- Adding a stream class to it with
bt_ctf_trace_add_stream_class().
-- Adding a clock class to it with bt_ctf_trace_add_clock_class().
+- Adding a CTF IR clock class to it with bt_ctf_trace_add_clock_class().
- \link refs Reference counting\endlink.
You can add a custom listener with bt_ctf_trace_add_listener() to get
@@ -170,7 +170,7 @@ The created trace class has the following initial properties:
- Name: none. You can set a name
with bt_ctf_trace_set_name().
- Default byte order: #BT_CTF_BYTE_ORDER_NATIVE. You
- can set a default byte order with bt_ctf_trace_set_byte_order().
+ can set a default byte order with bt_ctf_trace_set_native_byte_order().
Note that you \em must set the default byte order if any field type
contained in the created trace class, in its stream classes, or in
@@ -250,31 +250,31 @@ extern enum bt_ctf_byte_order bt_ctf_trace_get_byte_order(
/**
@brief Sets the default byte order of the CTF IR trace class
- \p trace_class to \p name.
+ \p trace_class to \p native_byte_order.
-\p byte_order \em must be one of:
+\p native_byte_order \em must be one of:
- #BT_CTF_BYTE_ORDER_LITTLE_ENDIAN
- #BT_CTF_BYTE_ORDER_BIG_ENDIAN
- #BT_CTF_BYTE_ORDER_NETWORK
-@param[in] trace_class Trace class of which to set the default byte
- order.
-@param[in] byte_order Default byte order of the trace class.
-@returns 0 on success, or a negative value on error.
+@param[in] trace_class Trace class of which to set the default byte
+ order.
+@param[in] native_byte_order Default byte order of the trace class.
+@returns 0 on success, or a negative value on error.
@prenotnull{trace_class}
@prenotnull{name}
@prehot{trace_class}
-@pre \p byte_order is either #BT_CTF_BYTE_ORDER_LITTLE_ENDIAN,
+@pre \p native_byte_order is either #BT_CTF_BYTE_ORDER_LITTLE_ENDIAN,
#BT_CTF_BYTE_ORDER_BIG_ENDIAN, or
#BT_CTF_BYTE_ORDER_NETWORK.
@postrefcountsame{trace_class}
@sa bt_ctf_trace_get_name(): Returns the name of a given trace class.
*/
-extern int bt_ctf_trace_set_byte_order(struct bt_ctf_trace *trace_class,
- enum bt_ctf_byte_order byte_order);
+extern int bt_ctf_trace_set_native_byte_order(struct bt_ctf_trace *trace_class,
+ enum bt_ctf_byte_order native_byte_order);
/**
@brief Returns the number of entries contained in the environment of
@@ -527,17 +527,17 @@ extern int bt_ctf_trace_set_packet_header_type(struct bt_ctf_trace *trace_class,
/** @} */
/**
-@name Clock class children functions
+@name Contained clock classes functions
@{
*/
/**
-@brief Returns the number of clock classes contained in the
+@brief Returns the number of CTF IR clock classes contained in the
CTF IR trace class \p trace_class.
@param[in] trace_class Trace class of which to get the number
- of children clock classes.
-@returns Number of children clock classes
+ of contained clock classes.
+@returns Number of contained clock classes
contained in \p trace_class, or a negative
value on error.
@@ -547,13 +547,15 @@ extern int bt_ctf_trace_set_packet_header_type(struct bt_ctf_trace *trace_class,
extern int bt_ctf_trace_get_clock_class_count(struct bt_ctf_trace *trace_class);
/**
-@brief Returns the clock class at index \p index in the CTF IR trace
- class \p trace_class.
+@brief Returns the CTF IR clock class at index \p index in the CTF
+ IR trace class \p trace_class.
-@param[in] trace_class Trace class of which to get the clock class.
-@param[in] index Index of the clock class to find.
-@returns Clock class at index \p index, or \c NULL
- on error.
+@param[in] trace_class Trace class of which to get the clock class
+ contained at index \p index.
+@param[in] index Index of the clock class to find in
+ \p trace_class.
+@returns Clock class at index \p index in \p trace_class,
+ or \c NULL on error.
@prenotnull{trace_class}
@pre \p index is lesser than the number of clock classes contained in
@@ -562,20 +564,22 @@ extern int bt_ctf_trace_get_clock_class_count(struct bt_ctf_trace *trace_class);
@postrefcountsame{trace_class}
@postsuccessrefcountretinc
-@sa bt_ctf_trace_get_clock_class_by_name(): Finds a clock class by name.
+@sa bt_ctf_trace_get_clock_class_by_name(): Finds a clock class by name
+ in a given trace class.
@sa bt_ctf_trace_add_clock_class(): Adds a clock class to a trace class.
*/
extern struct bt_ctf_clock_class *bt_ctf_trace_get_clock_class(
struct bt_ctf_trace *trace_class, int index);
/**
-@brief Returns the clock class named \c name found in the CTF IR trace
- class \p trace_class.
+@brief Returns the CTF IR clock class named \c name found in the CTF
+ IR trace class \p trace_class.
-@param[in] trace_class Trace class of which to get the clock class.
-@param[in] name Name of the clock class to find.
-@returns Clock class named \p name, or \c NULL
- on error.
+@param[in] trace_class Trace class of which to get the clock class
+ named \p name.
+@param[in] name Name of the clock class to find in \p trace_class.
+@returns Clock class named \p name in \p trace_class,
+ or \c NULL on error.
@prenotnull{trace_class}
@prenotnull{name}
@@ -593,9 +597,10 @@ extern struct bt_ctf_clock_class *bt_ctf_trace_get_clock_class_by_name(
@brief Adds the CTF IR clock class \p clock_class to the CTF IR
trace class \p trace_class.
-On success, \p clock_class becomes the child of \p trace_class.
+On success, \p trace_class contains \p clock_class.
-You can call this function even if \p trace_class is frozen.
+You can call this function even if \p trace_class or \p clock_class
+are frozen.
@param[in] trace_class Trace class to which to add \p clock_class.
@param[in] clock_class Clock class to add to \p trace_class.
@@ -610,7 +615,8 @@ You can call this function even if \p trace_class is frozen.
@sa bt_ctf_trace_get_clock_class(): Returns the clock class contained
in a given trace class at a given index.
-@sa bt_ctf_trace_get_clock_class_by_name(): Finds a clock class by name.
+@sa bt_ctf_trace_get_clock_class_by_name(): Finds a clock class by name
+ in a given trace class.
*/
extern int bt_ctf_trace_add_clock_class(struct bt_ctf_trace *trace_class,
struct bt_ctf_clock_class *clock_class);
@@ -651,7 +657,6 @@ extern int bt_ctf_trace_get_stream_class_count(struct bt_ctf_trace *trace_class)
the trace class \p trace_class (see
bt_ctf_trace_get_stream_class_count()).
@postrefcountsame{trace_class}
-@postsuccessrefcountretinc
@sa bt_ctf_trace_get_stream_class_by_id(): Finds a stream class by ID.
@sa bt_ctf_trace_add_stream_class(): Adds a stream class to a trace class.
@@ -720,37 +725,6 @@ extern int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace_class,
@{
*/
-/**
-@brief User function type to use with bt_ctf_trace_add_listener().
-
-@param[in] obj New CTF IR object which is part of the trace
- class hierarchy.
-@param[in] data User data.
-
-@prenotnull{obj}
-*/
-typedef void (*bt_ctf_listener_cb)(struct bt_ctf_object *obj, void *data);
-
-/**
-@brief Adds the trace class modification listener \p listener to
- the CTF IR trace class \p trace_class.
-
-Once you add \p listener to \p trace_class, whenever \p trace_class
-is modified, \p listener is called with the new element and with
-\p data (user data).
-
-@param[in] trace_class Trace class to which to add \p listener.
-@param[in] listener Modification listener function.
-@param[in] data User data.
-@returns 0 on success, or a negative value on error.
-
-@prenotnull{trace_class}
-@prenotnull{listener}
-@postrefcountsame{trace_class}
-*/
-extern int bt_ctf_trace_add_listener(struct bt_ctf_trace *trace_class,
- bt_ctf_listener_cb listener, void *data);
-
/**
@brief Accepts the visitor \p visitor to visit the hierarchy of the
CTF IR trace class \p trace_class.