Fix Qt socket deadlock across parallel send/receive.

Author: Mysticial

Common/Cpp/Sockets/AbstractClientSocket.h

@@ -59,7 +59,7 @@ class AbstractClientSocket{
     virtual void close() noexcept = 0;
     virtual void connect(const std::string& address, uint16_t port) = 0;
 
-    virtual size_t blocking_send(const void* data, size_t bytes) = 0;
+    virtual size_t send(const void* data, size_t bytes) = 0;
 
 
 protected:

Common/Cpp/Sockets/ClientSocket_POSIX.h

@@ -67,7 +67,7 @@ class ClientSocket_POSIX final : public AbstractClientSocket{
     }
 
 
-    virtual size_t blocking_send(const void* data, size_t bytes) override{
+    virtual size_t send(const void* data, size_t bytes) override{
         if (m_socket == -1){
             return 0;
         }

Common/Cpp/Sockets/ClientSocket_Qt.h

@@ -62,9 +62,12 @@ class ClientSocket_Qt final : public QThread, public AbstractClientSocket{
         emit internal_connect(address, port);
     }
 
-    virtual size_t blocking_send(const void* data, size_t bytes) override{
-//        cout << "blocking_send() - start: " << std::string((const char*)data, bytes) << endl;
+    virtual size_t send(const void* data, size_t bytes) override{
+//        cout << "send() - start: " << std::string((const char*)data, bytes) << endl;
+        emit internal_send(std::string((const char*)data, bytes));
+        return bytes;
 
+#if 0
         SendData send_data;
         send_data.data = data;
         send_data.total_bytes = bytes;
@@ -77,14 +80,15 @@ class ClientSocket_Qt final : public QThread, public AbstractClientSocket{
             return send_data.data == nullptr || m_socket == nullptr;
         });
 
-//        cout << "blocking_send() - end: " << std::string((const char*)data, bytes) << endl;
+//        cout << "send() - end: " << std::string((const char*)data, bytes) << endl;
         return send_data.bytes_sent;
+#endif
     }
 
 
 signals:
     void internal_connect(const std::string& address, uint16_t port);
-    void send(void* data);
+    void internal_send(std::string packet);
 
 private:
     virtual void run() override{
@@ -134,6 +138,29 @@ class ClientSocket_Qt final : public QThread, public AbstractClientSocket{
                 m_socket->connectToHost(QHostAddress(QString::fromStdString(address)), port);
             }
         );
+        QThread::connect(
+            this, &ClientSocket_Qt::internal_send,
+            &socket, [this](std::string packet){
+//                cout << "internal_send() - enter: " << packet.data() << endl;
+
+                size_t bytes = packet.size();
+
+                const char* ptr = (const char*)packet.data();
+                while (bytes > 0 && m_socket->state() == QAbstractSocket::ConnectedState){
+                    qint64 current_sent = m_socket->write(ptr, bytes);
+                    if (current_sent <= 0){
+                        break;
+                    }
+                    ptr += current_sent;
+                    bytes -= current_sent;
+                }
+
+                m_socket->flush();
+
+//                cout << "internal_send() - exit " << endl;
+            }
+        );
+#if 0
         QThread::connect(
             this, &ClientSocket_Qt::send,
             &socket, [this](void* params){
@@ -165,6 +192,7 @@ class ClientSocket_Qt final : public QThread, public AbstractClientSocket{
 //                cout << "internal_send() - exit " << endl;
             }
         );
+#endif
 
 
         {

Common/Cpp/Sockets/ClientSocket_WinSocket.h

@@ -66,7 +66,7 @@ class ClientSocket_WinSocket final : public AbstractClientSocket{
     }
 
 
-    virtual size_t blocking_send(const void* data, size_t bytes) override{
+    virtual size_t send(const void* data, size_t bytes) override{
         if (m_socket == INVALID_SOCKET){
             return 0;
         }

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp

@@ -111,7 +111,7 @@ ControllerModeStatus TcpSysbotBase_Connection::controller_mode_status() const{
 void TcpSysbotBase_Connection::write_data(const std::string& data){
     WriteSpinLock lg(m_send_lock, "TcpSysbotBase_Connection::write_data()");
 //    cout << "Sending: " << data << endl;
-    m_socket.blocking_send(data.data(), data.size());
+    m_socket.send(data.data(), data.size());
 }