Convert things from AOS logging to glog
This is necessary so ceres (which includes glog) can be included in more
places.
Change-Id: Ie0a54dc6a9e21e0c2f11899d08c87d08c5c0e028
diff --git a/aos/scoped/BUILD b/aos/scoped/BUILD
index 002026e..f5b3832 100644
--- a/aos/scoped/BUILD
+++ b/aos/scoped/BUILD
@@ -2,6 +2,9 @@
cc_library(
name = "scoped_fd",
+ srcs = [
+ "scoped_fd.cc",
+ ],
hdrs = [
"scoped_fd.h",
],
diff --git a/aos/scoped/scoped_fd.cc b/aos/scoped/scoped_fd.cc
new file mode 100644
index 0000000..a570df0
--- /dev/null
+++ b/aos/scoped/scoped_fd.cc
@@ -0,0 +1,15 @@
+#include "aos/scoped/scoped_fd.h"
+
+#include "aos/logging/logging.h"
+
+namespace aos {
+
+void ScopedFD::Close() {
+ if (fd_ != -1) {
+ if (close(fd_) == -1) {
+ PLOG(WARNING, "close(%d) failed", fd_);
+ }
+ }
+}
+
+} // namespace aos
diff --git a/aos/scoped/scoped_fd.h b/aos/scoped/scoped_fd.h
index 696cf3b..e098d2c 100644
--- a/aos/scoped/scoped_fd.h
+++ b/aos/scoped/scoped_fd.h
@@ -1,9 +1,8 @@
-#ifndef _AOS_SCOPED_FD_
-#define _AOS_SCOPED_FD_
+#ifndef AOS_SCOPED_SCOPED_FD_H_
+#define AOS_SCOPED_SCOPED_FD_H_
#include <unistd.h>
-#include "aos/logging/logging.h"
#include "aos/macros.h"
namespace aos {
@@ -29,16 +28,10 @@
private:
int fd_;
- void Close() {
- if (fd_ != -1) {
- if (close(fd_) == -1) {
- PLOG(WARNING, "close(%d) failed", fd_);
- }
- }
- }
+ void Close();
DISALLOW_COPY_AND_ASSIGN(ScopedFD);
};
} // namespace aos
-#endif // _AOS_SCOPED_FD_
+#endif // AOS_SCOPED_SCOPED_FD_H_
diff --git a/aos/util/BUILD b/aos/util/BUILD
index af6faf5..7b50f49 100644
--- a/aos/util/BUILD
+++ b/aos/util/BUILD
@@ -295,6 +295,7 @@
"file.h",
],
deps = [
+ "//aos/logging",
"//aos/scoped:scoped_fd",
],
)
diff --git a/aos/util/file.cc b/aos/util/file.cc
index dc31ddd..f952955 100644
--- a/aos/util/file.cc
+++ b/aos/util/file.cc
@@ -3,6 +3,7 @@
#include <fcntl.h>
#include <unistd.h>
+#include "aos/logging/logging.h"
#include "aos/scoped/scoped_fd.h"
namespace aos {
diff --git a/aos/vision/blob/BUILD b/aos/vision/blob/BUILD
index 81afb93..7d5f930 100644
--- a/aos/vision/blob/BUILD
+++ b/aos/vision/blob/BUILD
@@ -18,9 +18,6 @@
cc_library(
name = "region_alloc",
hdrs = ["region_alloc.h"],
- deps = [
- "//aos/logging",
- ],
)
cc_library(
diff --git a/aos/vision/blob/region_alloc.h b/aos/vision/blob/region_alloc.h
index 8c7bc57..df33fed 100644
--- a/aos/vision/blob/region_alloc.h
+++ b/aos/vision/blob/region_alloc.h
@@ -9,8 +9,6 @@
#include <utility>
#include <vector>
-#include "aos/logging/logging.h"
-
namespace aos {
namespace vision {
@@ -22,12 +20,12 @@
T *cons_obj(Args &&... args) {
uint8_t *ptr = NULL;
if (sizeof(T) + alignof(T) > block_size_) {
- LOG(FATAL, "allocating %d too much\n", (int)sizeof(T));
+ __builtin_trap();
}
while (ptr == NULL) {
if (next_free_ >= memory_.size()) {
if (next_free_ >= 1024) {
- LOG(FATAL, "too much alloc\n");
+ __builtin_trap();
}
memory_.emplace_back(new uint8_t[block_size_]);
} else if ((used_size_ % alignof(T)) != 0) {
diff --git a/aos/vision/debug/BUILD b/aos/vision/debug/BUILD
index c550de7..05d93ad 100644
--- a/aos/vision/debug/BUILD
+++ b/aos/vision/debug/BUILD
@@ -26,8 +26,8 @@
gtk_dependent_cc_library(
name = "debug_framework",
srcs = [
- "blob_log-source.cc",
"aveugle-source.cc",
+ "blob_log-source.cc",
"camera-source.cc",
"debug_framework.cc",
"jpeg_list-source.cc",
@@ -45,10 +45,11 @@
"//aos/vision/events:epoll_events",
"//aos/vision/events:gtk_event",
"//aos/vision/events:tcp_client",
- "//aos/vision/image:image_stream",
"//aos/vision/image:image_dataset",
+ "//aos/vision/image:image_stream",
"//aos/vision/image:image_types",
"//aos/vision/image:jpeg_routines",
+ "@com_github_google_glog//:glog",
"@usr_repo//:gtk+-3.0",
],
alwayslink = 1,
diff --git a/aos/vision/debug/blob_log-source.cc b/aos/vision/debug/blob_log-source.cc
index 337a764..26706bb 100644
--- a/aos/vision/debug/blob_log-source.cc
+++ b/aos/vision/debug/blob_log-source.cc
@@ -12,6 +12,8 @@
#include "aos/vision/blob/stream_view.h"
#include "aos/vision/debug/overlay.h"
+#include "glog/logging.h"
+
namespace aos {
namespace vision {
@@ -52,7 +54,7 @@
InputFile(const std::string &fname)
: ifs_(fname, std::ifstream::in), len_(GetFileSize(fname)) {
if (len_ <= 0) {
- LOG(FATAL, "File (%s) not found. Size (%d)\n", fname.c_str(), (int)len_);
+ LOG(FATAL) << "File (" << fname << ") not found. Size (" << len_ << ")";
}
// assert(len_ > 0);
tmp_buf_.resize(len_, 0);
diff --git a/aos/vision/events/BUILD b/aos/vision/events/BUILD
index c05fc09..b887872 100644
--- a/aos/vision/events/BUILD
+++ b/aos/vision/events/BUILD
@@ -69,6 +69,7 @@
srcs = ["gtk_event.cc"],
deps = [
":epoll_events",
+ "//aos/logging",
"@usr_repo//:gtk+-3.0",
],
)
diff --git a/aos/vision/events/epoll_events.cc b/aos/vision/events/epoll_events.cc
index 0043b78..f6cba76 100644
--- a/aos/vision/events/epoll_events.cc
+++ b/aos/vision/events/epoll_events.cc
@@ -12,6 +12,18 @@
namespace aos {
namespace events {
+void EpollEvent::DirectEvent(uint32_t events) {
+ if ((events & ~(EPOLLIN | EPOLLPRI | EPOLLERR)) != 0) {
+ LOG(FATAL, "unexpected epoll events set in %x on %d\n", events, fd());
+ }
+ ReadEvent();
+}
+
+void EpollEvent::SetEvents(uint32_t events) {
+ events_ |= events;
+ CHECK(!loop_);
+}
+
EpollLoop::EpollLoop() : epoll_fd_(PCHECK(epoll_create1(0))) {}
void EpollLoop::Add(EpollEvent *event) {
diff --git a/aos/vision/events/epoll_events.h b/aos/vision/events/epoll_events.h
index 19851ed..c7aa1c6 100644
--- a/aos/vision/events/epoll_events.h
+++ b/aos/vision/events/epoll_events.h
@@ -75,20 +75,11 @@
virtual void ReadEvent() = 0;
// Handle Events directly from epoll.
- virtual void DirectEvent(uint32_t events) {
- if ((events & ~(EPOLLIN | EPOLLPRI | EPOLLERR)) != 0) {
- LOG(FATAL, "unexpected epoll events set in %x on %d\n",
- events, fd());
- }
- ReadEvent();
- }
+ virtual void DirectEvent(uint32_t events);
EpollLoop *loop() { return loop_; }
- void SetEvents(uint32_t events) {
- events_ |= events;
- CHECK(!loop_);
- }
+ void SetEvents(uint32_t events);
uint32_t events() const { return events_; }
diff --git a/aos/vision/events/gtk_event.cc b/aos/vision/events/gtk_event.cc
index 0c518e0..4ff9fde 100644
--- a/aos/vision/events/gtk_event.cc
+++ b/aos/vision/events/gtk_event.cc
@@ -6,6 +6,7 @@
#include <thread>
#include "aos/vision/events/epoll_events.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace events {
diff --git a/aos/vision/image/BUILD b/aos/vision/image/BUILD
index be702d7..21dbbb8 100644
--- a/aos/vision/image/BUILD
+++ b/aos/vision/image/BUILD
@@ -5,9 +5,6 @@
cc_library(
name = "image_types",
hdrs = ["image_types.h"],
- deps = [
- "//aos/logging",
- ],
)
cc_proto_library(
@@ -52,8 +49,10 @@
cc_library(
name = "image_stream",
+ srcs = ["image_stream.cc"],
hdrs = ["image_stream.h"],
deps = [
+ "//aos/logging",
"//aos/vision/events:epoll_events",
"//aos/vision/image:reader",
],
diff --git a/aos/vision/image/image_stream.cc b/aos/vision/image/image_stream.cc
new file mode 100644
index 0000000..1dba674
--- /dev/null
+++ b/aos/vision/image/image_stream.cc
@@ -0,0 +1,18 @@
+#include "aos/vision/image/image_stream.h"
+
+#include "aos/logging/logging.h"
+
+namespace aos {
+namespace vision {
+
+void ImageStreamEvent::ProcessHelper(
+ DataRef data, aos::monotonic_clock::time_point timestamp) {
+ if (data.size() < 300) {
+ LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
+ return;
+ }
+ ProcessImage(data, timestamp);
+}
+
+} // namespace vision
+} // namespace aos
diff --git a/aos/vision/image/image_stream.h b/aos/vision/image/image_stream.h
index 308d3ec..57e06cb 100644
--- a/aos/vision/image/image_stream.h
+++ b/aos/vision/image/image_stream.h
@@ -1,5 +1,5 @@
-#ifndef _AOS_VISION_IMAGE_IMAGE_STREAM_H_
-#define _AOS_VISION_IMAGE_IMAGE_STREAM_H_
+#ifndef AOS_VISION_IMAGE_IMAGE_STREAM_H_
+#define AOS_VISION_IMAGE_IMAGE_STREAM_H_
#include "aos/vision/events/epoll_events.h"
#include "aos/vision/image/camera_params.pb.h"
@@ -32,23 +32,18 @@
aos::vision::CameraParams params)
: ImageStreamEvent(GetCamera(fname, this, params)) {}
- void ProcessHelper(DataRef data, aos::monotonic_clock::time_point timestamp) {
- if (data.size() < 300) {
- LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
- return;
- }
- ProcessImage(data, timestamp);
- }
virtual void ProcessImage(DataRef data,
aos::monotonic_clock::time_point timestamp) = 0;
void ReadEvent() override { reader_->HandleFrame(); }
private:
+ void ProcessHelper(DataRef data, aos::monotonic_clock::time_point timestamp);
+
std::unique_ptr<::camera::Reader> reader_;
};
} // namespace vision
} // namespace aos
-#endif // _AOS_VISION_DEBUG_IMAGE_STREAM_H_
+#endif // AOS_VISION_IMAGE_IMAGE_STREAM_H_
diff --git a/aos/vision/image/image_types.h b/aos/vision/image/image_types.h
index c50400a..a620d8a 100644
--- a/aos/vision/image/image_types.h
+++ b/aos/vision/image/image_types.h
@@ -7,7 +7,6 @@
#include <sstream>
#include <experimental/string_view>
-#include "aos/logging/logging.h"
namespace aos {
namespace vision {
@@ -65,7 +64,7 @@
ImageType &get_px(int x, int y) const {
#ifndef NDEBUG
if (x < 0 || x >= fmt_.w || y < 0 || y >= fmt_.h) {
- LOG(FATAL, "%d, %d out of range [%dx %d]\n", x, y, fmt_.w, fmt_.h);
+ __builtin_trap();
}
#endif // NBOUNDSCHECK
return data_[(x + y * fmt_.w)];