mirror of
https://github.com/junegunn/vim-plug.git
synced 2024-12-24 04:56:33 -07:00
Enable multi-thread on windows
Specify PIPE as stdin for subprocess.Pipe for gvim.exe. Also fixes some ruby implementation. * windows doesn't have pgrep. * windows can't handle SIGTERM. * windows can't handle /dev/null * redraw always
This commit is contained in:
parent
80e5b3eab5
commit
060c0e6d6c
33
plug.vim
33
plug.vim
@ -761,7 +761,7 @@ endfunction
|
|||||||
function! s:update_impl(pull, force, args) abort
|
function! s:update_impl(pull, force, args) abort
|
||||||
let args = copy(a:args)
|
let args = copy(a:args)
|
||||||
let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
|
let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
|
||||||
\ remove(args, -1) : get(g:, 'plug_threads', s:is_win ? 1 : 16)
|
\ remove(args, -1) : get(g:, 'plug_threads', 16)
|
||||||
|
|
||||||
let managed = filter(copy(g:plugs), 's:is_managed(v:key)')
|
let managed = filter(copy(g:plugs), 's:is_managed(v:key)')
|
||||||
let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') :
|
let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') :
|
||||||
@ -798,9 +798,8 @@ function! s:update_impl(pull, force, args) abort
|
|||||||
echohl None
|
echohl None
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let python = (has('python') || has('python3')) && !s:is_win && !has('win32unix')
|
let python = (has('python') || has('python3')) && (!s:nvim || has('vim_starting'))
|
||||||
\ && (!s:nvim || has('vim_starting'))
|
let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running'))
|
||||||
let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374'))
|
|
||||||
|
|
||||||
let s:update = {
|
let s:update = {
|
||||||
\ 'start': reltime(),
|
\ 'start': reltime(),
|
||||||
@ -1069,7 +1068,6 @@ endfunction
|
|||||||
function! s:update_python()
|
function! s:update_python()
|
||||||
let py_exe = has('python') ? 'python' : 'python3'
|
let py_exe = has('python') ? 'python' : 'python3'
|
||||||
execute py_exe "<< EOF"
|
execute py_exe "<< EOF"
|
||||||
""" Due to use of signals this function is POSIX only. """
|
|
||||||
import datetime
|
import datetime
|
||||||
import functools
|
import functools
|
||||||
import os
|
import os
|
||||||
@ -1096,6 +1094,7 @@ G_CLONE_OPT = vim.eval('s:clone_opt')
|
|||||||
G_PROGRESS = vim.eval('s:progress_opt(1)')
|
G_PROGRESS = vim.eval('s:progress_opt(1)')
|
||||||
G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
|
G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
|
||||||
G_STOP = thr.Event()
|
G_STOP = thr.Event()
|
||||||
|
G_IS_WIN = vim.eval('s:is_win') == '1'
|
||||||
|
|
||||||
class PlugError(Exception):
|
class PlugError(Exception):
|
||||||
def __init__(self, msg):
|
def __init__(self, msg):
|
||||||
@ -1110,10 +1109,9 @@ class Action(object):
|
|||||||
INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
|
INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
|
||||||
|
|
||||||
class Buffer(object):
|
class Buffer(object):
|
||||||
def __init__(self, lock, num_plugs, is_pull, is_win):
|
def __init__(self, lock, num_plugs, is_pull):
|
||||||
self.bar = ''
|
self.bar = ''
|
||||||
self.event = 'Updating' if is_pull else 'Installing'
|
self.event = 'Updating' if is_pull else 'Installing'
|
||||||
self.is_win = is_win
|
|
||||||
self.lock = lock
|
self.lock = lock
|
||||||
self.maxy = int(vim.eval('winheight(".")'))
|
self.maxy = int(vim.eval('winheight(".")'))
|
||||||
self.num_plugs = num_plugs
|
self.num_plugs = num_plugs
|
||||||
@ -1141,7 +1139,6 @@ class Buffer(object):
|
|||||||
|
|
||||||
with self.lock:
|
with self.lock:
|
||||||
vim.command('normal! 2G')
|
vim.command('normal! 2G')
|
||||||
if not self.is_win:
|
|
||||||
vim.command('redraw')
|
vim.command('redraw')
|
||||||
|
|
||||||
def write(self, action, name, lines):
|
def write(self, action, name, lines):
|
||||||
@ -1224,9 +1221,11 @@ class Command(object):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
tfile = tempfile.NamedTemporaryFile(mode='w+b')
|
tfile = tempfile.NamedTemporaryFile(mode='w+b')
|
||||||
|
preexec_fn = not G_IS_WIN and os.setsid or None
|
||||||
self.proc = subprocess.Popen(self.cmd, stdout=tfile,
|
self.proc = subprocess.Popen(self.cmd, stdout=tfile,
|
||||||
stderr=subprocess.STDOUT, shell=True,
|
stderr=subprocess.STDOUT,
|
||||||
preexec_fn=os.setsid)
|
stdin=subprocess.PIPE, shell=True,
|
||||||
|
preexec_fn=preexec_fn)
|
||||||
thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,))
|
thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,))
|
||||||
thrd.start()
|
thrd.start()
|
||||||
|
|
||||||
@ -1244,7 +1243,7 @@ class Command(object):
|
|||||||
|
|
||||||
if first_line or random.random() < G_LOG_PROB:
|
if first_line or random.random() < G_LOG_PROB:
|
||||||
first_line = False
|
first_line = False
|
||||||
line = nonblock_read(tfile.name)
|
line = '' if G_IS_WIN else nonblock_read(tfile.name)
|
||||||
if line:
|
if line:
|
||||||
self.callback([line])
|
self.callback([line])
|
||||||
|
|
||||||
@ -1268,6 +1267,9 @@ class Command(object):
|
|||||||
def terminate(self):
|
def terminate(self):
|
||||||
""" Terminate process and cleanup. """
|
""" Terminate process and cleanup. """
|
||||||
if self.alive:
|
if self.alive:
|
||||||
|
if G_IS_WIN:
|
||||||
|
os.kill(self.proc.pid, signal.SIGINT)
|
||||||
|
else:
|
||||||
os.killpg(self.proc.pid, signal.SIGTERM)
|
os.killpg(self.proc.pid, signal.SIGTERM)
|
||||||
self.clean()
|
self.clean()
|
||||||
|
|
||||||
@ -1419,10 +1421,9 @@ def main():
|
|||||||
nthreads = int(vim.eval('s:update.threads'))
|
nthreads = int(vim.eval('s:update.threads'))
|
||||||
plugs = vim.eval('s:update.todo')
|
plugs = vim.eval('s:update.todo')
|
||||||
mac_gui = vim.eval('s:mac_gui') == '1'
|
mac_gui = vim.eval('s:mac_gui') == '1'
|
||||||
is_win = vim.eval('s:is_win') == '1'
|
|
||||||
|
|
||||||
lock = thr.Lock()
|
lock = thr.Lock()
|
||||||
buf = Buffer(lock, len(plugs), G_PULL, is_win)
|
buf = Buffer(lock, len(plugs), G_PULL)
|
||||||
buf_q, work_q = queue.Queue(), queue.Queue()
|
buf_q, work_q = queue.Queue(), queue.Queue()
|
||||||
for work in plugs.items():
|
for work in plugs.items():
|
||||||
work_q.put(work)
|
work_q.put(work)
|
||||||
@ -1479,6 +1480,9 @@ function! s:update_ruby()
|
|||||||
|
|
||||||
def killall pid
|
def killall pid
|
||||||
pids = [pid]
|
pids = [pid]
|
||||||
|
if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
|
||||||
|
pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil }
|
||||||
|
else
|
||||||
unless `which pgrep 2> /dev/null`.empty?
|
unless `which pgrep 2> /dev/null`.empty?
|
||||||
children = pids
|
children = pids
|
||||||
until children.empty?
|
until children.empty?
|
||||||
@ -1490,6 +1494,7 @@ function! s:update_ruby()
|
|||||||
end
|
end
|
||||||
pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
|
pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
require 'thread'
|
require 'thread'
|
||||||
require 'fileutils'
|
require 'fileutils'
|
||||||
@ -1514,7 +1519,7 @@ function! s:update_ruby()
|
|||||||
$curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
|
$curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
|
||||||
$curbuf[2] = '[' + bar.ljust(tot) + ']'
|
$curbuf[2] = '[' + bar.ljust(tot) + ']'
|
||||||
VIM::command('normal! 2G')
|
VIM::command('normal! 2G')
|
||||||
VIM::command('redraw') unless iswin
|
VIM::command('redraw')
|
||||||
}
|
}
|
||||||
where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
|
where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
|
||||||
log = proc { |name, result, type|
|
log = proc { |name, result, type|
|
||||||
|
Loading…
Reference in New Issue
Block a user