X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ftrace.h;h=34ba437622313b7a7c1cf1d8436e0a777ba81c11;hb=8480c8cc7e985169ab42060d3cd3c72d6c8d240d;hp=83e888b433081e48d640b3a35dc920243c0d0e8d;hpb=3602afb05ca664461109fa2d29d4e53db1c13fe2;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace/ctf-ir/trace.h
index 83e888b4..34ba4376 100644
--- a/include/babeltrace/ctf-ir/trace.h
+++ b/include/babeltrace/ctf-ir/trace.h
@@ -161,6 +161,20 @@ struct bt_ctf_clock_class;
 typedef void (* bt_ctf_trace_is_static_listener)(
 	struct bt_ctf_trace *trace_class, void *data);
 
+/**
+@brief	User function type to use with
+	bt_ctf_trace_add_is_static_listener().
+
+@param[in] trace_class	Trace class to which the listener was added.
+@param[in] data		User data as passed to
+			bt_ctf_trace_add_is_static_listener() when
+			you added the listener.
+
+@prenotnull{trace_class}
+*/
+typedef void (* bt_ctf_trace_listener_removed)(
+	struct bt_ctf_trace *trace_class, void *data);
+
 /**
 @name Creation function
 @{
@@ -181,12 +195,9 @@ The created trace class has the following initial properties:
   with bt_ctf_trace_set_name().
 - <strong>UUID</strong>: none. You can set a UUID with
   bt_ctf_trace_set_uuid().
-- <strong>Native byte order</strong>: #BT_CTF_BYTE_ORDER_NATIVE. You
-  can set a native byte order with bt_ctf_trace_set_native_byte_order().
-
-  Note that you \em must set the native byte order if any field type
-  contained in the created trace class, in its stream classes, or in
-  its event classes, has a byte order set to #BT_CTF_BYTE_ORDER_NATIVE.
+- <strong>Native byte order</strong>: #BT_CTF_BYTE_ORDER_UNSPECIFIED.
+  You can set a native byte order with
+  bt_ctf_trace_set_native_byte_order().
 - <strong>Environment</strong>: empty. You can add environment entries
   with bt_ctf_trace_set_environment_field(),
   bt_ctf_trace_set_environment_field_integer(), and
@@ -269,6 +280,8 @@ extern enum bt_ctf_byte_order bt_ctf_trace_get_native_byte_order(
 - #BT_CTF_BYTE_ORDER_LITTLE_ENDIAN
 - #BT_CTF_BYTE_ORDER_BIG_ENDIAN
 - #BT_CTF_BYTE_ORDER_NETWORK
+- <strong>If the trace is not in CTF writer mode<strong>,
+  #BT_CTF_BYTE_ORDER_UNSPECIFIED.
 
 @param[in] trace_class		Trace class of which to set the native byte
 				order.
@@ -277,8 +290,9 @@ extern enum bt_ctf_byte_order bt_ctf_trace_get_native_byte_order(
 
 @prenotnull{trace_class}
 @prehot{trace_class}
-@pre \p native_byte_order is either #BT_CTF_BYTE_ORDER_LITTLE_ENDIAN,
-	#BT_CTF_BYTE_ORDER_BIG_ENDIAN, or
+@pre \p native_byte_order is either #BT_CTF_BYTE_ORDER_UNSPECIFIED (if the
+	trace is not in CTF writer mode),
+	#BT_CTF_BYTE_ORDER_LITTLE_ENDIAN, #BT_CTF_BYTE_ORDER_BIG_ENDIAN, or
 	#BT_CTF_BYTE_ORDER_NETWORK.
 @postrefcountsame{trace_class}
 
@@ -873,6 +887,13 @@ extern int bt_ctf_trace_set_is_static(struct bt_ctf_trace *trace_class);
 \p listener is called with \p data, the user data, the first time
 bt_ctf_trace_set_is_static() is called on \p trace_class.
 
+When the trace is destroyed, or when you remove the added listener with
+bt_ctf_trace_remove_is_static_listener(), \p listener_removed is called
+if it's not \c NULL. You can use \p listener_removed to free any dynamic
+data which exists only for the added listener. You cannot call
+any function which modifies \p trace_class during the execution of
+\p listener_removed, including bt_ctf_trace_remove_is_static_listener().
+
 This function fails if \p trace_class is already static: you need to
 check the condition first with bt_ctf_trace_is_static().
 
@@ -881,12 +902,18 @@ listener within \p trace. You can use this identifier to remove the
 specific listener you added with
 bt_ctf_trace_remove_is_static_listener().
 
-@param[in] trace_class	Trace class to which to add the listener.
-@param[in] listener	Listener to add to \p trace_class.
-@param[in] data		User data passed when \p listener is called.
-@returns		A unique numeric identifier for this listener
-			on success (0 or greater), or a negative value
-			on error.
+@param[in] trace_class		Trace class to which to add the
+				listener.
+@param[in] listener		Listener to add to \p trace_class.
+@param[in] listener_removed	Remove listener called when \p listener
+				is removed from \p trace_class, or
+				\c NULL if you don't need a remove
+				listener.
+@param[in] data			User data passed when \p listener or
+				\p listener_removed is called.
+@returns			A unique numeric identifier for this
+				listener on success (0 or greater), or a
+				negative value on error.
 
 @prenotnull{trace_class}
 @prenotnull{listener}
@@ -902,7 +929,8 @@ bt_ctf_trace_remove_is_static_listener().
 */
 extern int bt_ctf_trace_add_is_static_listener(
 		struct bt_ctf_trace *trace_class,
-		bt_ctf_trace_is_static_listener listener, void *data);
+		bt_ctf_trace_is_static_listener listener,
+		bt_ctf_trace_listener_removed listener_removed, void *data);
 
 /**
 @brief  Removes the "trace is static" listener identified by