spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

latency_logging
Lukas Petersson 2022-03-24 16:23:18 -07:00
parent 0d989fb2e5 86139f0c52
commit eb4dd2cb6e
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selfdrive/camerad/cameras/camera_common.cc
View File

@ -148,7 +148,6 @@ CameraBuf::~CameraBuf() {
}
bool CameraBuf::acquire() {
LOGT("Start acquire camera buffer");
if (!safe_queue.try_pop(cur_buf_idx, 1)) return false;
if (camera_bufs_metadata[cur_buf_idx].frame_id == -1) {
@ -159,6 +158,7 @@ bool CameraBuf::acquire() {
cur_frame_data = camera_bufs_metadata[cur_buf_idx];
set_frame_id(cur_frame_data.frame_id);
LOGT("Start acquire camera buffer");
cur_rgb_buf = vipc_server->get_buffer(rgb_type);
cl_mem camrabuf_cl = camera_bufs[cur_buf_idx].buf_cl;
cl_event event;

2
selfdrive/common/swaglog.cc
View File

@ -67,7 +67,7 @@ class SwaglogState : public LogState {
static SwaglogState s = {};
void set_frame_id(uint32_t frame_id){
void set_frame_id(uint64_t frame_id){
s.ctx_j["frame_id"] = std::to_string(frame_id).c_str();
}

3
selfdrive/common/swaglog.h
View File

@ -13,8 +13,7 @@
void cloudlog_e(int levelnum, const char* filename, int lineno, const char* func,
const char* fmt, ...) /*__attribute__ ((format (printf, 6, 7)))*/;
void set_frame_id(uint32_t frame_id);
void set_frame_id(uint64_t frame_id);
#define cloudlog(lvl, fmt, ...) cloudlog_e(lvl, __FILE__, __LINE__, \
__func__, \