fixed various workarounds for build(ish) issues better
diff --git a/aos/common/queue_testutils.cc b/aos/common/queue_testutils.cc
index 4e62dcd..1b9b731 100644
--- a/aos/common/queue_testutils.cc
+++ b/aos/common/queue_testutils.cc
@@ -50,7 +50,7 @@
}
virtual void HandleMessage(const LogMessage &message) override {
- if (!logging::log_gt_important(WARNING, message.level)) {
+ if (message.level == FATAL) {
logging::internal::PrintMessage(stdout, message);
}
diff --git a/aos/linux_code/ipc_lib/queue.cc b/aos/linux_code/ipc_lib/queue.cc
index 4025554..7c19b30 100644
--- a/aos/linux_code/ipc_lib/queue.cc
+++ b/aos/linux_code/ipc_lib/queue.cc
@@ -563,12 +563,4 @@
return r;
}
-bool RawQueue::IsDebug() {
-#if AOS_DEBUG
- return true;
-#else
- return false;
-#endif
-}
-
} // namespace aos
diff --git a/aos/linux_code/ipc_lib/queue.h b/aos/linux_code/ipc_lib/queue.h
index 52d610e..5edce62 100644
--- a/aos/linux_code/ipc_lib/queue.h
+++ b/aos/linux_code/ipc_lib/queue.h
@@ -122,11 +122,6 @@
// only 1 task is using this object (ie in tests).
int FreeMessages() const;
- // Returns whether this is using the queue code compiled for debugging (used
- // by the tests etc) or not (used by everything else because it uses
- // noticeably less CPU).
- static bool IsDebug();
-
private:
struct MessageHeader;
diff --git a/aos/linux_code/ipc_lib/raw_queue_test.cc b/aos/linux_code/ipc_lib/raw_queue_test.cc
index fecf488..67b687a 100644
--- a/aos/linux_code/ipc_lib/raw_queue_test.cc
+++ b/aos/linux_code/ipc_lib/raw_queue_test.cc
@@ -316,10 +316,6 @@
constexpr time::Time RawQueueTest::kHangTime;
constexpr time::Time RawQueueTest::kForkSleep;
-TEST_F(RawQueueTest, Basic) {
- EXPECT_TRUE(RawQueue::IsDebug());
-}
-
TEST_F(RawQueueTest, Reading) {
RawQueue *const queue = RawQueue::Fetch("Queue", sizeof(TestMessage), 1, 1);
MessageArgs args{queue, 0, -1};
diff --git a/bbb_cape/src/bbb/packet_finder.cc b/bbb_cape/src/bbb/packet_finder.cc
index 4ddb0e3..d435c84 100644
--- a/bbb_cape/src/bbb/packet_finder.cc
+++ b/bbb_cape/src/bbb/packet_finder.cc
@@ -55,7 +55,7 @@
LOG(ERROR, "ReadBytes(%p, %zd) failed with %d: %s\n",
buf_ + already_read, to_read, errno, strerror(errno));
} else if (new_bytes == -2) {
- LOG(INFO, "timed out\n");
+ LOG(WARNING, "timed out\n");
} else {
LOG(WARNING, "bad ByteReader %p returned %zd\n", reader_, new_bytes);
}
@@ -76,7 +76,7 @@
WEXITSTATUS(chrt_result));
}
} else {
- LOG(INFO, "not root, so not increasing priority of the IRQ\n");
+ LOG(WARNING, "not root, so not increasing priority of the IRQ\n");
}
irq_priority_increased_ = true;
@@ -116,7 +116,7 @@
bad_checksum_.Print();
if (unstuffed == 0) {
- if (kDebugLogs) LOG(INFO, "invalid\n");
+ if (kDebugLogs) LOG(WARNING, "invalid\n");
LOG_INTERVAL(invalid_packet_);
return false;
} else if (unstuffed != (packet_size_ - 4) / 4) {
@@ -132,7 +132,7 @@
reinterpret_cast<uint8_t *>(unstuffed_data_), packet_size_ - 8);
if (sent_checksum != calculated_checksum) {
if (kDebugLogs) {
- LOG(INFO, "sent %" PRIx32 " not %" PRIx32 "\n", sent_checksum,
+ LOG(WARNING, "sent %" PRIx32 " not %" PRIx32 "\n", sent_checksum,
calculated_checksum);
}
LOG_INTERVAL(bad_checksum_);
diff --git a/bbb_cape/src/bbb/packet_finder.h b/bbb_cape/src/bbb/packet_finder.h
index e8816b1..15ce6b8 100644
--- a/bbb_cape/src/bbb/packet_finder.h
+++ b/bbb_cape/src/bbb/packet_finder.h
@@ -79,9 +79,9 @@
static constexpr ::aos::time::Time kDebugLogInterval =
::aos::time::Time::InSeconds(0.3);
SimpleLogInterval invalid_packet_ =
- SimpleLogInterval(kDebugLogInterval, INFO, "invalid packet");
+ SimpleLogInterval(kDebugLogInterval, WARNING, "invalid packet");
SimpleLogInterval bad_checksum_ =
- SimpleLogInterval(kDebugLogInterval, INFO, "bad checksum");
+ SimpleLogInterval(kDebugLogInterval, WARNING, "bad checksum");
DISALLOW_COPY_AND_ASSIGN(PacketFinder);
};