Skip to content

Commit

Permalink
Rollup merge of #70392 - brain0:fixxpy, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Make x.py compatible with python 3.8.

Python 3.8 removes the `time.clock()` function, use `time.perf_counter()` instead.
  • Loading branch information
Dylan-DPC authored Mar 25, 2020
2 parents 818da9e + a9484d4 commit 0fa57e4
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/etc/lldb_batchmode.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,17 @@ def listen():
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()
Expand Down

0 comments on commit 0fa57e4

Please sign in to comment.