OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #49057 - Zoxc:fast-submodules, r=alexcrichton

Browse Source 
Faster submodule updating

For the common case when there are no submodules which need updating, this takes 0.48 seconds instead of 47 seconds.

r? @alexcrichton
This commit is contained in:
kennytm 2018-03-17 17:20:46 +08:00 committed by GitHub
commit c78426bfc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.toml.example
View File

@ -118,6 +118,10 @@
# Indicate whether submodules are managed and updated automatically. # Indicate whether submodules are managed and updated automatically.
#submodules = true #submodules = true
# Update submodules only when the checked out commit in the submodules differs
# from what is committed in the main rustc repo.
#fast-submodules = true
# The path to (or name of) the GDB executable to use. This is only used for # The path to (or name of) the GDB executable to use. This is only used for
# executing the debuginfo test suite. # executing the debuginfo test suite.
#gdb = "gdb" #gdb = "gdb"

62
src/bootstrap/bootstrap.py
View File

@ -612,20 +612,55 @@ class RustBuild(object):
return config return config
return default_build_triple() return default_build_triple()
def check_submodule(self, module, slow_submodules):
if not slow_submodules:
checked_out = subprocess.Popen(["git", "rev-parse", "HEAD"],
cwd=os.path.join(self.rust_root, module),
stdout=subprocess.PIPE)
return checked_out
else:
return None
def update_submodule(self, module, checked_out, recorded_submodules):
module_path = os.path.join(self.rust_root, module)
if checked_out != None:
default_encoding = sys.getdefaultencoding()
checked_out = checked_out.communicate()[0].decode(default_encoding).strip()
if recorded_submodules[module] == checked_out:
return
print("Updating submodule", module)
run(["git", "submodule", "-q", "sync", module],
cwd=self.rust_root, verbose=self.verbose)
run(["git", "submodule", "update",
"--init", "--recursive", module],
cwd=self.rust_root, verbose=self.verbose)
run(["git", "reset", "-q", "--hard"],
cwd=module_path, verbose=self.verbose)
run(["git", "clean", "-qdfx"],
cwd=module_path, verbose=self.verbose)
def update_submodules(self): def update_submodules(self):
"""Update submodules""" """Update submodules"""
if (not os.path.exists(os.path.join(self.rust_root, ".git"))) or \ if (not os.path.exists(os.path.join(self.rust_root, ".git"))) or \
self.get_toml('submodules') == "false": self.get_toml('submodules') == "false":
return return
print('Updating submodules') slow_submodules = self.get_toml('fast-submodule') == "false"
start_time = time()
if slow_submodules:
print('Unconditionally updating all submodules')
else:
print('Updating only changed submodules')
default_encoding = sys.getdefaultencoding() default_encoding = sys.getdefaultencoding()
run(["git", "submodule", "-q", "sync"], cwd=self.rust_root, verbose=self.verbose)
submodules = [s.split(' ', 1)[1] for s in subprocess.check_output( submodules = [s.split(' ', 1)[1] for s in subprocess.check_output(
["git", "config", "--file", ["git", "config", "--file",
os.path.join(self.rust_root, ".gitmodules"), os.path.join(self.rust_root, ".gitmodules"),
"--get-regexp", "path"] "--get-regexp", "path"]
).decode(default_encoding).splitlines()] ).decode(default_encoding).splitlines()]
filtered_submodules = [] filtered_submodules = []
submodules_names = []
for module in submodules: for module in submodules:
if module.endswith("llvm"): if module.endswith("llvm"):
if self.get_toml('llvm-config'): if self.get_toml('llvm-config'):
@ -643,16 +678,19 @@ class RustBuild(object):
config = self.get_toml('lld') config = self.get_toml('lld')
if config is None or config == 'false': if config is None or config == 'false':
continue continue
filtered_submodules.append(module) check = self.check_submodule(module, slow_submodules)
run(["git", "submodule", "update", filtered_submodules.append((module, check))
"--init", "--recursive"] + filtered_submodules, submodules_names.append(module)
cwd=self.rust_root, verbose=self.verbose) recorded = subprocess.Popen(["git", "ls-tree", "HEAD"] + submodules_names,
run(["git", "submodule", "-q", "foreach", "git", cwd=self.rust_root, stdout=subprocess.PIPE)
"reset", "-q", "--hard"], recorded = recorded.communicate()[0].decode(default_encoding).strip().splitlines()
cwd=self.rust_root, verbose=self.verbose) recorded_submodules = {}
run(["git", "submodule", "-q", "foreach", "git", for data in recorded:
"clean", "-qdfx"], data = data.split()
cwd=self.rust_root, verbose=self.verbose) recorded_submodules[data[3]] = data[2]
for module in filtered_submodules:
self.update_submodule(module[0], module[1], recorded_submodules)
print("Submodules updated in %.2f seconds" % (time() - start_time))
def set_dev_environment(self): def set_dev_environment(self):
"""Set download URL for development environment""" """Set download URL for development environment"""