From 519787e1e4a3f2c33f0f06c2c760ad5c8194d0f1 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 24 Mar 2016 10:46:01 +0100 Subject: [PATCH] core: accept zero @wait_before_kill_msec in nm_utils_kill_process_sync() A zero @wait_before_kill_msec argument should disable the generation of a SIGKILL signal (after a different signal has been sent). --- src/nm-core-utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index c9d77a8dc..1a6d00f97 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -1009,7 +1009,6 @@ nm_utils_kill_process_sync (pid_t pid, guint64 start_time, int sig, NMLogDomain g_return_if_fail (pid > 0); g_return_if_fail (log_name != NULL); - g_return_if_fail (wait_before_kill_msec > 0); start_time0 = nm_utils_get_start_time_for_pid (pid, &p_state, NULL); if (start_time0 == 0) { @@ -1047,12 +1046,12 @@ nm_utils_kill_process_sync (pid_t pid, guint64 start_time, int sig, NMLogDomain return; } - /* wait for the process to terminated... */ + /* wait for the process to terminate... */ wait_start_us = nm_utils_get_monotonic_timestamp_us (); sleep_duration_usec = _sleep_duration_convert_ms_to_us (sleep_duration_msec); - if (sig != SIGKILL) + if (sig != SIGKILL && wait_before_kill_msec) wait_until_sigkill = wait_start_us + (((gint64) wait_before_kill_msec) * 1000L); else wait_until_sigkill = 0; -- 2.17.1