Set context to defined value OnRun
The context for the eventloop is currently not set to
anything when entering an OnRun callback. The context
are now set to some known value for simulated and real
time when entering OnRun callback.
While we are here, I noticed that the *remote* uuid was set to the local
UUID in timers. That makes no sense, so stop doing that.
Change-Id: I2c227a7e9742b092c9079549aad341154460ff11
Signed-off-by: Austin Schuh <austin.schuh@bluerivertech.com>
diff --git a/aos/ipc_lib/lockless_queue.cc b/aos/ipc_lib/lockless_queue.cc
index 98701b4..fe86f6c 100644
--- a/aos/ipc_lib/lockless_queue.cc
+++ b/aos/ipc_lib/lockless_queue.cc
@@ -908,7 +908,7 @@
const char *data, size_t length,
monotonic_clock::time_point monotonic_remote_time,
realtime_clock::time_point realtime_remote_time,
- uint32_t remote_queue_index, const UUID &remote_boot_uuid,
+ uint32_t remote_queue_index, const UUID &source_boot_uuid,
monotonic_clock::time_point *monotonic_sent_time,
realtime_clock::time_point *realtime_sent_time, uint32_t *queue_index) {
CHECK_LE(length, size());
@@ -917,14 +917,14 @@
// adhere to this convention and place it at the end.
memcpy((reinterpret_cast<char *>(Data()) + size() - length), data, length);
return Send(length, monotonic_remote_time, realtime_remote_time,
- remote_queue_index, remote_boot_uuid, monotonic_sent_time,
+ remote_queue_index, source_boot_uuid, monotonic_sent_time,
realtime_sent_time, queue_index);
}
bool LocklessQueueSender::Send(
size_t length, monotonic_clock::time_point monotonic_remote_time,
realtime_clock::time_point realtime_remote_time,
- uint32_t remote_queue_index, const UUID &remote_boot_uuid,
+ uint32_t remote_queue_index, const UUID &source_boot_uuid,
monotonic_clock::time_point *monotonic_sent_time,
realtime_clock::time_point *realtime_sent_time, uint32_t *queue_index) {
const size_t queue_size = memory_->queue_size();
@@ -949,7 +949,7 @@
// Pass these through. Any alternative behavior can be implemented out a
// layer.
message->header.remote_queue_index = remote_queue_index;
- message->header.remote_boot_uuid = remote_boot_uuid;
+ message->header.source_boot_uuid = source_boot_uuid;
message->header.monotonic_remote_time = monotonic_remote_time;
message->header.realtime_remote_time = realtime_remote_time;
@@ -1210,7 +1210,7 @@
realtime_clock::time_point *realtime_sent_time,
monotonic_clock::time_point *monotonic_remote_time,
realtime_clock::time_point *realtime_remote_time,
- uint32_t *remote_queue_index, UUID *remote_boot_uuid, size_t *length,
+ uint32_t *remote_queue_index, UUID *source_boot_uuid, size_t *length,
char *data) const {
const size_t queue_size = memory_->queue_size();
@@ -1294,7 +1294,7 @@
}
*monotonic_remote_time = m->header.monotonic_remote_time;
*realtime_remote_time = m->header.realtime_remote_time;
- *remote_boot_uuid = m->header.remote_boot_uuid;
+ *source_boot_uuid = m->header.source_boot_uuid;
if (data) {
memcpy(data, m->data(memory_->message_data_size()),
memory_->message_data_size());
diff --git a/aos/ipc_lib/lockless_queue.h b/aos/ipc_lib/lockless_queue.h
index 41aa0fb..b0fc425 100644
--- a/aos/ipc_lib/lockless_queue.h
+++ b/aos/ipc_lib/lockless_queue.h
@@ -94,7 +94,7 @@
uint32_t remote_queue_index;
// Remote boot UUID for this message.
- UUID remote_boot_uuid;
+ UUID source_boot_uuid;
size_t length;
} header;
@@ -309,7 +309,7 @@
void *Data();
bool Send(size_t length, monotonic_clock::time_point monotonic_remote_time,
realtime_clock::time_point realtime_remote_time,
- uint32_t remote_queue_index, const UUID &remote_boot_uuid,
+ uint32_t remote_queue_index, const UUID &source_boot_uuid,
monotonic_clock::time_point *monotonic_sent_time = nullptr,
realtime_clock::time_point *realtime_sent_time = nullptr,
uint32_t *queue_index = nullptr);
@@ -318,7 +318,7 @@
bool Send(const char *data, size_t length,
monotonic_clock::time_point monotonic_remote_time,
realtime_clock::time_point realtime_remote_time,
- uint32_t remote_queue_index, const UUID &remote_boot_uuid,
+ uint32_t remote_queue_index, const UUID &source_boot_uuid,
monotonic_clock::time_point *monotonic_sent_time = nullptr,
realtime_clock::time_point *realtime_sent_time = nullptr,
uint32_t *queue_index = nullptr);
@@ -404,7 +404,7 @@
realtime_clock::time_point *realtime_sent_time,
monotonic_clock::time_point *monotonic_remote_time,
realtime_clock::time_point *realtime_remote_time,
- uint32_t *remote_queue_index, UUID *remote_boot_uuid,
+ uint32_t *remote_queue_index, UUID *source_boot_uuid,
size_t *length, char *data) const;
// Returns the index to the latest queue message. Returns empty_queue_index()
diff --git a/aos/ipc_lib/lockless_queue_death_test.cc b/aos/ipc_lib/lockless_queue_death_test.cc
index b521d9e..ae780b8 100644
--- a/aos/ipc_lib/lockless_queue_death_test.cc
+++ b/aos/ipc_lib/lockless_queue_death_test.cc
@@ -622,14 +622,14 @@
monotonic_clock::time_point monotonic_remote_time;
realtime_clock::time_point realtime_remote_time;
uint32_t remote_queue_index;
- UUID remote_boot_uuid;
+ UUID source_boot_uuid;
char read_data[1024];
size_t length;
LocklessQueueReader::Result read_result = reader.Read(
i, &monotonic_sent_time, &realtime_sent_time,
&monotonic_remote_time, &realtime_remote_time,
- &remote_queue_index, &remote_boot_uuid, &length, &(read_data[0]));
+ &remote_queue_index, &source_boot_uuid, &length, &(read_data[0]));
if (read_result != LocklessQueueReader::Result::GOOD) {
if (read_result == LocklessQueueReader::Result::TOO_OLD) {
diff --git a/aos/ipc_lib/lockless_queue_test.cc b/aos/ipc_lib/lockless_queue_test.cc
index 91f995b..57867e4 100644
--- a/aos/ipc_lib/lockless_queue_test.cc
+++ b/aos/ipc_lib/lockless_queue_test.cc
@@ -251,7 +251,7 @@
monotonic_clock::time_point monotonic_remote_time;
realtime_clock::time_point realtime_remote_time;
uint32_t remote_queue_index;
- UUID remote_boot_uuid;
+ UUID source_boot_uuid;
char read_data[1024];
size_t length;
@@ -264,7 +264,7 @@
LocklessQueueReader::Result read_result = reader.Read(
index.index(), &monotonic_sent_time, &realtime_sent_time,
&monotonic_remote_time, &realtime_remote_time, &remote_queue_index,
- &remote_boot_uuid, &length, &(read_data[0]));
+ &source_boot_uuid, &length, &(read_data[0]));
// This should either return GOOD, or TOO_OLD if it is before the start of
// the queue.
diff --git a/aos/ipc_lib/queue_racer.cc b/aos/ipc_lib/queue_racer.cc
index cf46807..d14a638 100644
--- a/aos/ipc_lib/queue_racer.cc
+++ b/aos/ipc_lib/queue_racer.cc
@@ -267,7 +267,7 @@
realtime_clock::time_point realtime_sent_time;
monotonic_clock::time_point monotonic_remote_time;
realtime_clock::time_point realtime_remote_time;
- UUID remote_boot_uuid;
+ UUID source_boot_uuid;
uint32_t remote_queue_index;
size_t length;
char read_data[1024];
@@ -279,7 +279,7 @@
LocklessQueueReader::Result read_result = reader.Read(
wrapped_i, &monotonic_sent_time, &realtime_sent_time,
&monotonic_remote_time, &realtime_remote_time, &remote_queue_index,
- &remote_boot_uuid, &length, &(read_data[0]));
+ &source_boot_uuid, &length, &(read_data[0]));
if (race_reads) {
if (read_result == LocklessQueueReader::Result::NOTHING_NEW) {
@@ -302,7 +302,7 @@
EXPECT_EQ(monotonic_remote_time, aos::monotonic_clock::min_time);
EXPECT_EQ(realtime_remote_time, aos::realtime_clock::min_time);
- EXPECT_EQ(remote_boot_uuid, UUID::Zero());
+ EXPECT_EQ(source_boot_uuid, UUID::Zero());
ThreadPlusCount tpc;
ASSERT_EQ(length, sizeof(ThreadPlusCount));