Mercurial > hg
view rust/hgcli/pyoxidizer.bzl @ 50338:81c7d04f4722 stable
match: match explicit file using a set
The matcher as all the logic to do quick comparison against explicit patterns,
however the pattern matcher was shadowing the code using that set and used the
compiled regex pattern in all cases, which is quite slow. We restore the usage
of the set based matching to boost performance.
Building the regexp is still consuming a large amount of time (actually, the
majority of the time), which is still silly. Maybe using re2 would help that,
but this is a quest for another adventure.
Another path to improve this is to have a pattern type dedicated to match the
exact path to a file only (not a directory). This pattern could use the set
matching only and be skipped in the regex all together.
Benchmarks
==========
In the following benchmark we are comparing the `hg cat` and `hg files` run
time when matching against all files in the repository. They are
run:
- without the rust extensions
- with the standard python engine (so without re2)
Performance improvement in this series
--------------------------------------
###### hg files ###############################################################
### mercurial-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 0.230092 seconds
prev-changeset: 0.230069 seconds
this-changeset: 0.211425 seconds (-8.36%)
### mercurial-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 0.234235 seconds
prev-changeset: 0.231165 seconds (-1.38%)
this-changeset: 0.212300 seconds (-9.43%)
### pypy-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 0.613567 seconds
prev-changeset: 0.616799 seconds
this-changeset: 0.510852 seconds (-16.82%)
### pypy-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 0.801880 seconds
prev-changeset: 0.616393 seconds (-23.22%)
this-changeset: 0.511903 seconds (-36.23%)
### netbeans-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 21.541828 seconds
prev-changeset: 21.586773 seconds
this-changeset: 13.648347 seconds (-36.76%)
### netbeans-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 172.759857 seconds
prev-changeset: 21.908197 seconds (-87.32%)
this-changeset: 13.945110 seconds (-91.93%)
### mozilla-central-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 62.474221 seconds
prev-changeset: 61.279490 seconds (-1.22%)
this-changeset: 29.529469 seconds (-52.40%)
### mozilla-central-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 1364.180218 seconds
prev-changeset: 62.473549 seconds (-95.40%)
this-changeset: 30.625249 seconds (-97.75%)
###### hg cat #################################################################
### mercurial-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 0.764407 seconds
prev-changeset: 0.763883 seconds
this-changeset: 0.737326 seconds (-3.68%)
### mercurial-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 0.768924 seconds
prev-changeset: 0.765848 seconds
this-changeset: 0.174d0b seconds (-4.44%)
### pypy-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 2.065220 seconds
prev-changeset: 2.070498 seconds
this-changeset: 1.939482 seconds (-6.08%)
### pypy-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 2.276388 seconds
prev-changeset: 2.069197 seconds (-9.15%)
this-changeset: 1.931746 seconds (-15.19%)
### netbeans-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 40.967983 seconds
prev-changeset: 41.392423 seconds
this-changeset: 32.181681 seconds (-22.20%)
### netbeans-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 216.388709 seconds
prev-changeset: 41.648689 seconds (-80.88%)
this-changeset: 32.580817 seconds (-85.04%)
### mozilla-central-2018-08-01-zstd-sparse-revlog ### sorted
base-changeset: 105.228510 seconds
prev-changeset: 103.315670 seconds (-1.23%)
this-changeset: 69.416118 seconds (-33.64%)
### mozilla-central-2018-08-01-zstd-sparse-revlog ### shuffled
base-changeset: 1448.722784 seconds
prev-changeset: 104.369358 seconds (-92.80%)
this-changeset: 70.554789 seconds (-95.13%)
Different way to list the same data with this revision
------------------------------------------------------
###### hg files ###############################################################
### mercurial-2018-08-01-zstd-sparse-revlog
root: 0.119182 seconds
glob: 0.120697 seconds (+1.27%)
sorted: 0.211425 seconds (+77.40%)
shuffled: 0.212300 seconds (+78.13%)
### pypy-2018-08-01-zstd-sparse-revlog
root: 0.121986 seconds
glob: 0.124822 seconds (+2.32%)
sorted: 0.510852 seconds (+318.78%)
shuffled: 0.511903 seconds (+319.64%)
### netbeans-2018-08-01-zstd-sparse-revlog
root: 0.173984 seconds
glob: 0.227203 seconds (+30.59%)
sorted: 13.648347 seconds (+7744.59%)
shuffled: 13.945110 seconds (+7915.16%)
### mozilla-central-2018-08-01-zstd-sparse-revlog
root: 0.366463 seconds
glob: 0.491030 seconds (+33.99%)
sorted: 29.529469 seconds (+7957.96%)
shuffled: 30.625249 seconds (+8256.97%)
###### hg cat #################################################################
### mercurial-2018-08-01-zstd-sparse-revlog
glob: 0.647471 seconds
root: 0.643120 seconds
shuffled: 0.174d0b seconds (+13.92%)
sorted: 0.737326 seconds (+13.88%)
### mozilla-central-2018-08-01-zstd-sparse-revlog
glob: 40.596983 seconds
root: 40.129136 seconds
shuffled: 70.554789 seconds (+73.79%)
sorted: 69.416118 seconds (+70.99%)
### netbeans-2018-08-01-zstd-sparse-revlog
glob: 18.777924 seconds
root: 18.613905 seconds
shuffled: 32.580817 seconds (+73.51%)
sorted: 32.181681 seconds (+71.38%)
### pypy-2018-08-01-zstd-sparse-revlog
glob: 1.555319 seconds
root: 1.536534 seconds
shuffled: 1.931746 seconds (+24.20%)
sorted: 1.939482 seconds (+24.70%)
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 01 Apr 2023 05:58:59 +0200 |
parents | 3d7bf111f01e |
children |
line wrap: on
line source
# The following variables can be passed in as parameters: # # VERSION # Version string of program being produced. # # MSI_NAME # Root name of MSI installer. # # EXTRA_MSI_FEATURES # ; delimited string of extra features to advertise in the built MSA. # # SIGNING_PFX_PATH # Path to code signing certificate to use. # # SIGNING_PFX_PASSWORD # Password to code signing PFX file defined by SIGNING_PFX_PATH. # # SIGNING_SUBJECT_NAME # String fragment in code signing certificate subject name used to find # code signing certificate in Windows certificate store. # # TIME_STAMP_SERVER_URL # URL of time-stamp token authority (RFC 3161) servers to stamp code signatures. ROOT = CWD + "/../.." VERSION = VARS.get("VERSION", "0.0") MSI_NAME = VARS.get("MSI_NAME", "mercurial") EXTRA_MSI_FEATURES = VARS.get("EXTRA_MSI_FEATURES") SIGNING_PFX_PATH = VARS.get("SIGNING_PFX_PATH") SIGNING_PFX_PASSWORD = VARS.get("SIGNING_PFX_PASSWORD", "") SIGNING_SUBJECT_NAME = VARS.get("SIGNING_SUBJECT_NAME") TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com") IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE IS_MACOS = "apple" in BUILD_TARGET_TRIPLE # Use in-memory resources for all resources. If false, most of the Python # stdlib will be in memory, but other things such as Mercurial itself will not # be. See the comment in resource_callback, below. USE_IN_MEMORY_RESOURCES = not IS_WINDOWS # Code to run in Python interpreter. RUN_CODE = """ import os import sys extra_path = os.environ.get('PYTHONPATH') if extra_path is not None: # extensions and hooks expect a working python environment # We do not prepend the values because the Mercurial library wants to be in # the front of the sys.path to avoid picking up other installations. sys.path.extend(extra_path.split(os.pathsep)) # Add user site to sys.path to load extensions without the full path if os.name == 'nt': vi = sys.version_info appdata = os.environ.get('APPDATA') if appdata: sys.path.append( os.path.join( appdata, 'Python', 'Python%d%d' % (vi[0], vi[1]), 'site-packages', ) ) elif sys.platform == "darwin": vi = sys.version_info def joinuser(*args): return os.path.expanduser(os.path.join(*args)) # Note: site.py uses `sys._framework` instead of hardcoding "Python" as the # 3rd arg, but that is set to an empty string in an oxidized binary. It # has a fallback to ~/.local when `sys._framework` isn't set, but we want # to match what the system python uses, so it sees pip installed stuff. usersite = joinuser("~", "Library", "Python", "%d.%d" % vi[:2], "lib/python/site-packages") sys.path.append(usersite) import hgdemandimport; hgdemandimport.enable(); from mercurial import dispatch; dispatch.run(); """ set_build_path(ROOT + "/build/pyoxidizer") def make_distribution(): return default_python_distribution(python_version = "3.9") def resource_callback(policy, resource): if USE_IN_MEMORY_RESOURCES: resource.add_location = "in-memory" return # We use a custom resource routing policy to influence where things are loaded # from. # # For Python modules and resources, we load from memory if they are in # the standard library and from the filesystem if not. This is because # parts of Mercurial and some 3rd party packages aren't yet compatible # with memory loading. # # For Python extension modules, we load from the filesystem because # this yields greatest compatibility. if type(resource) in ("PythonModuleSource", "PythonPackageResource", "PythonPackageDistributionResource"): if resource.is_stdlib: resource.add_location = "in-memory" else: resource.add_location = "filesystem-relative:lib" elif type(resource) == "PythonExtensionModule": resource.add_location = "filesystem-relative:lib" def make_exe(dist): """Builds a Rust-wrapped Mercurial binary.""" packaging_policy = dist.make_python_packaging_policy() # Extension may depend on any Python functionality. Include all # extensions. packaging_policy.extension_module_filter = "all" packaging_policy.resources_location = "in-memory" if not USE_IN_MEMORY_RESOURCES: packaging_policy.resources_location_fallback = "filesystem-relative:lib" packaging_policy.register_resource_callback(resource_callback) config = dist.make_python_interpreter_config() config.allocator_backend = "default" config.run_command = RUN_CODE # We want to let the user load extensions from the file system config.filesystem_importer = True # We need this to make resourceutil happy, since it looks for sys.frozen. config.sys_frozen = True config.legacy_windows_stdio = True exe = dist.to_python_executable( name = "hg", packaging_policy = packaging_policy, config = config, ) # Add Mercurial to resources. exe.add_python_resources(exe.pip_install(["--verbose", "--no-use-pep517", ROOT])) # On Windows, we install extra packages for convenience. if IS_WINDOWS: exe.add_python_resources( exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-windows-py3.txt"]), ) if IS_MACOS: exe.add_python_resources( exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-macos.txt"]), ) extra_packages = VARS.get("extra_py_packages", "") if extra_packages: for extra in extra_packages.split(","): extra_src, pkgs = extra.split("=") pkgs = pkgs.split(":") exe.add_python_resources(exe.read_package_root(extra_src, pkgs)) return exe def make_manifest(dist, exe): m = FileManifest() m.add_python_resource(".", exe) return m # This adjusts the InstallManifest produced from exe generation to provide # additional files found in a Windows install layout. def make_windows_install_layout(manifest): # Copy various files to new install locations. This can go away once # we're using the importlib resource reader. RECURSIVE_COPIES = { "lib/mercurial/locale/": "locale/", "lib/mercurial/templates/": "templates/", } for (search, replace) in RECURSIVE_COPIES.items(): for path in manifest.paths(): if path.startswith(search): new_path = path.replace(search, replace) print("copy %s to %s" % (path, new_path)) file = manifest.get_file(path) manifest.add_file(file, path = new_path) # Similar to above, but with filename pattern matching. # lib/mercurial/helptext/**/*.txt -> helptext/ # lib/mercurial/defaultrc/*.rc -> defaultrc/ for path in manifest.paths(): if path.startswith("lib/mercurial/helptext/") and path.endswith(".txt"): new_path = path[len("lib/mercurial/"):] elif path.startswith("lib/mercurial/defaultrc/") and path.endswith(".rc"): new_path = path[len("lib/mercurial/"):] else: continue print("copying %s to %s" % (path, new_path)) manifest.add_file(manifest.get_file(path), path = new_path) extra_install_files = VARS.get("extra_install_files", "") if extra_install_files: for extra in extra_install_files.split(","): print("adding extra files from %s" % extra) # TODO: I expected a ** glob to work, but it didn't. # # TODO: I know this has forward-slash paths. As far as I can tell, # backslashes don't ever match glob() expansions in # tugger-starlark, even on Windows. manifest.add_manifest(glob(include=[extra + "/*/*"], strip_prefix=extra+"/")) # We also install a handful of additional files. EXTRA_CONTRIB_FILES = [ "bash_completion", "hgweb.fcgi", "hgweb.wsgi", "logo-droplets.svg", "mercurial.el", "mq.el", "tcsh_completion", "tcsh_completion_build.sh", "xml.rnc", "zsh_completion", ] for f in EXTRA_CONTRIB_FILES: manifest.add_file(FileContent(path = ROOT + "/contrib/" + f), directory = "contrib") # Individual files with full source to destination path mapping. EXTRA_FILES = { "contrib/hgk": "contrib/hgk.tcl", "contrib/win32/postinstall.txt": "ReleaseNotes.txt", "contrib/win32/ReadMe.html": "ReadMe.html", "doc/style.css": "doc/style.css", "COPYING": "Copying.txt", } for source, dest in EXTRA_FILES.items(): print("adding extra file %s" % dest) manifest.add_file(FileContent(path = ROOT + "/" + source), path = dest) # And finally some wildcard matches. manifest.add_manifest(glob( include = [ROOT + "/contrib/vim/*"], strip_prefix = ROOT + "/" )) manifest.add_manifest(glob( include = [ROOT + "/doc/*.html"], strip_prefix = ROOT + "/" )) # But we don't ship hg-ssh on Windows, so exclude its documentation. manifest.remove("doc/hg-ssh.8.html") return manifest def make_msi(manifest): manifest = make_windows_install_layout(manifest) if "x86_64" in BUILD_TARGET_TRIPLE: platform = "x64" else: platform = "x86" manifest.add_file( FileContent(path = ROOT + "/contrib/packaging/wix/COPYING.rtf"), path = "COPYING.rtf", ) manifest.remove("Copying.txt") manifest.add_file( FileContent(path = ROOT + "/contrib/win32/mercurial.ini"), path = "defaultrc/mercurial.rc", ) manifest.add_file( FileContent(filename = "editor.rc", content = "[ui]\neditor = notepad\n"), path = "defaultrc/editor.rc", ) wix = WiXInstaller( "hg", "%s-%s-%s.msi" % (MSI_NAME, VERSION, platform), arch = platform, ) # Materialize files in the manifest to the install layout. wix.add_install_files(manifest) # From mercurial.wxs. wix.install_files_root_directory_id = "INSTALLDIR" # Pull in our custom .wxs files. defines = { "PyOxidizer": "1", "Platform": platform, "Version": VERSION, "Comments": "Installs Mercurial version %s" % VERSION, "MercurialHasLib": "1", } if EXTRA_MSI_FEATURES: defines["MercurialExtraFeatures"] = EXTRA_MSI_FEATURES wix.add_wxs_file( ROOT + "/contrib/packaging/wix/mercurial.wxs", preprocessor_parameters=defines, ) # Our .wxs references to other files. Pull those into the build environment. for f in ("defines.wxi", "guids.wxi", "COPYING.rtf"): wix.add_build_file(f, ROOT + "/contrib/packaging/wix/" + f) wix.add_build_file("mercurial.ico", ROOT + "/contrib/win32/mercurial.ico") return wix def register_code_signers(): if not IS_WINDOWS: return if SIGNING_PFX_PATH: signer = code_signer_from_pfx_file(SIGNING_PFX_PATH, SIGNING_PFX_PASSWORD) elif SIGNING_SUBJECT_NAME: signer = code_signer_from_windows_store_subject(SIGNING_SUBJECT_NAME) else: signer = None if signer: signer.set_time_stamp_server(TIME_STAMP_SERVER_URL) signer.activate() register_code_signers() register_target("distribution", make_distribution) register_target("exe", make_exe, depends = ["distribution"]) register_target("app", make_manifest, depends = ["distribution", "exe"], default = True) register_target("msi", make_msi, depends = ["app"]) resolve_targets()