Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions msgq/visionipc/visionipc_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ VisionIpcClient::VisionIpcClient(std::string name, VisionStreamType type, bool c
}

// Connect is not thread safe. Do not use the buffers while calling connect
bool VisionIpcClient::connect(bool blocking){
bool VisionIpcClient::connect(bool blocking) {
connected = false;

// Cleanup old buffers on reconnect
for (size_t i = 0; i < num_buffers; i++){
for (size_t i = 0; i < num_buffers; i++) {
if (buffers[i].free() != 0) {
LOGE("Failed to free buffer %zu", i);
}
Expand Down Expand Up @@ -66,7 +66,7 @@ bool VisionIpcClient::connect(bool blocking){
assert(r == sizeof(VisionBuf) * num_buffers);

// Import buffers
for (size_t i = 0; i < num_buffers; i++){
for (size_t i = 0; i < num_buffers; i++) {
buffers[i] = bufs[i];
buffers[i].fd = fds[i];
buffers[i].import();
Expand All @@ -80,15 +80,15 @@ bool VisionIpcClient::connect(bool blocking){
return true;
}

VisionBuf * VisionIpcClient::recv(VisionIpcBufExtra * extra, const int timeout_ms){
VisionBuf * VisionIpcClient::recv(VisionIpcBufExtra * extra, const int timeout_ms) {
auto p = poller->poll(timeout_ms);

if (!p.size()){
if (!p.size()) {
return nullptr;
}

Message * r = sock->receive(true);
if (r == nullptr){
if (r == nullptr) {
return nullptr;
}

Expand All @@ -105,7 +105,7 @@ VisionBuf * VisionIpcClient::recv(VisionIpcBufExtra * extra, const int timeout_m

VisionBuf * buf = &buffers[packet->idx];

if (buf->server_id != packet->server_id){
if (buf->server_id != packet->server_id) {
connected = false;
delete r;
return nullptr;
Expand Down Expand Up @@ -147,8 +147,8 @@ std::set<VisionStreamType> VisionIpcClient::getAvailableStreams(const std::strin
return std::set<VisionStreamType>(available_streams, available_streams + r / sizeof(VisionStreamType));
}

VisionIpcClient::~VisionIpcClient(){
for (size_t i = 0; i < num_buffers; i++){
VisionIpcClient::~VisionIpcClient() {
for (size_t i = 0; i < num_buffers; i++) {
if (buffers[i].free() != 0) {
LOGE("Failed to free buffer %zu", i);
}
Expand Down
Loading