support the qModuleInfo packet in debug sessions

## Purpose
Properly support the `qModuleInfo` packet in both platform and debug
sessions.

## Overview
* Move the `onModuleInfo` function from `PlatformSessionImpl` into
`FileOperationsMixin`, making it available in both `PlatformSessionImpl`
and `DebugSessionImpl`
* Re-enable lldb tests that are fixed by this change

## Problem Details
A lot of lldb tests rely on unwinding through stack frames in standard
libraries like `libc.so` and `libc++.so`. It turns out ds2 was not
properly resolving symbols in these libraries because it failed to query
their module info and therefore lldb never copied them into module
cache. This issue was addressed for processes running in Android
sandboxes when `qModuleInfo` support was added in
246c9c0. However, this implementation
was only wired-up in the **platform** session implementation and not in
**debug** session. Apparently lldb uses `qModuleInfo` in both session
contexts. By moving the implementation of `onQueryModuleInfo` into the
shared `FileOperationsMixin` class, it becomes available in both session
types.

## Validation
Locally verified the re-enabled tests pass on an Android x86_64 emulator

Author: andrurogerz

Headers/DebugServer2/GDBRemote/Mixins/FileOperationsMixin.h

@@ -50,6 +50,9 @@ template <typename T> class FileOperationsMixin : public T {
 protected:
   ErrorCode onFileSetPermissions(Session &session, std::string const &path,
                                  uint32_t mode) override;
+  ErrorCode onQueryModuleInfo(Session &session, std::string &path,
+                              std::string &triple,
+                              ModuleInfo &info) const override;
 
 #if 0
     // more F packets:

Headers/DebugServer2/GDBRemote/PlatformSessionImpl.h

@@ -43,10 +43,6 @@ class PlatformSessionImplBase : public DummySessionDelegateImpl {
   ErrorCode onQueryGroupName(Session &session, GroupId const &gid,
                              std::string &name) const override;
 
-  ErrorCode onQueryModuleInfo(Session &session, std::string &path,
-                              std::string &triple,
-                              ModuleInfo &info) const override;
-
 protected:
   ErrorCode onLaunchDebugServer(Session &session, std::string const &host,
                                 uint16_t &port, ProcessId &pid) override;

Sources/GDBRemote/Mixins/FileOperationsMixin.hpp

@@ -13,6 +13,12 @@
 #include "DebugServer2/GDBRemote/Mixins/FileOperationsMixin.h"
 #include "DebugServer2/Host/Platform.h"
 
+#include <iomanip>
+#include <sstream>
+
+using ds2::Host::File;
+using ds2::Host::Platform;
+
 namespace ds2 {
 namespace GDBRemote {
 
@@ -94,5 +100,35 @@ ErrorCode FileOperationsMixin<T>::onFileSetPermissions(Session &session,
                                                        uint32_t mode) {
   return Host::File::chmod(path, mode);
 }
+
+template <typename T>
+ErrorCode FileOperationsMixin<T>::onQueryModuleInfo(Session &session,
+                                                     std::string &path,
+                                                     std::string &triple,
+                                                     ModuleInfo &info) const {
+  ByteVector buildId;
+  if (!Platform::GetExecutableFileBuildID(path, buildId))
+    return kErrorUnknown;
+
+  // TODO(andrurogerz): Not all executable files contain an embedded build ID.
+  // If GetExecutableFileBuildID fails, calculate an md5 hash of the file
+  // contents and return that as an "md5" field instead of the "uuid" field.
+
+  // send the uuid as a hex-encoded, upper-case string
+  std::ostringstream ss;
+  for(const auto b : buildId)
+    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << int(b);
+
+  auto error = File::fileSize(path, info.file_size);
+  if (error != kSuccess)
+    return error;
+
+  info.uuid = ss.str();
+  info.triple = triple;
+  info.file_path = path;
+  info.file_offset = 0;
+
+  return kSuccess;
+}
 } // namespace GDBRemote
 } // namespace ds2

Sources/GDBRemote/PlatformSessionImpl.cpp

@@ -14,10 +14,6 @@
 #include "DebugServer2/Host/ProcessSpawner.h"
 #include "DebugServer2/Utils/Log.h"
 
-#include <sstream>
-
-using ds2::Host::File;
-using ds2::Host::Platform;
 using ds2::Host::ProcessSpawner;
 
 namespace ds2 {
@@ -96,31 +92,6 @@ ErrorCode PlatformSessionImplBase::onQueryGroupName(Session &,
     return kSuccess;
 }
 
-ErrorCode PlatformSessionImplBase::onQueryModuleInfo(Session &session,
-                                                     std::string &path,
-                                                     std::string &triple,
-                                                     ModuleInfo &info) const {
-  ByteVector buildId;
-  if (!Platform::GetExecutableFileBuildID(path, buildId))
-    return kErrorUnknown;
-
-  // send the uuid as a hex-encoded, upper-case string
-  std::ostringstream ss;
-  for(const auto b : buildId)
-    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << int(b);
-
-  auto error = File::fileSize(path, info.file_size);
-  if (error != kSuccess)
-    return error;
-
-  info.uuid = ss.str();
-  info.triple = triple;
-  info.file_path = path;
-  info.file_offset = 0;
-
-  return kSuccess;
-}
-
 ErrorCode PlatformSessionImplBase::onLaunchDebugServer(Session &session,
                                                        std::string const &host,
                                                        uint16_t &port,

Support/Testing/Excluded/ds2/android-x86_64.excluded

@@ -3,64 +3,34 @@ lldbsuite.test.lldbtest.TestPrintf.test_dwarf
 lldbsuite.test.lldbtest.TestPrintf.test_dwo
 TestAttachDenied.AttachDeniedTestCase.test_attach_to_process_by_id_denied
 TestBadAddressBreakpoints.BadAddressBreakpointTestCase.test_bad_address_breakpoints
-TestBreakpointInGlobalConstructor.TestBreakpointInGlobalConstructors.test
 TestBreakpointSetRestart.BreakpointSetRestart.test_breakpoint_set_restart_dwarf
 TestBreakpointSetRestart.BreakpointSetRestart.test_breakpoint_set_restart_dwo
-TestBtAliasRepeat.TestCase.test_dwarf
-TestBtAliasRepeat.TestCase.test_dwo
 TestChangeProcessGroup.ChangeProcessGroupTestCase.test_setpgid
-TestCompletion.CommandLineCompletionTestCase.test_process_unload
-TestConcurrentNWatchNBreak.ConcurrentNWatchNBreak.test
-TestConcurrentSignalNWatchNBreak.ConcurrentSignalNWatchNBreak.test
 TestConcurrentVFork.TestConcurrentVFork.test_follow_child_fork_call_exec
 TestConcurrentVFork.TestConcurrentVFork.test_follow_child_fork_no_exec
 TestConcurrentVFork.TestConcurrentVFork.test_follow_child_vfork_call_exec
 TestConcurrentVFork.TestConcurrentVFork.test_follow_child_vfork_no_exec
-TestConstVariables.ConstVariableTestCase.test_and_run_command_dwarf
-TestConstVariables.ConstVariableTestCase.test_and_run_command_dwo
 TestContainerCommands.TestCmdContainer.test_container_add
-TestCPPThis.CPPThisTestCase.test_with_run_command_dwarf
-TestCPPThis.CPPThisTestCase.test_with_run_command_dwo
 TestCreateAfterAttach.CreateAfterAttachTestCase.test_create_after_attach_dwarf
 TestCreateAfterAttach.CreateAfterAttachTestCase.test_create_after_attach_dwo
-TestCStrings.CStringsTestCase.test_with_run_command_dwarf
-TestCStrings.CStringsTestCase.test_with_run_command_dwo
 TestDeletedExecutable.TestDeletedExecutable.test
-TestDWIMPrint.TestCase.test_expressions_dwarf
-TestDWIMPrint.TestCase.test_expressions_dwo
 TestExec.ExecTestCase.test_correct_thread_plan_state_before_exec
 TestExec.ExecTestCase.test_hitting_exec
 TestExec.ExecTestCase.test_skipping_exec
 TestExpressionInSyscall.ExprSyscallTestCase.test_setpgid_dwarf
 TestExpressionInSyscall.ExprSyscallTestCase.test_setpgid_dwo
-TestExprs.BasicExprCommandsTestCase.test_expr_commands_can_handle_quotes_dwarf
-TestExprs.BasicExprCommandsTestCase.test_expr_commands_can_handle_quotes_dwo
 TestFrames.FrameAPITestCase.test_get_arg_vals_for_call_stack_dwarf
 TestFrames.FrameAPITestCase.test_get_arg_vals_for_call_stack_dwo
-TestFunctionTypes.FunctionTypesTestCase.test_pointers_dwarf
-TestFunctionTypes.FunctionTypesTestCase.test_pointers_dwo
 TestGdbRemote
-TestHandleAbort.HandleAbortTestCase.test_inferior_handle_sigabrt
 TestHelloWorld.HelloWorldTestCase.test_with_attach_to_process_with_id_api
 TestHelloWorld.HelloWorldTestCase.test_with_attach_to_process_with_name_api
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_disassemble_dwarf
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_disassemble_dwo
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_dwarf
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_dwo
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_expr_dwarf
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_expr_dwo
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_step_dwarf
-TestInferiorAssert.AssertingInferiorTestCase.test_inferior_asserting_step_dwo
 TestInferiorCrashing.CrashingInferiorTestCase.test_inferior_crashing_dwarf
 TestInferiorCrashing.CrashingInferiorTestCase.test_inferior_crashing_dwo
-TestIRInterpreter.IRInterpreterTestCase.test_ir_interpreter
 TestLldbGdbServer
 TestLoadUnload.LoadUnloadTestCase.test_lldb_process_load_and_unload_commands
 TestLoadUnload.LoadUnloadTestCase.test_lldb_process_load_and_unload_commands_with_svr4
 TestLoadUnload.LoadUnloadTestCase.test_static_init_during_load
 TestMainThreadExit.ThreadExitTestCase.test
-TestMemoryFind.MemoryFindTestCase.test_memory_find_dwarf
-TestMemoryFind.MemoryFindTestCase.test_memory_find_dwo
 TestNonStop.LldbGdbServerTestCase.test_exit_llgs
 TestNonStop.LldbGdbServerTestCase.test_exit_query_llgs
 TestNonStop.LldbGdbServerTestCase.test_leave_nonstop_llgs
@@ -75,13 +45,9 @@ TestNonStop.LldbGdbServerTestCase.test_vCont_then_partial_stop_llgs
 TestNonStop.LldbGdbServerTestCase.test_vCont_then_partial_stop_run_both_llgs
 TestNonStop.LldbGdbServerTestCase.test_vCont_then_stop_llgs
 TestNonStop.LldbGdbServerTestCase.test_vCtrlC_llgs
-TestNoreturnUnwind.NoreturnUnwind.test_dwarf
-TestNoreturnUnwind.NoreturnUnwind.test_dwo
 TestPartialResume.TestPartialResume.test_vCont_cxcx_llgs
 TestPartialResume.TestPartialResume.test_vCont_cxcxt_llgs
 TestPlatformCommand.PlatformCommandTestCase.test_status
-TestPrintfAfterUp.Radar9531204TestCase.test_expr_commands_dwarf
-TestPrintfAfterUp.Radar9531204TestCase.test_expr_commands_dwo
 TestProcessAttach.ProcessAttachTestCase.test_attach_to_process_by_id
 TestProcessAttach.ProcessAttachTestCase.test_attach_to_process_by_id_autocontinue
 TestProcessAttach.ProcessAttachTestCase.test_attach_to_process_by_id_correct_executable_offset
@@ -98,11 +64,6 @@ TestReturnValue.ReturnValueTestCase.test_vector_values_dwarf
 TestReturnValue.ReturnValueTestCase.test_vector_values_dwo
 TestReturnValue.ReturnValueTestCase.test_with_python_dwarf
 TestReturnValue.ReturnValueTestCase.test_with_python_dwo
-TestSaveJITObjects.SaveJITObjectsTestCase.test_save_jit_objects_dwarf
-TestSaveJITObjects.SaveJITObjectsTestCase.test_save_jit_objects_dwo
-TestScriptedResolver.TestScriptedResolver.test_command_line
-TestScriptedResolver.TestScriptedResolver.test_scripted_resolver
-TestScriptedResolver.TestScriptedResolver.test_search_depths
 TestSendSignal.SendSignalTestCase.test_with_run_command_dwarf
 TestSendSignal.SendSignalTestCase.test_with_run_command_dwo
 TestSettings.SettingsCommandTestCase.test_launchsimple_args_and_env_vars
@@ -115,24 +76,14 @@ TestSignal.TestSignal.test_signal_minus_one_llgs
 TestSignal.TestSignal.test_signal_process_by_pid_llgs
 TestSignal.TestSignal.test_signal_process_minus_one_llgs
 TestSignal.TestSignal.test_signal_process_without_tid_llgs
-TestSignedTypes.SignedTypesTestCase.test_dwarf
-TestSignedTypes.SignedTypesTestCase.test_dwo
 TestStateAfterExpression.TestStopReasonAfterExpression.test_thread_state_after_expr_dwarf
 TestStateAfterExpression.TestStopReasonAfterExpression.test_thread_state_after_expr_dwo
-TestStdCXXDisassembly.StdCXXDisassembleTestCase.test_stdcxx_disasm_dwarf
-TestStdCXXDisassembly.StdCXXDisassembleTestCase.test_stdcxx_disasm_dwo
-TestStepAndBreakpoints.TestCStepping.test_and_python_api_dwarf
-TestStepAndBreakpoints.TestCStepping.test_and_python_api_dwo
-TestStepThroughTrampoline.StepThroughTrampoline.test_dwarf
-TestStepThroughTrampoline.StepThroughTrampoline.test_dwo
 TestSyntheticCapping.SyntheticCappingTestCase.test_with_run_command_dwo
 TestTargetCreateDeps.TargetDependentsTestCase.test_dependents_explicit_default_exe
 TestTargetCreateDeps.TargetDependentsTestCase.test_dependents_explicit_false_exe
 TestTargetCreateDeps.TargetDependentsTestCase.test_dependents_explicit_false_lib
 TestTargetCreateDeps.TargetDependentsTestCase.test_dependents_implicit_default_exe
 TestTargetCreateDeps.TargetDependentsTestCase.test_dependents_implicit_default_lib
-TestThreadAPI.ThreadAPITestCase.test_step_out_of_malloc_into_function_b_dwarf
-TestThreadAPI.ThreadAPITestCase.test_step_out_of_malloc_into_function_b_dwo
 TestThreadSelectionBug.TestThreadSelectionBug.test
 TestUnalignedLargeWatchpoint.UnalignedLargeWatchpointTestCase.test_unaligned_large_watchpoint
 TestUnwindExpression.UnwindFromExpressionTest.test_unwind_expression_dwarf