"%!+i", iterator);
bt_message_iterator_try_finalize(iterator);
+ if (iterator->clock_expectation.type ==
+ CLOCK_EXPECTATION_ORIGIN_OTHER_NO_UUID) {
+ BT_CLOCK_CLASS_PUT_REF_AND_RESET(
+ iterator->clock_expectation.clock_class);
+ }
+
if (iterator->connection) {
/*
* Remove ourself from the originating connection so
bt_uuid_copy(iterator->clock_expectation.uuid, clock_class_uuid);
} else {
iterator->clock_expectation.type = CLOCK_EXPECTATION_ORIGIN_OTHER_NO_UUID;
+ iterator->clock_expectation.clock_class = clock_class;
+ bt_clock_class_get_ref(iterator->clock_expectation.clock_class);
}
break;
case CLOCK_EXPECTATION_ORIGIN_OTHER_NO_UUID:
if (!clock_class) {
BT_ASSERT_COND_DEV_MSG(
- "Expecting a clock class, got none.");
+ "Expecting clock class %![cc-]+K, got none.",
+ iterator->clock_expectation.clock_class);
result = false;
goto end;
}
- if (bt_clock_class_origin_is_unix_epoch(clock_class)) {
+ if (clock_class != iterator->clock_expectation.clock_class) {
BT_ASSERT_COND_DEV_MSG(
- "Expecting a clock class without Unix epoch origin: %![cc-]+K",
+ "Expecting clock class %![cc-]+K, got %![cc-]+K.",
+ iterator->clock_expectation.clock_class,
clock_class);
result = false;
goto end;
}
- if (clock_class_uuid) {
- BT_ASSERT_COND_DEV_MSG(
- "Expecting a clock class without UUID: %![cc-]+K",
- clock_class);
- result = false;
- goto end;
- }
break;
}
}
CLOCK_EXPECTATION_ORIGIN_OTHER_NO_UUID,
} type;
- /*
- * Expected UUID of the clock, if `type`is CLOCK_EXPECTATION_ORIGIN_OTHER_UUID.
- *
- * If the clock's origin is the unix epoch, the UUID is
- * irrelevant (as the clock will be correlatable with other
- * clocks having the same origin).
- */
- bt_uuid_t uuid;
+
+ union {
+ /*
+ * Expected UUID of the clock, if `type`is
+ * CLOCK_EXPECTATION_ORIGIN_OTHER_UUID.
+ *
+ * If the clock's origin is the unix epoch, the UUID is
+ * irrelevant (as the clock will be correlatable with other
+ * clocks having the same origin).
+ */
+ bt_uuid_t uuid;
+
+ /*
+ * Expected clock class, if `type` is
+ * CLOCK_EXPECTATION_ORIGIN_OTHER_NO_UUID.
+ *
+ * If the first clock class seen has an unknown origin
+ * and no UUID, then all subsequent clock classes seen
+ * must be the same instance.
+ *
+ * To make sure that the clock class pointed by this
+ * field doesn't get freed and another one reallocated
+ * at the same address (which could potentially bypass
+ * the clock expectation check), we keep a strong
+ * reference, ensuring that the clock class lives at
+ * least as long as the iterator.
+ */
+ const bt_clock_class *clock_class;
+ };
} clock_expectation;
BT_IF_DEV_MODE(GHashTable *per_stream_state);