Mercurial > hg
view contrib/catapipe.py @ 50336:cf4d2f31660d stable
chg: populate CHGHG if not set
Normally, chg determines which `hg` executable to use by first consulting the
`$CHGHG` and `$HG` environment variables, and if neither are present defaults
to the `hg` found in the user's `$PATH`. If built with the `HGPATHREL` compiler
flag, chg will instead assume that there exists an `hg` executable in the same
directory as the `chg` binary and attempt to use that.
This can cause problems in situations where there are multiple actively-used
Mercurial installations on the same system. When a `chg` client connects to a
running command server, the server process performs some basic validation to
determine whether a new command server needs to be spawned. These checks include
things like checking certain "sensitive" environment variables and config
sections, as well as checking whether the mtime of the extensions, hg's
`__version__.py` module, and the Python interpreter have changed.
Crucially, the command server doesn't explicitly check whether the executable it
is running from matches the executable that the `chg` client would have
otherwise invoked had there been no existing command server process. Without
`HGPATHREL`, this still gets implicitly checked during the validation step,
because the only way to specify an alternate hg executable (apart from `$PATH`)
is via the `$CHGHG` and `$HG` environment variables, both of which are checked.
With `HGPATHREL`, however, the command server has no way of knowing which hg
executable the client would have run. This means that a client located at
`/version_B/bin/chg` will happily connect to a command server running
`/version_A/bin/hg` instead of `/version_B/bin/hg` as expected. A simple
solution is to have the client set `$CHGHG` itself, which then allows the
command server's environment validation to work as intended.
I have tested this manually using two locally built hg installations and it
seems to work with no ill effects. That said, I'm not sure how to write an
automated test for this since the `chg` available to the tests isn't even built
with the `HGPATHREL` compiler flag to begin with.
author | Arun Kulshreshtha <akulshreshtha@janestreet.com> |
---|---|
date | Mon, 27 Mar 2023 17:30:14 -0400 |
parents | 6000f5b25c9b |
children |
line wrap: on
line source
#!/usr/bin/env python3 # # Copyright 2018 Google LLC. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """Tool read primitive events from a pipe to produce a catapult trace. Usage: Terminal 1: $ catapipe.py /tmp/mypipe /tmp/trace.json Terminal 2: $ HGCATAPULTSERVERPIPE=/tmp/mypipe hg root <ctrl-c catapipe.py in Terminal 1> $ catapult/tracing/bin/trace2html /tmp/trace.json # produce /tmp/trace.html <open trace.html in your browser of choice; the WASD keys are very useful> (catapult is located at https://github.com/catapult-project/catapult) For now the event stream supports START $SESSIONID ... and END $SESSIONID ... events. Everything after the SESSIONID (which must not contain spaces) is used as a label for the event. Events are timestamped as of when they arrive in this process and are then used to produce catapult traces that can be loaded in Chrome's about:tracing utility. It's important that the event stream *into* this process stay simple, because we have to emit it from the shell scripts produced by run-tests.py. Typically you'll want to place the path to the named pipe in the HGCATAPULTSERVERPIPE environment variable, which both run-tests and hg understand. To trace *only* run-tests, use HGTESTCATAPULTSERVERPIPE instead. """ import argparse import json import os import timeit _TYPEMAP = { 'START': 'B', 'END': 'E', 'COUNTER': 'C', } _threadmap = {} # Timeit already contains the whole logic about which timer to use based on # Python version and OS timer = timeit.default_timer def main(): parser = argparse.ArgumentParser() parser.add_argument( 'pipe', type=str, nargs=1, help='Path of named pipe to create and listen on.', ) parser.add_argument( 'output', default='trace.json', type=str, nargs='?', help='Path of json file to create where the traces ' 'will be stored.', ) parser.add_argument( '--debug', default=False, action='store_true', help='Print useful debug messages', ) args = parser.parse_args() fn = args.pipe[0] os.mkfifo(fn) try: with open(fn) as f, open(args.output, 'w') as out: out.write('[\n') start = timer() while True: ev = f.readline().strip() if not ev: continue now = timer() if args.debug: print(ev) verb, session, label = ev.split(' ', 2) if session not in _threadmap: _threadmap[session] = len(_threadmap) if verb == 'COUNTER': amount, label = label.split(' ', 1) payload_args = {'value': int(amount)} else: payload_args = {} pid = _threadmap[session] ts_micros = (now - start) * 1000000 out.write( json.dumps( { "name": label, "cat": "misc", "ph": _TYPEMAP[verb], "ts": ts_micros, "pid": pid, "tid": 1, "args": payload_args, } ) ) out.write(',\n') finally: os.unlink(fn) if __name__ == '__main__': main()