vim: src/ex_cmds2.c comparison

comparison src/ex_cmds2.c @ 10122:3db463d4df25 v7.4.2332

commit https://github.com/vim/vim/commit/75537a93e985ef32e6c267b06ce93629855dd983 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Sep 5 22:45:28 2016 +0200 patch 7.4.2332 Problem: Crash when stop_timer() is called in a callback of a callback. Vim hangs when the timer callback uses too much time. Solution: Set tr_id to -1 when a timer is to be deleted. Don't keep calling callbacks forever. (Ozaki Kiichi)

author	Christian Brabandt <cb@256bit.org>
date	Mon, 05 Sep 2016 23:00:07 +0200
parents	32bd4001e398
children	40f6ce4fe30e

comparison

equal deleted inserted replaced

-:02ba0b8a13fb
+:3db463d4df25
 # endif  /* FEAT_PROFILE || FEAT_RELTIME */
 # if defined(FEAT_TIMERS) || defined(PROTO)
 static timer_T	*first_timer = NULL;
-static int	last_timer_id = 0;
+static long	last_timer_id = 0;
-static timer_T	*current_timer = NULL;
+# ifdef WIN3264
-static int	free_current_timer = FALSE;
+#  define GET_TIMEDIFF(timer, now) \
+	(long)(((double)(timer->tr_due.QuadPart - now.QuadPart) \
+					   / (double)fr.QuadPart) * 1000);
+# else
+#  define GET_TIMEDIFF(timer, now) \
+	(timer->tr_due.tv_sec - now.tv_sec) * 1000 \
+			   + (timer->tr_due.tv_usec - now.tv_usec) / 1000;
+# endif
 /*
 * Insert a timer in the list of timers.
 */
 static void
 }
 static void
 free_timer(timer_T *timer)
 {
-if (timer == current_timer)
+free_callback(timer->tr_callback, timer->tr_partial);
-	free_current_timer = TRUE;
+vim_free(timer);
-else
-{
-	free_callback(timer->tr_callback, timer->tr_partial);
-	vim_free(timer);
-}
 }
 /*
 * Create a timer and return it.  NULL if out of memory.
 * Caller should set the callback.
 {
 timer_T	*timer = (timer_T *)alloc_clear(sizeof(timer_T));
 if (timer == NULL)
 	return NULL;
-timer->tr_id = ++last_timer_id;
+if (++last_timer_id < 0)
+	/* Overflow!  Might cause duplicates... */
+	last_timer_id = 0;
+timer->tr_id = last_timer_id;
 insert_timer(timer);
 if (repeat != 0)
 	timer->tr_repeat = repeat - 1;
 timer->tr_interval = msec;
 typval_T	rettv;
 int		dummy;
 typval_T	argv[2];
 argv[0].v_type = VAR_NUMBER;
-argv[0].vval.v_number = timer->tr_id;
+argv[0].vval.v_number = (varnumber_T)timer->tr_id;
 argv[1].v_type = VAR_UNKNOWN;
 call_func(timer->tr_callback, (int)STRLEN(timer->tr_callback),
 			&rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE,
 			timer->tr_partial, NULL);
 */
 long
 check_due_timer(void)
 {
 timer_T	*timer;
+timer_T	*timer_next;
 long	this_due;
 long	next_due = -1;
 proftime_T	now;
 int		did_one = FALSE;
+long	current_id = last_timer_id;
 # ifdef WIN3264
 LARGE_INTEGER   fr;
 QueryPerformanceFrequency(&fr);
 # endif
-while (!got_int)
+profile_start(&now);
-{
+for (timer = first_timer; timer != NULL && !got_int; timer = timer_next)
-	profile_start(&now);
+{
-	next_due = -1;
+	timer_next = timer->tr_next;
-	for (timer = first_timer; timer != NULL; timer = timer->tr_next)
-	{
+	if (timer->tr_id == -1 || timer->tr_firing || timer->tr_paused)
-	    if (timer->tr_paused)
+	    continue;
-		continue;
+	this_due = GET_TIMEDIFF(timer, now);
-# ifdef WIN3264
+	if (this_due <= 1)
-	    this_due = (long)(((double)(timer->tr_due.QuadPart - now.QuadPart)
+	{
-					       / (double)fr.QuadPart) * 1000);
+	    timer->tr_firing = TRUE;
-# else
+	    timer_callback(timer);
-	    this_due = (timer->tr_due.tv_sec - now.tv_sec) * 1000
+	    timer->tr_firing = FALSE;
-			       + (timer->tr_due.tv_usec - now.tv_usec) / 1000;
+	    timer_next = timer->tr_next;
-# endif
+	    did_one = TRUE;
-	    if (this_due <= 1)
+	    /* Only fire the timer again if it repeats and stop_timer() wasn't
+	     * called while inside the callback (tr_id == -1). */
+	    if (timer->tr_repeat != 0 && timer->tr_id != -1)
 	    {
-		current_timer = timer;
+		profile_setlimit(timer->tr_interval, &timer->tr_due);
-		free_current_timer = FALSE;
+		this_due = GET_TIMEDIFF(timer, now);
-		timer_callback(timer);
+		if (this_due < 1)
-		current_timer = NULL;
+		    this_due = 1;
+		if (timer->tr_repeat > 0)
-		did_one = TRUE;
+		    --timer->tr_repeat;
-		if (timer->tr_repeat != 0 && !free_current_timer)
-		{
-		    profile_setlimit(timer->tr_interval, &timer->tr_due);
-		    if (timer->tr_repeat > 0)
-			--timer->tr_repeat;
-		}
-		else
-		{
-		    remove_timer(timer);
-		    free_timer(timer);
-		}
-		/* the callback may do anything, start all over */
-		break;
 	    }
-	    if (next_due == -1 || next_due > this_due)
+	    else
-		next_due = this_due;
+	    {
-	}
+		this_due = -1;
-	if (timer == NULL)
+		remove_timer(timer);
-	    break;
+		free_timer(timer);
+	    }
+	}
+	if (this_due > 0 && (next_due == -1 || next_due > this_due))
+	    next_due = this_due;
 }
 if (did_one)
 	redraw_after_callback();
-return next_due;
+return current_id != last_timer_id ? 1 : next_due;
 }
 /*
 * Find a timer by ID.  Returns NULL if not found;
 */
 timer_T *
-find_timer(int id)
+find_timer(long id)
 {
 timer_T *timer;
-for (timer = first_timer; timer != NULL; timer = timer->tr_next)
+if (id >= 0)
-	if (timer->tr_id == id)
+{
-	    break;
+	for (timer = first_timer; timer != NULL; timer = timer->tr_next)
-return timer;
+	    if (timer->tr_id == id)
+		return timer;
+}
+return NULL;
 }
 /*
 * Stop a timer and delete it.
 */
 void
 stop_timer(timer_T *timer)
 {
-remove_timer(timer);
+if (timer->tr_firing)
-free_timer(timer);
+	/* Free the timer after the callback returns. */
+	timer->tr_id = -1;
+else
+{
+	remove_timer(timer);
+	free_timer(timer);
+}
 }
 void
 stop_all_timers(void)
 {
-while (first_timer != NULL)
+timer_T *timer;
-	stop_timer(first_timer);
+timer_T *timer_next;
+for (timer = first_timer; timer != NULL; timer = timer_next)
+{
+	timer_next = timer->tr_next;
+	stop_timer(timer);
+}
 }
 void
 add_timer_info(typval_T *rettv, timer_T *timer)
 {
 if (dict == NULL)
 	return;
 list_append_dict(list, dict);
-dict_add_nr_str(dict, "id", (long)timer->tr_id, NULL);
+dict_add_nr_str(dict, "id", timer->tr_id, NULL);
 dict_add_nr_str(dict, "time", (long)timer->tr_interval, NULL);
 profile_start(&now);
 # ifdef WIN3264
 QueryPerformanceFrequency(&fr);
-remaining = (long)(((double)(timer->tr_due.QuadPart - now.QuadPart)
-					       / (double)fr.QuadPart) * 1000);
-# else
-remaining = (timer->tr_due.tv_sec - now.tv_sec) * 1000
-			       + (timer->tr_due.tv_usec - now.tv_usec) / 1000;
 # endif
+remaining = GET_TIMEDIFF(timer, now);
 dict_add_nr_str(dict, "remaining", (long)remaining, NULL);
 dict_add_nr_str(dict, "repeat",
 	       (long)(timer->tr_repeat < 0 ? -1 : timer->tr_repeat + 1), NULL);
 dict_add_nr_str(dict, "paused", (long)(timer->tr_paused), NULL);
 add_timer_info_all(typval_T *rettv)
 {
 timer_T *timer;
 for (timer = first_timer; timer != NULL; timer = timer->tr_next)
-	add_timer_info(rettv, timer);
+	if (timer->tr_id != -1)
+	    add_timer_info(rettv, timer);
 }
 /*
 * Mark references in partials of timers.
 */

Mercurial > vim

comparison src/ex_cmds2.c @ 10122:3db463d4df25 v7.4.2332