Merge pull request #6598 from kyle-walker/shutdown-limit

core: Limit the time and attempts in shutdown remount/umount efforts
2017-12-14 22:57:57 +01:00
parent e3140015a7 73ad712fcf
commit f78a88beca
4 changed files with 266 additions and 32 deletions
@@ -33,6 +33,7 @@
 #include "format-util.h"
 #include "ioprio.h"
 #include "macro.h"
+#include "time-util.h"

 #define procfs_file_alloca(pid, field)                                  \
        ({                                                              \
@@ -61,6 +62,7 @@ int get_process_ppid(pid_t pid, pid_t *ppid);

 int wait_for_terminate(pid_t pid, siginfo_t *status);
 int wait_for_terminate_and_warn(const char *name, pid_t pid, bool check_exit_code);
+int wait_for_terminate_with_timeout(pid_t pid, usec_t timeout);

 void sigkill_wait(pid_t pid);
 void sigkill_waitp(pid_t *pid);