Ticket #11867: slave_disable_callbacks.patch

mythtv/libs/libmythbase/mythsocket.cpp

@@ -330 +330 @@
 bool MythSocket::SendReceiveStringList(
     QStringList &strlist, uint min_reply_length, uint timeoutMS)
 {
-    if (m_callback)
+    if (m_callback && m_disableReadyReadCallback.testAndSetOrdered(0,0))
     {
         // If callbacks are enabled then SendReceiveStringList() will conflict
         // causing failed reads and socket disconnections - see #11777
@@ -338 +338 @@
         // the control socket
         LOG(VB_GENERAL, LOG_EMERG, QString("Programmer Error! "
                                            "SendReceiveStringList(%1) used on "
-                                           "socket with callbacks.")
+                                           "socket with callbacks enabled.")
                                 .arg(strlist.isEmpty() ? "empty" : strlist[0]));
-        return false;
     }
 
     if (!WriteStringList(strlist))

mythtv/programs/mythbackend/mainserver.cpp

@@ -425 +425 @@
 
 void MainServer::readyRead(MythSocket *sock)
 {
-    sockListLock.lockForRead();
-    PlaybackSock *testsock = GetPlaybackBySock(sock);
-    bool expecting_reply = testsock && testsock->isExpectingReply();
-    sockListLock.unlock();
-    if (expecting_reply)
-    {
-        LOG(VB_GENERAL, LOG_INFO, "readyRead ignoring, expecting reply");
-        return;
-    }
-
     threadPool.startReserved(
         new ProcessRequestRunnable(*this, sock),
         "ProcessRequest", PRT_TIMEOUT);
@@ -6247 +6237 @@
         }
     }
 
+    // Calling SendReceiveStringList() with callbacks enabled is asking for
+    // trouble, our reply might be swallowed by readyRead
+    masterServerSock->SetReadyReadCallbackEnabled(false);
     if (!masterServerSock->SendReceiveStringList(strlist, 1) ||
         (strlist[0] == "ERROR"))
     {
@@ -6268 +6261 @@
         masterServerReconnect->start(kMasterServerReconnectTimeout);
         return;
     }
+    masterServerSock->SetReadyReadCallbackEnabled(true);
 
     masterServer = new PlaybackSock(this, masterServerSock, server,
                                     kPBSEvents_Normal);

mythtv/programs/mythbackend/playbacksock.cpp

@@ -28 +28 @@
     ip = "";
     backend = false;
     mediaserver = false;
-    expectingreply = false;
 
     disconnected = false;
     blockshutdown = true;
@@ -81 +80 @@
 
     {
         QMutexLocker locker(&sockLock);
-        expectingreply = true;
+        sock->SetReadyReadCallbackEnabled(false);
 
         ok = sock->SendReceiveStringList(strlist);
         while (ok && strlist[0] == "BACKEND_MESSAGE")
@@ -98 +97 @@
 
             ok = sock->ReadStringList(strlist);
         }
-
-        expectingreply = false;
+        sock->SetReadyReadCallbackEnabled(true);
     }
 
     sock->DecrRef();

mythtv/programs/mythbackend/playbacksock.h

@@ -54 +54 @@
     bool isMediaServer(void) const { return mediaserver; }
     void setAsMediaServer(void) { mediaserver = true; }
 
-    bool isExpectingReply(void) const { return expectingreply; }
-
     void setIP(QString &lip) { ip = lip; }
     QString getIP(void) const { return ip; }
 
@@ -118 +116 @@
 
     QMutex sockLock;
 
-    bool expectingreply;
     bool disconnected;
 
     MainServer *m_parent;