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

[wpiutil, hal] Crash on failure for SetupNowRio() and wpi::Now() when not configured (#6417)

Browse Source 
This is an unrecoverable condition, so always terminate.
This commit is contained in:
Thad House
2024-03-08 00:26:53 -08:00
committed by GitHub
parent e64c20346d
commit c19ee8b0fe
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hal/src/main/native/athena/HAL.cpp
View File

@@ -594,6 +594,14 @@ HAL_Bool HAL_Initialize(int32_t timeout, int32_t mode) {
});
if (!SetupNowRio()) {
fmt::print(stderr,
"Failed to run SetupNowRio(). This is a fatal error. The "
"process is being terminated.\n");
std::fflush(stderr);
// Attempt to force a segfault to get a better java log
*reinterpret_cast<int*>(0) = 0;
// If that fails, terminate
std::terminate();
return false;
}

17
wpiutil/src/main/native/cpp/timestamp.cpp
View File

@@ -273,15 +273,14 @@ uint64_t wpi::Now() {
if (nowUseDefaultOnFailure.test()) {
return timestamp() - offset_val;
} else {
static uint64_t last = 0;
uint64_t cur = timestamp();
if ((cur - last) > 100000) {
last = cur;
fmt::print(stderr,
"FPGA not yet configured in wpi::Now(). Time will not be "
"correct.\n");
std::fflush(stderr);
}
fmt::print(stderr,
"FPGA not yet configured in wpi::Now(). This is a fatal "
"error. The process is being terminated.\n");
std::fflush(stderr);
// Attempt to force a segfault to get a better java log
*reinterpret_cast<int*>(0) = 0;
// If that fails, terminate
std::terminate();
return 1;
}
}