X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ftrace.h;h=feb5a6de493a60dd5b0d04a2d2d9630ea7a21bb4;hb=488e09a789fe633309abda5f9b65d55a9ab6e10a;hp=a9e4fa89e1bc6cd76e7eab6e5aee87c78c704878;hpb=5acf2ae6bdfb2bc6fa88e250a87ccc6ba3546d89;p=babeltrace.git diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace/ctf-ir/trace.h index a9e4fa89..feb5a6de 100644 --- a/include/babeltrace/ctf-ir/trace.h +++ b/include/babeltrace/ctf-ir/trace.h @@ -62,10 +62,11 @@ You can obtain a trace class in two different modes: A trace class has the following properties: - A \b name. -- A default byte order: all the +- A native byte order: all the \link ctfirfieldtypes field types\endlink eventually part of the trace class with a byte order set to #BT_CTF_BYTE_ORDER_NATIVE have this "real" byte order. +- A \b UUID. - An \b environment, which is a custom key-value mapping. Keys are strings and values can be strings or integers. @@ -78,7 +79,7 @@ trace class with bt_ctf_trace_add_stream_class(). You can access the streams of a trace, that is, the streams which were created from the trace's stream classes with bt_ctf_stream_create(), -with bt_ctf_trace_get_stream(). +with bt_ctf_trace_get_stream_by_index(). A trace class owns the trace packet header \link ctfirfieldtypes field type\endlink, which represents the @@ -123,11 +124,6 @@ except for: - 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 -notified if anything changes in a trace class, that is, if an event -class is added to one of its stream class, if a stream class is added, -or if a clock class is added. - @sa ctfirstreamclass @sa ctfireventclass @sa ctfirclockclass @@ -159,24 +155,21 @@ struct bt_ctf_clock_class; @brief Creates a default CTF IR trace class. On success, the trace packet header field type of the created trace -class has the following fields: - -- magic: a 32-bit unsigned integer field type. -- uuid: an array field type of 16 8-bit unsigned integer - field types. -- stream_id: a 32-bit unsigned integer field type. - -You can modify this default trace packet header field type after the -trace class is created with bt_ctf_trace_set_packet_header_type(). +class is an empty structure field type. You can modify this default +trace packet header field type after the trace class is created with +bt_ctf_trace_get_packet_header_type() and +bt_ctf_trace_set_packet_header_type(). 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_native_byte_order(). +- UUID: none. You can set a UUID with + bt_ctf_trace_set_uuid(). +- Native byte order: #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 default byte order if any field type + 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. - Environment: empty. You can add environment entries @@ -235,25 +228,25 @@ extern int bt_ctf_trace_set_name(struct bt_ctf_trace *trace_class, const char *name); /** -@brief Returns the default byte order of the CTF IR trace class +@brief Returns the native byte order of the CTF IR trace class \p trace_class. @param[in] trace_class Trace class of which to get the default byte order. -@returns Default byte order of trace class - \p trace_class, or #BT_CTF_BYTE_ORDER_UNKNOWN - on error. +@returns Native byte order of \p trace_class, + or #BT_CTF_BYTE_ORDER_UNKNOWN on error. @prenotnull{trace_class} @postrefcountsame{trace_class} -@sa bt_ctf_trace_set_name(): Sets the name of a given trace class. +@sa bt_ctf_trace_set_native_byte_order(): Sets the native byte order of + a given trace class. */ -extern enum bt_ctf_byte_order bt_ctf_trace_get_byte_order( +extern enum bt_ctf_byte_order bt_ctf_trace_get_native_byte_order( struct bt_ctf_trace *trace_class); /** -@brief Sets the default byte order of the CTF IR trace class +@brief Sets the native byte order of the CTF IR trace class \p trace_class to \p native_byte_order. \p native_byte_order \em must be one of: @@ -262,24 +255,63 @@ extern enum bt_ctf_byte_order bt_ctf_trace_get_byte_order( - #BT_CTF_BYTE_ORDER_BIG_ENDIAN - #BT_CTF_BYTE_ORDER_NETWORK -@param[in] trace_class Trace class of which to set the default byte +@param[in] trace_class Trace class of which to set the native byte order. -@param[in] native_byte_order Default byte order of the trace class. +@param[in] native_byte_order Native 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 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. +@sa bt_ctf_trace_get_native_byte_order(): Returns the native byte order of a + given trace class. */ 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 UUID of the CTF IR trace class \p trace_class. + +On success, the return value is an array of 16 bytes. + +@param[in] trace_class Trace class of which to get the UUID. +@returns UUID of trace class \p trace_class, or + \c NULL if \p trace_class has no UUID or on error. + +@prenotnull{trace_class} +@postrefcountsame{trace_class} + +@sa bt_ctf_trace_set_uuid(): Sets the UUID of a given trace class. +*/ +extern const unsigned char *bt_ctf_trace_get_uuid( + struct bt_ctf_trace *trace_class); + +/** +@brief Sets the UUID of the CTF IR trace class \p trace_class to + \p uuid. + +\p uuid \em must be an array of 16 bytes. + +@param[in] trace_class Trace class of which to set the UUID. +@param[in] uuid UUID of the \p trace_class (copied on + success). +@returns 0 on success, or a negative value on error. + +@prenotnull{trace_class} +@prenotnull{uuid} +@prehot{trace_class} +@pre \p uuid is an array of 16 bytes. +@postrefcountsame{trace_class} + +@sa bt_ctf_trace_get_uuid(): Returns the UUID of a given trace class. +*/ +extern int bt_ctf_trace_set_uuid(struct bt_ctf_trace *trace_class, + const unsigned char *uuid); + /** @brief Returns the number of entries contained in the environment of the CTF IR trace class \p trace_class. @@ -293,7 +325,7 @@ extern int bt_ctf_trace_set_native_byte_order(struct bt_ctf_trace *trace_class, @prenotnull{trace_class} @postrefcountsame{trace_class} */ -extern int bt_ctf_trace_get_environment_field_count( +extern int64_t bt_ctf_trace_get_environment_field_count( struct bt_ctf_trace *trace_class); /** @@ -315,7 +347,7 @@ the returned string. \p trace_class (see bt_ctf_trace_get_environment_field_count()). @postrefcountsame{trace_class} -@sa bt_ctf_trace_get_environment_field_value(): Finds a trace class's +@sa bt_ctf_trace_get_environment_field_value_by_index(): Finds a trace class's environment entry by index. @sa bt_ctf_trace_get_environment_field_value_by_name(): Finds a trace class's environment entry by name. @@ -323,8 +355,8 @@ the returned string. class's environment entry. */ extern const char * -bt_ctf_trace_get_environment_field_name(struct bt_ctf_trace *trace_class, - int index); +bt_ctf_trace_get_environment_field_name_by_index( + struct bt_ctf_trace *trace_class, uint64_t index); /** @brief Returns the value of the environment entry at index @@ -348,8 +380,8 @@ bt_ctf_trace_get_environment_field_name(struct bt_ctf_trace *trace_class, class's environment entry. */ extern struct bt_value * -bt_ctf_trace_get_environment_field_value(struct bt_ctf_trace *trace_class, - int index); +bt_ctf_trace_get_environment_field_value_by_index(struct bt_ctf_trace *trace_class, + uint64_t index); /** @brief Returns the value of the environment entry named \p name @@ -367,7 +399,7 @@ bt_ctf_trace_get_environment_field_value(struct bt_ctf_trace *trace_class, @postrefcountsame{trace_class} @postsuccessrefcountretinc -@sa bt_ctf_trace_get_environment_field_value(): Finds a trace class's +@sa bt_ctf_trace_get_environment_field_value_by_index(): Finds a trace class's environment entry by index. @sa bt_ctf_trace_set_environment_field(): Sets the value of a trace class's environment entry. @@ -401,7 +433,7 @@ value is first put, and then replaced by \p value. @postrefcountsame{trace_class} @postsuccessrefcountinc{value} -@sa bt_ctf_trace_get_environment_field_value(): Finds a trace class's +@sa bt_ctf_trace_get_environment_field_value_by_index(): Finds a trace class's environment entry by index. @sa bt_ctf_trace_get_environment_field_value_by_name(): Finds a trace class's environment entry by name. @@ -548,7 +580,8 @@ extern int bt_ctf_trace_set_packet_header_type(struct bt_ctf_trace *trace_class, @prenotnull{trace_class} @postrefcountsame{trace_class} */ -extern int bt_ctf_trace_get_clock_class_count(struct bt_ctf_trace *trace_class); +extern int64_t bt_ctf_trace_get_clock_class_count( + struct bt_ctf_trace *trace_class); /** @brief Returns the CTF IR clock class at index \p index in the CTF @@ -572,8 +605,8 @@ extern int bt_ctf_trace_get_clock_class_count(struct bt_ctf_trace *trace_class); 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); +extern struct bt_ctf_clock_class *bt_ctf_trace_get_clock_class_by_index( + struct bt_ctf_trace *trace_class, uint64_t index); /** @brief Returns the CTF IR clock class named \c name found in the CTF @@ -590,7 +623,7 @@ extern struct bt_ctf_clock_class *bt_ctf_trace_get_clock_class( @postrefcountsame{trace_class} @postsuccessrefcountretinc -@sa bt_ctf_trace_get_clock_class(): Returns the clock class contained +@sa bt_ctf_trace_get_clock_class_by_index(): Returns the clock class contained in a given trace class at a given index. @sa bt_ctf_trace_add_clock_class(): Adds a clock class to a trace class. */ @@ -617,7 +650,7 @@ are frozen. @post On success, if \p trace_class is frozen, \p clock_class is frozen. -@sa bt_ctf_trace_get_clock_class(): Returns the clock class contained +@sa bt_ctf_trace_get_clock_class_by_index(): 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 in a given trace class. @@ -645,7 +678,8 @@ extern int bt_ctf_trace_add_clock_class(struct bt_ctf_trace *trace_class, @prenotnull{trace_class} @postrefcountsame{trace_class} */ -extern int bt_ctf_trace_get_stream_class_count(struct bt_ctf_trace *trace_class); +extern int64_t bt_ctf_trace_get_stream_class_count( + struct bt_ctf_trace *trace_class); /** @brief Returns the stream class at index \p index in the CTF IR trace @@ -665,8 +699,8 @@ extern int bt_ctf_trace_get_stream_class_count(struct bt_ctf_trace *trace_class) @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. */ -extern struct bt_ctf_stream_class *bt_ctf_trace_get_stream_class( - struct bt_ctf_trace *trace_class, int index); +extern struct bt_ctf_stream_class *bt_ctf_trace_get_stream_class_by_index( + struct bt_ctf_trace *trace_class, uint64_t index); /** @brief Returns the stream class with ID \c id found in the CTF IR @@ -681,12 +715,12 @@ extern struct bt_ctf_stream_class *bt_ctf_trace_get_stream_class( @postrefcountsame{trace_class} @postsuccessrefcountretinc -@sa bt_ctf_trace_get_stream_class(): Returns the stream class contained +@sa bt_ctf_trace_get_stream_class_by_index(): Returns the stream class contained in a given trace class at a given index. @sa bt_ctf_trace_add_stream_class(): Adds a stream class to a trace class. */ extern struct bt_ctf_stream_class *bt_ctf_trace_get_stream_class_by_id( - struct bt_ctf_trace *trace_class, uint32_t id); + struct bt_ctf_trace *trace_class, uint64_t id); /** @brief Adds the CTF IR stream class \p stream_class to the @@ -715,7 +749,7 @@ resolving fails, then this function fails. @postsuccessrefcountinc{stream_class} @postsuccessfrozen{stream_class} -@sa bt_ctf_trace_get_stream_class(): Returns the stream class contained +@sa bt_ctf_trace_get_stream_class_by_index(): Returns the stream class contained in a given trace class at a given index. @sa bt_ctf_trace_get_stream_class_by_id(): Finds a stream class by ID. */ @@ -742,7 +776,7 @@ extern int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace_class, @prenotnull{trace_class} @postrefcountsame{trace_class} */ -extern int bt_ctf_trace_get_stream_count(struct bt_ctf_trace *trace_class); +extern int64_t bt_ctf_trace_get_stream_count(struct bt_ctf_trace *trace_class); /** @brief Returns the stream at index \p index in the CTF IR trace @@ -759,8 +793,8 @@ extern int bt_ctf_trace_get_stream_count(struct bt_ctf_trace *trace_class); bt_ctf_trace_get_stream_count()). @postrefcountsame{trace_class} */ -extern struct bt_ctf_stream *bt_ctf_trace_get_stream( - struct bt_ctf_trace *trace_class, int index); +extern struct bt_ctf_stream *bt_ctf_trace_get_stream_by_index( + struct bt_ctf_trace *trace_class, uint64_t index); /** @} */