firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix skydb gdb_attach for non-android configs

Browse Source 
I dumped a bunch of android-specific goop into
gdb_attach in my previous commit.  This fixes that.

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/859103002
This commit is contained in:
Eric Seidel 2015-01-20 14:55:37 -08:00
parent c08797471f
commit 5c827f59c0
1 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
engine/src/flutter/tools/skydb
View File

@ -40,6 +40,8 @@ DEFAULT_URL = "https://raw.githubusercontent.com/domokit/mojo/master/sky/example
ANDROID_PACKAGE = "org.chromium.mojo.shell" ANDROID_PACKAGE = "org.chromium.mojo.shell"
ANDROID_ACTIVITY = "%s/.MojoShellActivity" % ANDROID_PACKAGE ANDROID_ACTIVITY = "%s/.MojoShellActivity" % ANDROID_PACKAGE
CACHE_LINKS_PATH = '/tmp/mojo_cache_links'
SYSTEM_LIBS_ROOT_PATH = '/tmp/device_libs'
# FIXME: Move this into mopy.config # FIXME: Move this into mopy.config
@ -389,12 +391,9 @@ class SkyDebugger(object):
] ]
subprocess.call(['adb', 'logcat', '-d', '-s'] + TAGS) subprocess.call(['adb', 'logcat', '-d', '-s'] + TAGS)
def gdb_attach_command(self, args): def _start_mojo_cache_linker(self, links_path):
self.paths = self._create_paths_for_build_dir(self.pids['build_dir'])
self._kill_if_exists('mojo_cache_linker_pid', 'mojo cache linker') self._kill_if_exists('mojo_cache_linker_pid', 'mojo cache linker')
links_path = '/tmp/mojo_cache_links'
if not os.path.exists(links_path): if not os.path.exists(links_path):
os.makedirs(links_path) os.makedirs(links_path)
shell_link_path = os.path.join(links_path, 'libmojo_shell.so') shell_link_path = os.path.join(links_path, 'libmojo_shell.so')
@ -413,15 +412,11 @@ class SkyDebugger(object):
self.pids['build_dir'], self.pids['build_dir'],
'http://localhost:%s' % self.pids['remote_sky_server_port'] 'http://localhost:%s' % self.pids['remote_sky_server_port']
] ]
self.pids['mojo_cache_linker_pid'] = \ return subprocess.Popen(cache_linker_cmd, stdin=logcat.stdout).pid
subprocess.Popen(cache_linker_cmd, stdin=logcat.stdout).pid
# Write out our pid file before we exec ourselves.
self._write_pid_file(PID_FILE_PATH, self.pids)
def _pull_system_libraries(self, system_libs_root):
# Pull down the system libraries this pid has already mapped in. # Pull down the system libraries this pid has already mapped in.
# TODO(eseidel): This does not handle dynamic loads well. # TODO(eseidel): This does not handle dynamic loads.
system_libs_root = '/tmp/device_libs'
library_cacher_path = os.path.join( library_cacher_path = os.path.join(
self.paths.sky_tools_directory, 'android_library_cacher.py') self.paths.sky_tools_directory, 'android_library_cacher.py')
subprocess.call([ subprocess.call([
@ -430,35 +425,57 @@ class SkyDebugger(object):
# TODO(eseidel): adb_gdb does, this, unclear why solib-absolute-prefix # TODO(eseidel): adb_gdb does, this, unclear why solib-absolute-prefix
# doesn't make this explicit listing not necessary? # doesn't make this explicit listing not necessary?
system_lib_dirs = subprocess.check_output([ return subprocess.check_output([
'find', system_libs_root, 'find', system_libs_root,
'-mindepth', '1', '-mindepth', '1',
'-maxdepth', '4', '-maxdepth', '4',
'-type', 'd', '-type', 'd',
]).strip().split('\n') ]).strip().split('\n')
# TODO(eseidel): Need to sync down system libraries into a directory.
symbol_search_paths = system_lib_dirs + [ def gdb_attach_command(self, args):
links_path, self.paths = self._create_paths_for_build_dir(self.pids['build_dir'])
self.pids['build_dir'],
symbol_search_paths = [self.pids['build_dir']]
gdb_path = '/usr/bin/gdb'
init_commands = [
'file %s' % self.paths.mojo_shell_path,
'directory %s' % self.paths.src_root,
'target remote localhost:%s' % GDB_PORT,
] ]
# TODO(eseidel): We need to look up the toolchain somehow?
gdb_path = os.path.join(SRC_ROOT, 'third_party/android_tools/ndk/' # A bunch of extra work is needed for android:
'toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/' if 'remote_sky_server_port' in self.pids:
'bin/arm-linux-androideabi-gdb') pid = self._start_mojo_cache_linker(CACHE_LINKS_PATH)
gdb_command = [ self.pids['mojo_cache_linker_pid'] = pid
gdb_path,
'--eval-command', 'file %s' % self.paths.mojo_shell_path, system_lib_dirs = self._pull_system_libraries(SYSTEM_LIBS_ROOT_PATH)
'--eval-command', 'directory %s' % self.paths.src_root, init_commands.append(
'--eval-command', 'target remote localhost:%s' % GDB_PORT, 'set solib-absolute-prefix %s' % SYSTEM_LIBS_ROOT_PATH)
'--eval-command', 'set solib-search-path %s' %
':'.join(symbol_search_paths), symbol_search_paths = system_lib_dirs + symbol_search_paths
'--eval-command', 'set solib-absolute-prefix %s' % system_libs_root, symbol_search_paths.append(CACHE_LINKS_PATH)
]
print " ".join(gdb_command) # TODO(eseidel): We need to look up the toolchain somehow?
# We don't want python listening for signals or anything, so exec gdb_path = os.path.join(SRC_ROOT, 'third_party/android_tools/ndk/'
# gdb and let it take the entire process. 'toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/'
os.execv(gdb_command[0], gdb_command) 'bin/arm-linux-androideabi-gdb')
# Set solib-search-path after letting android modify symbol_search_paths
init_commands.append(
'set solib-search-path %s' % ':'.join(symbol_search_paths))
exec_command = [gdb_path]
for command in init_commands:
exec_command += ['--eval-command', command]
print " ".join(exec_command)
# Write out our pid file before we exec ourselves.
self._write_pid_file(PID_FILE_PATH, self.pids)
# Exec gdb directly to avoid python intercepting symbols, etc.
os.execv(exec_command[0], exec_command)
def print_crash_command(self, args): def print_crash_command(self, args):
logcat_cmd = ['adb', 'logcat', '-d'] logcat_cmd = ['adb', 'logcat', '-d']