Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hal] Raise SIGKILL instead of calling abort() #6427

Merged
merged 2 commits into from
Mar 11, 2024
Merged

[hal] Raise SIGKILL instead of calling abort() #6427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0530302
[hal] Raise SIGILL instead of calling abort()
PeterJohnson Mar 11, 2024
948db29
Formatting fixes
github-actions[bot] Mar 11, 2024
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
7 changes: 5 additions & 2 deletions hal/src/main/native/cpp/jni/HAL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@

#include <jni.h>

#ifdef __FRC_ROBORIO__
#include <signal.h>
#endif

#include <cassert>
#include <cstdlib>
#include <cstring>

#include <fmt/format.h>
Expand Down Expand Up @@ -93,7 +96,7 @@ Java_edu_wpi_first_hal_HAL_terminate
(JNIEnv*, jclass)
{
#ifdef __FRC_ROBORIO__
std::abort();
::raise(SIGILL);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's SIGILL, not SIGKILL? (the K is missing)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, typo. Thanks for catching this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to help!

#endif
}

Expand Down
Loading