summaryrefslogtreecommitdiff
path: root/desktop/unx/source/args.c
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-04 10:05:18 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-04 12:44:27 +0200
commit67a2317be8a46b3254475c689e8eca5e9acd45ab (patch)
treea563c2efce4bd54b47b3a0af094fa854bf071e10 /desktop/unx/source/args.c
parent59e5d2c8839ee6bf2bb237c0db4a618cb98b2dd9 (diff)
Revert "uitest: make child soffice process die when parent dies"
This reverts commit d35840a2111beafe018851314a624e268e3cde6a, now that 43aef04d77aafb9d055957642e62b559231f3711 "Reliably wait for soffice to terminate" makes sure that no soffice-related processes are left behind by UITests. Using PR_SET_PDEATHSIG had the following drawbacks: * It defeats debugging if a runaway process is forcefully killed by the test framework. (And there are already higher-layer mechanisms in place for the reliable termination of runaway tinderbox builds, see the commit message of 43aef04d77aafb9d055957642e62b559231f3711 mentioned above.) * It is brittle in that it can terminate soffice-related processes too early, as the signal is sent as soon as the parent's thread that spawned the child (and not the parent process as a whole) terminates. * It is Linux-only. Change-Id: Ia07f5dbaafc824bad0dfbdb1a2aabe6d5508741b Reviewed-on: https://gerrit.libreoffice.org/80186 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/unx/source/args.c')
-rw-r--r--desktop/unx/source/args.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index 81a8dbca4bb5..199b58a8e50e 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -9,10 +9,6 @@
#include <stdlib.h>
#include <string.h>
#include <osl/process.h>
-#ifdef LINUX
-#include <sys/prctl.h>
-#include <signal.h>
-#endif
#include "args.h"
@@ -125,15 +121,6 @@ Args *args_parse (void)
args->pPageinType = pArgDescr[j].pPageinType;
break;
}
- if (rtl_ustr_ascii_compare_WithLength(
- arg, length, "dont-survive-parent")
- == 0)
- {
-#ifdef LINUX
- prctl(PR_SET_PDEATHSIG, SIGKILL);
-#endif
- break;
- }
}
}