Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

HAL: wait for all objects to release handle before freeing (#1011)

Browse Source 
This avoids a race on free.
This commit is contained in:
Thad House
2018-05-01 19:26:25 -07:00
committed by Peter Johnson
parent 6a159c5bd2
commit f7bcf53059
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hal/src/main/native/athena/DIO.cpp
View File

@@ -7,9 +7,13 @@
#include "HAL/DIO.h"
#include <wpi/raw_ostream.h>
#include <cmath>
#include <thread>
#include "DigitalInternal.h"
#include "HAL/cpp/fpga_clock.h"
#include "HAL/handles/HandlesInternal.h"
#include "HAL/handles/LimitedHandleResource.h"
#include "PortsInternal.h"
@@ -124,8 +128,21 @@ HAL_Bool HAL_CheckDIOChannel(int32_t channel) {
void HAL_FreeDIOPort(HAL_DigitalHandle dioPortHandle) {
auto port = digitalChannelHandles->Get(dioPortHandle, HAL_HandleEnum::DIO);
// no status, so no need to check for a proper free.
digitalChannelHandles->Free(dioPortHandle, HAL_HandleEnum::DIO);
if (port == nullptr) return;
digitalChannelHandles->Free(dioPortHandle, HAL_HandleEnum::DIO);
// Wait for no other object to hold this handle.
auto start = hal::fpga_clock::now();
while (port.use_count() != 1) {
auto current = hal::fpga_clock::now();
if (start + std::chrono::seconds(1) < current) {
wpi::outs() << "DIO handle free timeout\n";
wpi::outs().flush();
break;
}
std::this_thread::yield();
}
int32_t status = 0;
std::lock_guard<wpi::mutex> lock(digitalDIOMutex);
if (port->channel >= kNumDigitalHeaders + kNumDigitalMXPChannels) {