sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-02-07 13:40:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #187 from bjackman/clear-logcat-lock

Browse Source 
AndroidTarget: prevent concurrent invocations of 'logcat -c'
This commit is contained in:
setrofim 2017-10-10 08:35:03 +01:00 committed by GitHub
commit 4d269774f7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devlib/target.py
View File

@ -950,6 +950,7 @@ class AndroidTarget(Target):
shell_prompt=shell_prompt, shell_prompt=shell_prompt,
conn_cls=conn_cls) conn_cls=conn_cls)
self.package_data_directory = package_data_directory self.package_data_directory = package_data_directory
self.clear_logcat_lock = threading.Lock()
def reset(self, fastboot=False): # pylint: disable=arguments-differ def reset(self, fastboot=False): # pylint: disable=arguments-differ
try: try:
@ -1182,7 +1183,8 @@ class AndroidTarget(Target):
adb_command(self.adb_name, command, timeout=timeout) adb_command(self.adb_name, command, timeout=timeout)
def clear_logcat(self): def clear_logcat(self):
adb_command(self.adb_name, 'logcat -c', timeout=30) with self.clear_logcat_lock:
adb_command(self.adb_name, 'logcat -c', timeout=30)
def get_logcat_monitor(self, regexps=None): def get_logcat_monitor(self, regexps=None):
return LogcatMonitor(self, regexps) return LogcatMonitor(self, regexps)