Remove easy uses of //aos/mutex
I was hoping to get rid of it completely as one of the nontrivial users
of AOS_LOG, but need to write a compatible condition variable first.
Change-Id: I86c1c4084882bf789baabd0255e115d821154830
diff --git a/aos/testing/test_logging.cc b/aos/testing/test_logging.cc
index b5b71ff..6024a80 100644
--- a/aos/testing/test_logging.cc
+++ b/aos/testing/test_logging.cc
@@ -9,7 +9,7 @@
#include "absl/base/call_once.h"
#include "aos/logging/implementations.h"
-#include "aos/mutex/mutex.h"
+#include "aos/stl_mutex/stl_mutex.h"
#include "aos/thread_local.h"
using ::aos::logging::LogMessage;
@@ -36,13 +36,13 @@
// Clears out all of the messages already recorded.
void ClearMessages() {
- ::aos::MutexLocker locker(&messages_mutex_);
+ std::unique_lock<aos::stl_mutex> locker(messages_mutex_);
messages_.clear();
}
// Prints out all of the messages (like when a test fails).
void PrintAllMessages() {
- ::aos::MutexLocker locker(&messages_mutex_);
+ std::unique_lock<aos::stl_mutex> locker(messages_mutex_);
for (auto it = messages_.begin(); it != messages_.end(); ++it) {
logging::internal::PrintMessage(stdout, *it);
}
@@ -69,7 +69,7 @@
private:
virtual void HandleMessage(const LogMessage &message) override {
- ::aos::MutexLocker locker(&messages_mutex_);
+ std::unique_lock<aos::stl_mutex> locker(messages_mutex_);
if (message.level == FATAL || print_as_messages_come_in_) {
logging::internal::PrintMessage(output_file_, message);
}
@@ -80,7 +80,7 @@
::std::vector<LogMessage> messages_;
bool print_as_messages_come_in_ = false;
FILE *output_file_ = stdout;
- ::aos::Mutex messages_mutex_;
+ aos::stl_mutex messages_mutex_;
};
class MyTestEventListener : public ::testing::EmptyTestEventListener {