patch 8.2.5113: timer becomes invalid after fork/exec, :gui gives errors
Problem: Timer becomes invalid after fork/exec, :gui gives errors. (Gabriel
Dupras)
Solution: Delete the timer befor forking. (closes #10584)
diff --git a/src/gui.c b/src/gui.c
index 68c64d2..4408545 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -226,6 +226,11 @@
int exit_status;
pid_t pid = -1;
+#if defined(FEAT_RELTIME) && defined(HAVE_TIMER_CREATE)
+ // a timer is not carried forward
+ delete_timer();
+#endif
+
// Setup a pipe between the child and the parent, so that the parent
// knows when the child has done the setsid() call and is allowed to
// exit.
diff --git a/src/os_unix.c b/src/os_unix.c
index 766deac..6fd2450 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -8247,7 +8247,7 @@
#endif // USE_XSMP
#if defined(FEAT_RELTIME) || defined(PROTO)
-# if defined(HAVE_TIMER_CREATE)
+# if defined(HAVE_TIMER_CREATE) || defined(PROTO)
/*
* Implement timeout with timer_create() and timer_settime().
*/
@@ -8331,6 +8331,19 @@
return &timeout_flag;
}
+/*
+ * To be used before fork/exec: delete any created timer.
+ */
+ void
+delete_timer(void)
+{
+ if (timer_created)
+ {
+ timer_delete(timer_id);
+ timer_created = FALSE;
+ }
+}
+
# else
/*
diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index 91024b1..268f3bf 100644
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -88,4 +88,5 @@
void xsmp_close(void);
void stop_timeout(void);
const int *start_timeout(long msec);
+void delete_timer(void);
/* vim: set ft=c : */
diff --git a/src/version.c b/src/version.c
index 66b03c3..bfa9c5a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5113,
+/**/
5112,
/**/
5111,