Increase default packet timeout for android to 20s

[tberghammer]

Summary

Increase default packet timeout for android to 20s

It is required because of the unreliable speed of the adb communication and the android emulator.

[ovyalov]

Please see my comments.

source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp

44 ↗

(On Diff #20584)

Could you add secs suffix to this variable?

44 ↗

(On Diff #20584)

If there is no existing use cases to modify this variable I'd rather declare it as constexpr within anonymous namespace.

[tberghammer]

source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp

44 ↗

(On Diff #20584)

Renamed to g_default_packet_timeout_sec

44 ↗

(On Diff #20584)

As far as I know constexpr is not supported by MSVC but I made these variables const.

lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp

 
 // Project includes
 #include "ProcessGDBRemoteLog.h"
 #include "Utility/StringExtractorGDBRemote.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
+#ifdef __ANDROID__
+    const static uint32_t g_default_packet_timeout_sec = 20; // seconds
+#else
+    const static uint32_t g_default_packet_timeout_sec = 0; // not specified
+#endif
+
 //----------------------------------------------------------------------
 // GDBRemoteCommunicationServerCommon constructor
 //----------------------------------------------------------------------
 GDBRemoteCommunicationServerCommon::GDBRemoteCommunicationServerCommon(const char *comm_name, const char *listener_name) :
     GDBRemoteCommunicationServer (comm_name, listener_name),
     m_spawned_pids (),
     m_spawned_pids_mutex (Mutex::eMutexTypeRecursive),
     m_process_launch_info (),
#else   // #if defined(__APPLE__)
     if (HostInfo::GetHostname(s))
     {
         response.PutCString ("hostname:");
         response.PutCStringAsRawHex8(s.c_str());
         response.PutChar(';');
     }
 #endif  // #if defined(__APPLE__)
 
+    if (g_default_packet_timeout_sec > 0)
+        response.Printf ("default_packet_timeout:%u;", g_default_packet_timeout_sec);
+
     return SendPacketNoLock (response.GetData(), response.GetSize());
 }
 
 GDBRemoteCommunication::PacketResult
 GDBRemoteCommunicationServerCommon::Handle_qProcessInfoPID (StringExtractorGDBRemote &packet)
 {
     // Packet format: "qProcessInfoPID:%i" where %i is the pid
     packet.SetFilePos (::strlen ("qProcessInfoPID:"));