X-Git-Url: https://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Fcommon%2Fmuxing%2Fmuxing.c;fp=src%2Fplugins%2Fcommon%2Fmuxing%2Fmuxing.c;h=5e52c4f497cdf77f17bf5e47b11c7c1aafcef5cb;hp=35bfad133229190a5f05623b80b794909e072db6;hb=0ea4aa9f8de0535273540aeaeacec74421cfb6b8;hpb=94bec82e9f10111725f5797a72907dd2d491f4f1

diff --git a/src/plugins/common/muxing/muxing.c b/src/plugins/common/muxing/muxing.c
index 35bfad13..5e52c4f4 100644
--- a/src/plugins/common/muxing/muxing.c
+++ b/src/plugins/common/muxing/muxing.c
@@ -170,6 +170,7 @@ int compare_clock_classes(const bt_clock_class *left_cc,
 	const char *left_clock_class_name, *right_clock_class_name;
 	bt_uuid left_clock_class_uuid, right_clock_class_uuid;
 	uint64_t left_freq, right_freq, left_prec, right_prec;
+	bool left_origin_is_unix, right_origin_is_unix;
 
 	left_clock_class_uuid = bt_clock_class_get_uuid(left_cc);
 	right_clock_class_uuid = bt_clock_class_get_uuid(right_cc);
@@ -188,6 +189,13 @@ int compare_clock_classes(const bt_clock_class *left_cc,
 		}
 	}
 
+	left_origin_is_unix = bt_clock_class_origin_is_unix_epoch(left_cc);
+	right_origin_is_unix = bt_clock_class_origin_is_unix_epoch(right_cc);
+
+	if (left_origin_is_unix != right_origin_is_unix) {
+		ret = left_origin_is_unix - right_origin_is_unix;
+		goto end;
+	}
 
 	left_clock_class_name = bt_clock_class_get_name(left_cc);
 	right_clock_class_name = bt_clock_class_get_name(right_cc);