Skip to content

Commit

Permalink
[wpiutil, hal] Crash on failure for SetupNowRio() and wpi::Now() when…
Browse files Browse the repository at this point in the history
… not configured (wpilibsuite#6417)

This is an unrecoverable condition, so always terminate.
  • Loading branch information
ThadHouse authored Mar 8, 2024
1 parent e64c203 commit c19ee8b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
8 changes: 8 additions & 0 deletions hal/src/main/native/athena/HAL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
17 changes: 8 additions & 9 deletions wpiutil/src/main/native/cpp/timestamp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit c19ee8b

Please sign in to comment.