mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
rage: set up fb environment when dumping traces
Reviewed By: chadaustin Differential Revision: D35325659 fbshipit-source-id: 17bfc262c11aa6f620416c130ac7bbf94011f881
This commit is contained in:
parent
f556079bca
commit
647c5aacbe
@ -18,7 +18,7 @@ import sys
|
|||||||
import traceback
|
import traceback
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Callable, Generator, IO, List, Tuple, Optional, cast
|
from typing import Callable, Generator, IO, List, Tuple, Optional, cast, Dict
|
||||||
|
|
||||||
from . import (
|
from . import (
|
||||||
debug as debug_mod,
|
debug as debug_mod,
|
||||||
@ -33,12 +33,15 @@ from . import (
|
|||||||
from .config import EdenInstance
|
from .config import EdenInstance
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from .facebook.rage import find_fb_cdb
|
from .facebook.rage import find_fb_cdb, setup_fb_env
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|
||||||
def find_fb_cdb() -> Optional[Path]:
|
def find_fb_cdb() -> Optional[Path]:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def setup_fb_env(env: Dict[str, str]) -> Dict[str, str]:
|
||||||
|
return env
|
||||||
|
|
||||||
|
|
||||||
def section_title(message: str, out: IO[bytes]) -> None:
|
def section_title(message: str, out: IO[bytes]) -> None:
|
||||||
out.write(util_mod.underlined(message).encode())
|
out.write(util_mod.underlined(message).encode())
|
||||||
@ -486,7 +489,10 @@ def print_cdb_backtrace(pid: int, sink: IO[bytes]) -> None:
|
|||||||
]
|
]
|
||||||
cdb_cmd += [";".join(debugger_command)]
|
cdb_cmd += [";".join(debugger_command)]
|
||||||
|
|
||||||
subprocess.run(cdb_cmd, check=True, stderr=subprocess.STDOUT, stdout=sink)
|
env = os.environ.copy()
|
||||||
|
env = setup_fb_env(env)
|
||||||
|
|
||||||
|
subprocess.run(cdb_cmd, check=True, stderr=subprocess.STDOUT, stdout=sink, env=env)
|
||||||
|
|
||||||
|
|
||||||
def print_sample_trace(pid: int, sink: IO[bytes]) -> None:
|
def print_sample_trace(pid: int, sink: IO[bytes]) -> None:
|
||||||
|
Loading…
Reference in New Issue
Block a user