Skip to content

Use g_unix_signal_add instead of sigaction #109

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

Merged
isak-jakobsson merged 2 commits into from
Nov 12, 2024
Merged

Use g_unix_signal_add instead of sigaction #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d1f770
Use g_unix_signal_add instead of sigaction
isak-jakobsson Nov 8, 2024
1b7e036
Use GINT_TO_POINTER for type conversion
isak-jakobsson Nov 12, 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
18 changes: 6 additions & 12 deletions src/acap_runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

#include <getopt.h>
#include <glib-unix.h>
#include <glib.h>
#include <grpcpp/grpcpp.h>
#include <sys/stat.h>
Expand Down Expand Up @@ -53,28 +54,21 @@ static GMainLoop* loop = NULL;
*
* @param signal_num Signal number.
*/
static void handle_signals(__attribute__((unused)) int signal_num) {
switch (signal_num) {
static gboolean handle_signals(gpointer signal_num) {
switch (GPOINTER_TO_INT(signal_num)) {
case SIGINT:
case SIGTERM:
case SIGQUIT:
g_main_loop_quit(loop);
}
return G_SOURCE_REMOVE;
}

/**
* @brief Initialize signals
*/
static void init_signals(void) {
struct sigaction sa;

sa.sa_flags = 0;

sigemptyset(&sa.sa_mask);
sa.sa_handler = handle_signals;
sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
sigaction(SIGQUIT, &sa, NULL);
g_unix_signal_add(SIGINT, handle_signals, GINT_TO_POINTER(SIGINT));
g_unix_signal_add(SIGTERM, handle_signals, GINT_TO_POINTER(SIGTERM));
}

// Initialize acap-runtime and start gRPC service
Expand Down