Permalink
Browse files

patch 8.0.0103

Problem:    May not process channel readahead. (skywind)
Solution:   If there is readahead don't block on input.
  • Loading branch information...
1 parent 7554da4 commit 8a8199e4a1814b10630a770165502abb1121cd1b @brammool brammool committed Nov 26, 2016
Showing with 40 additions and 5 deletions.
  1. +25 −0 src/channel.c
  2. +1 −4 src/misc2.c
  3. +4 −0 src/os_unix.c
  4. +7 −1 src/os_win32.c
  5. +1 −0 src/proto/channel.pro
  6. +2 −0 src/version.c
View
@@ -3900,6 +3900,31 @@ channel_parse_messages(void)
}
/*
+ * Return TRUE if any channel has readahead. That means we should not block on
+ * waiting for input.
+ */
+ int
+channel_any_readahead(void)
+{
+ channel_T *channel = first_channel;
+ ch_part_T part = PART_SOCK;
+
+ while (channel != NULL)
+ {
+ if (channel_has_readahead(channel, part))
+ return TRUE;
+ if (part < PART_ERR)
+ ++part;
+ else
+ {
+ channel = channel->ch_next;
+ part = PART_SOCK;
+ }
+ }
+ return FALSE;
+}
+
+/*
* Mark references to lists used in channels.
*/
int
View
@@ -6264,7 +6264,7 @@ parse_queued_messages(void)
}
#endif
-#ifdef ELAPSED_TIMEVAL /* proto is defined in vim.h */
+#ifdef ELAPSED_TIMEVAL /* no PROTO here, proto is defined in vim.h */
/*
* Return time in msec since "start_tv".
*/
@@ -6288,9 +6288,6 @@ elapsed(DWORD start_tick)
{
DWORD now = GetTickCount();
- if (now < start_tick)
- /* overflow */
- return (long)now;
return (long)now - (long)start_tick;
}
#endif
View
@@ -462,6 +462,10 @@ mch_inchar(
/* Checking if a job ended requires polling. Do this every 100 msec. */
if (has_pending_job() && (wait_time < 0 || wait_time > 100L))
wait_time = 100L;
+ /* If there is readahead then parse_queued_messages() timed out and we
+ * should call it again soon. */
+ if ((wait_time < 0 || wait_time > 100L) && channel_any_readahead())
+ wait_time = 10L;
#endif
/*
View
@@ -1351,9 +1351,15 @@ WaitForChar(long msec)
DWORD dwWaitTime = dwEndTime - dwNow;
#ifdef FEAT_JOB_CHANNEL
- /* Check channel while waiting input. */
+ /* Check channel while waiting for input. */
if (dwWaitTime > 100)
+ {
dwWaitTime = 100;
+ /* If there is readahead then parse_queued_messages() timed out
+ * and we should call it again soon. */
+ if (channel_any_readahead())
+ dwWaitTime = 10;
+ }
#endif
#ifdef FEAT_MZSCHEME
if (mzthreads_allowed() && p_mzq > 0
@@ -44,6 +44,7 @@ int channel_poll_check(int ret_in, void *fds_in);
int channel_select_setup(int maxfd_in, void *rfds_in, void *wfds_in);
int channel_select_check(int ret_in, void *rfds_in, void *wfds_in);
int channel_parse_messages(void);
+int channel_any_readahead(void);
int set_ref_in_channel(int copyID);
ch_part_T channel_part_send(channel_T *channel);
ch_part_T channel_part_read(channel_T *channel);
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 103,
+/**/
102,
/**/
101,

0 comments on commit 8a8199e

Please sign in to comment.