summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c309df1)
Ensure runs of babeltrace in different environments give the same output
for the same trace collection. There are usually few events with the
same timestamp in a trace, so this secondary key comparison should not
be often required.
Fixes #540
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * returns true if a < b, false otherwise.
+ * Return true if a < b, false otherwise.
+ * If time stamps are exactly the same, compare by stream path. This
+ * ensures we get the same result between runs on the same trace
+ * collection on different environments.
+ * The result will be random for memory-mapped traces since there is no
+ * fixed path leading to those (they have empty path string).
*/
static int stream_compare(void *a, void *b)
{
struct ctf_file_stream *s_a = a, *s_b = b;
*/
static int stream_compare(void *a, void *b)
{
struct ctf_file_stream *s_a = a, *s_b = b;
- if (s_a->parent.real_timestamp < s_b->parent.real_timestamp)
+ if (s_a->parent.real_timestamp < s_b->parent.real_timestamp) {
+ } else if (likely(s_a->parent.real_timestamp > s_b->parent.real_timestamp)) {
+ } else {
+ return strcmp(s_a->parent.path, s_b->parent.path);
+ }
}
void bt_iter_free_pos(struct bt_iter_pos *iter_pos)
}
void bt_iter_free_pos(struct bt_iter_pos *iter_pos)