未验证 提交 0fa57e45 编写于 作者: D Dylan DPC 提交者: GitHub

Rollup merge of #70392 - brain0:fixxpy, r=Mark-Simulacrum

Make x.py compatible with python 3.8.

Python 3.8 removes the `time.clock()` function, use `time.perf_counter()` instead.
......@@ -139,11 +139,17 @@ def start_breakpoint_listener(target):
def start_watchdog():
"""Starts a watchdog thread that will terminate the process after a certain
period of time"""
watchdog_start_time = time.clock()
try:
from time import clock
except ImportError:
from time import perf_counter as clock
watchdog_start_time = clock()
watchdog_max_time = watchdog_start_time + 30
def watchdog():
while time.clock() < watchdog_max_time:
while clock() < watchdog_max_time:
time.sleep(1)
print("TIMEOUT: lldb_batchmode.py has been running for too long. Aborting!")
thread.interrupt_main()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册