| hg-reviewers |
On py3, stdout and stderr appear to be buffered and this causes my command's
output to be intermixed with the profiling output.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| manager exits, profiling results will be written to the configured output. | manager exits, profiling results will be written to the configured output. | ||||
| """ | """ | ||||
| def __init__(self, ui, enabled=True): | def __init__(self, ui, enabled=True): | ||||
| self._ui = ui | self._ui = ui | ||||
| self._output = None | self._output = None | ||||
| self._fp = None | self._fp = None | ||||
| self._fpdoclose = True | self._fpdoclose = True | ||||
| self._flushfp = None | |||||
| self._profiler = None | self._profiler = None | ||||
| self._enabled = enabled | self._enabled = enabled | ||||
| self._entered = False | self._entered = False | ||||
| self._started = False | self._started = False | ||||
| def __enter__(self): | def __enter__(self): | ||||
| self._entered = True | self._entered = True | ||||
| if self._enabled: | if self._enabled: | ||||
| def flush(self): | def flush(self): | ||||
| self._ui.flush() | self._ui.flush() | ||||
| self._fpdoclose = False | self._fpdoclose = False | ||||
| self._fp = uifp(self._ui) | self._fp = uifp(self._ui) | ||||
| else: | else: | ||||
| self._fpdoclose = False | self._fpdoclose = False | ||||
| self._fp = self._ui.ferr | self._fp = self._ui.ferr | ||||
| # Ensure we've flushed fout before writing to ferr. | |||||
| self._flushfp = self._ui.fout | |||||
| if proffn is not None: | if proffn is not None: | ||||
| pass | pass | ||||
| elif profiler == b'ls': | elif profiler == b'ls': | ||||
| proffn = lsprofile | proffn = lsprofile | ||||
| elif profiler == b'flame': | elif profiler == b'flame': | ||||
| proffn = flameprofile | proffn = flameprofile | ||||
| else: | else: | ||||
| proffn = statprofile | proffn = statprofile | ||||
| self._profiler = proffn(self._ui, self._fp) | self._profiler = proffn(self._ui, self._fp) | ||||
| self._profiler.__enter__() | self._profiler.__enter__() | ||||
| except: # re-raises | except: # re-raises | ||||
| self._closefp() | self._closefp() | ||||
| raise | raise | ||||
| def __exit__(self, exception_type, exception_value, traceback): | def __exit__(self, exception_type, exception_value, traceback): | ||||
| propagate = None | propagate = None | ||||
| if self._profiler is not None: | if self._profiler is not None: | ||||
| self._uiflush() | |||||
| propagate = self._profiler.__exit__( | propagate = self._profiler.__exit__( | ||||
| exception_type, exception_value, traceback | exception_type, exception_value, traceback | ||||
| ) | ) | ||||
| if self._output == b'blackbox': | if self._output == b'blackbox': | ||||
| val = b'Profile:\n%s' % self._fp.getvalue() | val = b'Profile:\n%s' % self._fp.getvalue() | ||||
| # ui.log treats the input as a format string, | # ui.log treats the input as a format string, | ||||
| # so we need to escape any % signs. | # so we need to escape any % signs. | ||||
| val = val.replace(b'%', b'%%') | val = val.replace(b'%', b'%%') | ||||
| self._ui.log(b'profile', val) | self._ui.log(b'profile', val) | ||||
| self._closefp() | self._closefp() | ||||
| return propagate | return propagate | ||||
| def _closefp(self): | def _closefp(self): | ||||
| if self._fpdoclose and self._fp is not None: | if self._fpdoclose and self._fp is not None: | ||||
| self._fp.close() | self._fp.close() | ||||
| def _uiflush(self): | |||||
| if self._flushfp: | |||||
| self._flushfp.flush() | |||||