0
0
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00

patch 8.1.0818: MS-Windows: cannot send large data with ch_sendraw()

Problem:    MS-Windows: cannot send large data with ch_sendraw().
Solution:   Split write into several WriteFile() calls. (Yasuhiro Matsumoto,
            closes #3823)
This commit is contained in:
Bram Moolenaar
2019-01-24 23:11:49 +01:00
parent 99531a7604
commit 240583869a
6 changed files with 51 additions and 13 deletions

View File

@@ -80,14 +80,21 @@ fd_read(sock_T fd, char *buf, size_t len)
static int
fd_write(sock_T fd, char *buf, size_t len)
{
size_t todo = len;
HANDLE h = (HANDLE)fd;
DWORD nwrite;
DWORD nwrite, size, done = 0;
OVERLAPPED ov;
while (todo > 0)
{
if (todo > MAX_NAMED_PIPE_SIZE)
size = MAX_NAMED_PIPE_SIZE;
else
size = todo;
// If the pipe overflows while the job does not read the data, WriteFile
// will block forever. This abandons the write.
memset(&ov, 0, sizeof(ov));
if (!WriteFile(h, buf, (DWORD)len, &nwrite, &ov))
if (!WriteFile(h, buf + done, size, &nwrite, &ov))
{
DWORD err = GetLastError();
@@ -97,7 +104,10 @@ fd_write(sock_T fd, char *buf, size_t len)
return -1;
FlushFileBuffers(h);
}
return (int)nwrite;
todo -= nwrite;
done += nwrite;
}
return (int)done;
}
static void

View File

@@ -5369,7 +5369,7 @@ create_pipe_pair(HANDLE handles[2])
name,
PIPE_ACCESS_OUTBOUND | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_BYTE | PIPE_NOWAIT,
1, 65535, 0, 0, NULL);
1, MAX_NAMED_PIPE_SIZE, 0, 0, NULL);
if (handles[1] == INVALID_HANDLE_VALUE)
return FALSE;

View File

@@ -1980,3 +1980,21 @@ func Test_job_start_in_timer()
unlet! g:val
unlet! g:job
endfunc
func Test_raw_large_data()
try
let g:out = ''
let job = job_start(s:python . " test_channel_pipe.py",
\ {'mode': 'raw', 'drop': 'never', 'noblock': 1,
\ 'callback': {ch, msg -> execute('let g:out .= msg')}})
let want = repeat('X', 79999) . "\n"
call ch_sendraw(job, want)
let g:Ch_job = job
call WaitForAssert({-> assert_equal("dead", job_status(g:Ch_job))})
call assert_equal(want, substitute(g:out, '\r', '', 'g'))
finally
call job_stop(job)
unlet g:out
endtry
endfunc

View File

@@ -56,4 +56,8 @@ if __name__ == "__main__":
if typed.startswith("doubleerr "):
print(typed[10:-1] + "\nAND " + typed[10:-1], file=sys.stderr)
sys.stderr.flush()
if typed.startswith("XXX"):
print(typed, end='')
sys.stderr.flush()
break

View File

@@ -787,6 +787,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
818,
/**/
817,
/**/

View File

@@ -2467,6 +2467,10 @@ typedef enum {
# define MAX_OPEN_CHANNELS 0
#endif
#if defined(WIN32)
# define MAX_NAMED_PIPE_SIZE 65535
#endif
/* Options for json_encode() and json_decode. */
#define JSON_JS 1 /* use JS instead of JSON */
#define JSON_NO_NONE 2 /* v:none item not allowed */