vim: src/os_unix.c comparison

comparison src/os_unix.c @ 9205:c19eb05b19df v7.4.1886

commit https://github.com/vim/vim/commit/cda7764d8e65325d4524e5d6c3174121eeb12cad Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 4 13:32:35 2016 +0200 patch 7.4.1886 Problem: When waiting for a character is interrupted by receiving channel data and the first character of a mapping was typed, the mapping times out. (Ramel Eshed) Solution: When dealing with channel data don't return from mch_inchar().

author	Christian Brabandt <cb@256bit.org>
date	Sat, 04 Jun 2016 13:45:05 +0200
parents	4b55d8e162d4
children	61e669c5da6f

comparison

equal deleted inserted replaced

-:61b9dfe91682
+:c19eb05b19df
 #else
 typedef int waitstatus;
 #endif
 static pid_t wait4pid(pid_t, waitstatus *);
-static int  WaitForChar(long);
+static int  WaitForChar(long msec, int *interrupted);
-static int  WaitForCharOrMouse(long, int *break_loop);
+static int  WaitForCharOrMouse(long msec, int *interrupted);
 #if defined(__BEOS__) || defined(VMS)
-int  RealWaitForChar(int, long, int *, int *break_loop);
+int  RealWaitForChar(int, long, int *, int *interrupted);
 #else
-static int  RealWaitForChar(int, long, int *, int *break_loop);
+static int  RealWaitForChar(int, long, int *, int *interrupted);
 #endif
 #ifdef FEAT_XCLIPBOARD
 static int do_xterm_trace(void);
 # define XT_TRACE_DELAY	50	/* delay for xterm tracing */
 int		maxlen,
 long	wtime,	    /* don't use "time", MIPS cannot handle it */
 int		tb_change_cnt)
 {
 int		len;
+int		interrupted = FALSE;
 #ifdef MESSAGE_QUEUE
 parse_queued_messages();
 #endif
 while (do_resize)
 	handle_resize();
 if (wtime >= 0)
 {
-	while (!WaitForChar(wtime))		/* no character available */
+	/* TODO: when looping reduce wtime by the elapsed time. */
-	{
+	while (!WaitForChar(wtime, &interrupted))
+	{
+	    /* no character available */
 	    if (do_resize)
+	    {
 		handle_resize();
+		continue;
+	    }
 #ifdef FEAT_CLIENTSERVER
-	    else if (!server_waiting())
+	    if (server_waiting())
-#else
+	    {
-	    else
+		parse_queued_messages();
-#endif
+		continue;
-		/* return if not interrupted by resize or server */
+	    }
-		return 0;
+#endif
 #ifdef MESSAGE_QUEUE
-	    parse_queued_messages();
+	    if (interrupted)
-#endif
+	    {
+		parse_queued_messages();
+		continue;
+	    }
+#endif
+	    /* return if not interrupted by resize or server */
+	    return 0;
 	}
 }
 else	/* wtime == -1 */
 {
 	/*
 	 * If there is no character available within 'updatetime' seconds
 	 * flush all the swap files to disk.
 	 * Also done when interrupted by SIGWINCH.
 	 */
-	if (!WaitForChar(p_ut))
+	if (!WaitForChar(p_ut, &interrupted))
 	{
+	    /* TODO: if interrupted is set loop to wait the remaining time. */
 #ifdef FEAT_AUTOCMD
 	    if (trigger_cursorhold() && maxlen >= 3
 					   && !typebuf_changed(tb_change_cnt))
 	    {
 		buf[0] = K_SPECIAL;
 #endif
 	    before_blocking();
 	}
 }
-for (;;)	/* repeat until we got a character */
+/* repeat until we got a character */
+for (;;)
 {
 	long	wtime_now = -1L;
 	while (do_resize)    /* window changed size */
 	    handle_resize();
 #endif
 	/*
 	 * We want to be interrupted by the winch signal
 	 * or by an event on the monitored file descriptors.
 	 */
-	if (!WaitForChar(wtime_now))
+	if (!WaitForChar(wtime_now, &interrupted))
 	{
 	    if (do_resize)	    /* interrupted by SIGWINCH signal */
-		handle_resize();
+		continue;
+#ifdef MESSAGE_QUEUE
+	    if (interrupted || wtime_now > 0)
+	    {
+		parse_queued_messages();
+		continue;
+	    }
+#endif
 	    return 0;
 	}
 	/* If input was put directly in typeahead buffer bail out here. */
 	if (typebuf_changed(tb_change_cnt))
 	 * For some other terminals this is quite slow, that's why we don't do
 	 * it.
 	 */
 	len = read_from_input_buf(buf, (long)maxlen);
 	if (len > 0)
-	{
 	    return len;
-	}
 }
 }
 static void
 handle_resize(void)
 * Return non-zero if a character is available.
 */
 int
 mch_char_avail(void)
 {
-return WaitForChar(0L);
+return WaitForChar(0L, NULL);
 }
 #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
 # ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 	settmode(old_tmode);
 	in_mch_delay = FALSE;
 }
 else
-	WaitForChar(msec);
+	WaitForChar(msec, NULL);
 }
 #if defined(HAVE_STACK_LIMIT) \
 	|| (!defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGSTACK))
 # define HAVE_CHECK_STACK_GROWTH
 	/* See above for type of argv. */
 	execvp(argv[0], argv);
 	if (stderr_works)
 	    perror("executing job failed");
+#ifdef EXITFREE
+	/* calling free_all_mem() here causes problems. Ignore valgrind
+	 * reporting possibly leaked memory. */
+#endif
 	_exit(EXEC_FAILED);	    /* exec failed, return failure code */
 }
 /* parent */
 job->jv_pid = pid;
 /*
 * Wait "msec" msec until a character is available from the mouse, keyboard,
 * from inbuf[].
 * "msec" == -1 will block forever.
 * Invokes timer callbacks when needed.
+* "interrupted" (if not NULL) is set to TRUE when no character is available
+* but something else needs to be done.
+* Returns TRUE when a character is available.
 * When a GUI is being used, this will never get called -- webb
-* Returns TRUE when a character is available.
 */
 static int
-WaitForChar(long msec)
+WaitForChar(long msec, int *interrupted)
 {
 #ifdef FEAT_TIMERS
 long    due_time;
 long    remaining = msec;
-int	    break_loop = FALSE;
 int	    tb_change_cnt = typebuf.tb_change_cnt;
 /* When waiting very briefly don't trigger timers. */
 if (msec >= 0 && msec < 10L)
 	return WaitForCharOrMouse(msec, NULL);
 	    /* timer may have used feedkeys() */
 	    return FALSE;
 	}
 	if (due_time <= 0 || (msec > 0 && due_time > remaining))
 	    due_time = remaining;
-	if (WaitForCharOrMouse(due_time, &break_loop))
+	if (WaitForCharOrMouse(due_time, interrupted))
 	    return TRUE;
-	if (break_loop)
+	if (interrupted != NULL && *interrupted)
 	    /* Nothing available, but need to return so that side effects get
 	     * handled, such as handling a message on a channel. */
 	    return FALSE;
 	if (msec > 0)
 	    remaining -= due_time;
 }
 return FALSE;
 #else
-return WaitForCharOrMouse(msec, NULL);
+return WaitForCharOrMouse(msec, interrupted);
 #endif
 }
 /*
 * Wait "msec" msec until a character is available from the mouse or keyboard
 * or from inbuf[].
 * "msec" == -1 will block forever.
+* "interrupted" (if not NULL) is set to TRUE when no character is available
+* but something else needs to be done.
 * When a GUI is being used, this will never get called -- webb
 */
 static int
-WaitForCharOrMouse(long msec, int *break_loop)
+WaitForCharOrMouse(long msec, int *interrupted)
 {
 #ifdef FEAT_MOUSE_GPM
 int		gpm_process_wanted;
 #endif
 #ifdef FEAT_XCLIPBOARD
 	}
 # endif
 # ifdef FEAT_MOUSE_GPM
 	gpm_process_wanted = 0;
 	avail = RealWaitForChar(read_cmd_fd, msec,
-					     &gpm_process_wanted, break_loop);
+					     &gpm_process_wanted, interrupted);
 # else
-	avail = RealWaitForChar(read_cmd_fd, msec, NULL, break_loop);
+	avail = RealWaitForChar(read_cmd_fd, msec, NULL, interrupted);
 # endif
 	if (!avail)
 	{
 	    if (input_available())
 		return 1;
 # endif
 	  )
 	;
 #else
-avail = RealWaitForChar(read_cmd_fd, msec, NULL, break_loop);
+avail = RealWaitForChar(read_cmd_fd, msec, NULL, interrupted);
 #endif
 return avail;
 }
 #ifndef VMS
 * "msec" == 0 will check for characters once.
 * "msec" == -1 will block until a character is available.
 * When a GUI is being used, this will not be used for input -- webb
 * Or when a Linux GPM mouse event is waiting.
 * Or when a clientserver message is on the queue.
+* "interrupted" (if not NULL) is set to TRUE when no character is available
+* but something else needs to be done.
 */
 #if defined(__BEOS__)
 int
 #else
 static int
 #endif
-RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED, int *break_loop)
+RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED, int *interrupted)
 {
 int		ret;
 int		result;
 #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
 static int	busy = FALSE;
 	}
 # endif
 #ifdef FEAT_JOB_CHANNEL
 	nfd = channel_poll_setup(nfd, &fds);
 #endif
+	if (interrupted != NULL)
+	    *interrupted = FALSE;
 	ret = poll(fds, nfd, towait);
 	result = ret > 0 && (fds[0].revents & POLLIN);
-	if (break_loop != NULL && ret > 0)
+	if (result == 0 && interrupted != NULL && ret > 0)
-	    *break_loop = TRUE;
+	    *interrupted = TRUE;
 # ifdef FEAT_MZSCHEME
 	if (ret == 0 && mzquantum_used)
 	    /* MzThreads scheduling is required and timeout occurred */
 	    finished = FALSE;
 #ifdef FEAT_JOB_CHANNEL
 	if (ret > 0)
 	    ret = channel_poll_check(ret, &fds);
 #endif
 #else /* HAVE_SELECT */
 	struct timeval  tv;
 	struct timeval	*tvp;
 	fd_set		rfds, wfds, efds;
 	}
 # endif
 # ifdef FEAT_JOB_CHANNEL
 	maxfd = channel_select_setup(maxfd, &rfds, &wfds);
 # endif
+	if (interrupted != NULL)
+	    *interrupted = FALSE;
 	ret = select(maxfd + 1, &rfds, &wfds, &efds, tvp);
 	result = ret > 0 && FD_ISSET(fd, &rfds);
 	if (result)
 	    --ret;
-	if (break_loop != NULL && ret > 0)
+	else if (interrupted != NULL && ret > 0)
-	    *break_loop = TRUE;
+	    *interrupted = TRUE;
 # ifdef EINTR
 	if (ret == -1 && errno == EINTR)
 	{
 	    /* Check whether window has been resized, EINTR may be caused by

Mercurial > vim

comparison src/os_unix.c @ 9205:c19eb05b19df v7.4.1886