Prefix LOG and CHECK with AOS_
This prepares us for introducing glog more widely and transitioning
things over where they make sense.
Change-Id: Ic6c208882407bc2153fe875ffc736d66f5c8ade5
diff --git a/aos/events/BUILD b/aos/events/BUILD
index ef033f8..b69fc66 100644
--- a/aos/events/BUILD
+++ b/aos/events/BUILD
@@ -4,8 +4,8 @@
hdrs = ["epoll.h"],
visibility = ["//visibility:public"],
deps = [
- "//aos/logging",
"//aos/time",
+ "@com_github_google_glog//:glog",
],
)
diff --git a/aos/events/epoll.cc b/aos/events/epoll.cc
index 83f44c3..3da04cf 100644
--- a/aos/events/epoll.cc
+++ b/aos/events/epoll.cc
@@ -7,8 +7,8 @@
#include <atomic>
#include <vector>
-#include "aos/logging/logging.h"
#include "aos/time/time.h"
+#include "glog/logging.h"
namespace aos {
namespace internal {
@@ -19,6 +19,8 @@
Disable();
}
+TimerFd::~TimerFd() { PCHECK(close(fd_) == 0); }
+
void TimerFd::SetTime(monotonic_clock::time_point start,
monotonic_clock::duration interval) {
struct itimerspec new_value;
@@ -56,7 +58,8 @@
DeleteFd(quit_epoll_fd_);
close(quit_signal_fd_);
close(quit_epoll_fd_);
- CHECK_EQ(fns_.size(), 0u);
+ CHECK_EQ(fns_.size(), 0u)
+ << ": Not all file descriptors were unregistered before shutting down.";
close(epoll_fd_);
}
@@ -96,14 +99,15 @@
struct epoll_event event;
event.events = EPOLLIN | EPOLLPRI;
event.data.ptr = event_data.get();
- PCHECK(epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, fd, &event) != 0);
+ PCHECK(epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, fd, &event) == 0)
+ << ": Failed to add fd " << fd;
fns_.push_back(::std::move(event_data));
}
// Removes fd from the event loop.
void EPoll::DeleteFd(int fd) {
auto element = fns_.begin();
- PCHECK(epoll_ctl(epoll_fd_, EPOLL_CTL_DEL, fd, nullptr) != 0);
+ PCHECK(epoll_ctl(epoll_fd_, EPOLL_CTL_DEL, fd, nullptr) == 0);
while (fns_.end() != element) {
if (element->get()->fd == fd) {
fns_.erase(element);
@@ -111,7 +115,7 @@
}
++element;
}
- LOG(FATAL, "fd %d not found\n", fd);
+ LOG(FATAL) << "fd " << fd << " not found";
}
} // namespace internal
diff --git a/aos/events/epoll.h b/aos/events/epoll.h
index 29311c9..f6ebe95 100644
--- a/aos/events/epoll.h
+++ b/aos/events/epoll.h
@@ -8,7 +8,6 @@
#include <atomic>
#include <vector>
-#include "aos/logging/logging.h"
#include "aos/time/time.h"
namespace aos {
@@ -18,7 +17,7 @@
class TimerFd {
public:
TimerFd();
- ~TimerFd() { PCHECK(close(fd_) == 0); }
+ ~TimerFd();
TimerFd(const TimerFd &) = delete;
TimerFd &operator=(const TimerFd &) = delete;
diff --git a/aos/events/event-loop_param_test.cc b/aos/events/event-loop_param_test.cc
index 1dcc258..04343cc 100644
--- a/aos/events/event-loop_param_test.cc
+++ b/aos/events/event-loop_param_test.cc
@@ -5,7 +5,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "aos/logging/queue_logging.h"
+#include "glog/logging.h"
namespace aos {
namespace testing {
@@ -564,7 +564,7 @@
[×, &loop1, this](int count) {
EXPECT_EQ(count, 1);
times.push_back(loop1->monotonic_now());
- LOG(INFO, "%zu\n", times.size());
+ LOG(INFO) << times.size();
if (times.size() == kCount) {
this->Exit();
}
diff --git a/aos/events/shm-event-loop.cc b/aos/events/shm-event-loop.cc
index 4984f59..5034f0b 100644
--- a/aos/events/shm-event-loop.cc
+++ b/aos/events/shm-event-loop.cc
@@ -128,7 +128,7 @@
// Try joining. If we fail, we weren't asleep on the condition in the
// queue. So hit it again and again until that's true.
struct timespec end_time;
- PCHECK(clock_gettime(CLOCK_REALTIME, &end_time) == 0);
+ AOS_PCHECK(clock_gettime(CLOCK_REALTIME, &end_time) == 0);
while (true) {
void *retval = nullptr;
end_time.tv_nsec += 100000000;
@@ -138,7 +138,7 @@
}
int ret = pthread_timedjoin_np(pthread_, &retval, &end_time);
if (ret == ETIMEDOUT) continue;
- PCHECK(ret == 0);
+ AOS_PCHECK(ret == 0);
break;
}
}
@@ -146,11 +146,11 @@
// Starts the thread and waits until it is running.
void Start() {
- PCHECK(pthread_create(&pthread_, nullptr, &StaticRun, this) == 0);
+ AOS_PCHECK(pthread_create(&pthread_, nullptr, &StaticRun, this) == 0);
IPCRecursiveMutexLocker locker(&thread_started_mutex_);
if (locker.owner_died()) ::aos::Die("Owner died");
while (!running_) {
- CHECK(!thread_started_condition_.Wait());
+ AOS_CHECK(!thread_started_condition_.Wait());
}
}
diff --git a/aos/events/shm-event-loop_test.cc b/aos/events/shm-event-loop_test.cc
index 8af00f0..e0d0b49 100644
--- a/aos/events/shm-event-loop_test.cc
+++ b/aos/events/shm-event-loop_test.cc
@@ -22,9 +22,9 @@
return ::std::move(loop);
}
- void Run() override { CHECK_NOTNULL(primary_event_loop_)->Run(); }
+ void Run() override { AOS_CHECK_NOTNULL(primary_event_loop_)->Run(); }
- void Exit() override { CHECK_NOTNULL(primary_event_loop_)->Exit(); }
+ void Exit() override { AOS_CHECK_NOTNULL(primary_event_loop_)->Exit(); }
void SleepFor(::std::chrono::nanoseconds duration) override {
::std::this_thread::sleep_for(duration);
@@ -61,9 +61,9 @@
bool IsRealtime() {
int scheduler;
if ((scheduler = sched_getscheduler(0)) == -1) {
- PLOG(FATAL, "sched_getscheduler(0) failed\n");
+ AOS_PLOG(FATAL, "sched_getscheduler(0) failed\n");
}
- LOG(INFO, "scheduler is %d\n", scheduler);
+ AOS_LOG(INFO, "scheduler is %d\n", scheduler);
return scheduler == SCHED_FIFO || scheduler == SCHED_RR;
}
diff --git a/aos/events/simulated-event-loop.h b/aos/events/simulated-event-loop.h
index 0828382..2fcc9d1 100644
--- a/aos/events/simulated-event-loop.h
+++ b/aos/events/simulated-event-loop.h
@@ -148,7 +148,7 @@
EventScheduler *scheduler)
: type_(type), name_(name), scheduler_(scheduler){};
- ~SimulatedQueue() { CHECK_EQ(0u, fetchers_.size()); }
+ ~SimulatedQueue() { AOS_CHECK_EQ(0u, fetchers_.size()); }
// Makes a connected raw sender which calls Send below.
::std::unique_ptr<RawSender> MakeRawSender(EventLoop *event_loop);