procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

improved deadlock fix 0.8.35.dev version

This commit is contained in:
John Preston 2015-06-30 01:22:14 +03:00
parent a4223ec3e0
commit bc58c73fb4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/mtproto/mtpConnection.cpp
View File

@ -725,6 +725,7 @@ void MTPautoConnection::httpSend(mtpBuffer &buffer) {
void MTPautoConnection::disconnectFromServer() { void MTPautoConnection::disconnectFromServer() {
if (status == FinishedWork) return; if (status == FinishedWork) return;
status = FinishedWork;
Requests copy = requests; Requests copy = requests;
requests.clear(); requests.clear();
@ -741,7 +742,6 @@ void MTPautoConnection::disconnectFromServer() {
sock.close(); sock.close();
httpStartTimer.stop(); httpStartTimer.stop();
status = FinishedWork;
} }
void MTPautoConnection::connectToServer(const QString &addr, int32 port, int32 flags) { void MTPautoConnection::connectToServer(const QString &addr, int32 port, int32 flags) {
@ -972,6 +972,8 @@ void MTPtcpConnection::onSocketDisconnected() {
} }
void MTPtcpConnection::sendData(mtpBuffer &buffer) { void MTPtcpConnection::sendData(mtpBuffer &buffer) {
if (status == FinishedWork) return;
if (buffer.size() < 3) { if (buffer.size() < 3) {
LOG(("TCP Error: writing bad packet, len = %1").arg(buffer.size() * sizeof(mtpPrime))); LOG(("TCP Error: writing bad packet, len = %1").arg(buffer.size() * sizeof(mtpPrime)));
TCP_LOG(("TCP Error: bad packet %1").arg(mb(&buffer[0], buffer.size() * sizeof(mtpPrime)).str())); TCP_LOG(("TCP Error: bad packet %1").arg(mb(&buffer[0], buffer.size() * sizeof(mtpPrime)).str()));
@ -990,6 +992,9 @@ void MTPtcpConnection::sendData(mtpBuffer &buffer) {
} }
void MTPtcpConnection::disconnectFromServer() { void MTPtcpConnection::disconnectFromServer() {
if (status == FinishedWork) return;
status = FinishedWork;
disconnect(&sock, SIGNAL(readyRead()), 0, 0); disconnect(&sock, SIGNAL(readyRead()), 0, 0);
sock.close(); sock.close();
} }
@ -1043,6 +1048,8 @@ QString MTPtcpConnection::transport() const {
} }
void MTPtcpConnection::socketError(QAbstractSocket::SocketError e) { void MTPtcpConnection::socketError(QAbstractSocket::SocketError e) {
if (status == FinishedWork) return;
_handleTcpError(e, sock); _handleTcpError(e, sock);
emit error(); emit error();
} }
@ -1054,6 +1061,8 @@ MTPhttpConnection::MTPhttpConnection(QThread *thread) : status(WaitingHttp), htt
} }
void MTPhttpConnection::sendData(mtpBuffer &buffer) { void MTPhttpConnection::sendData(mtpBuffer &buffer) {
if (status == FinishedWork) return;
if (buffer.size() < 3) { if (buffer.size() < 3) {
LOG(("TCP Error: writing bad packet, len = %1").arg(buffer.size() * sizeof(mtpPrime))); LOG(("TCP Error: writing bad packet, len = %1").arg(buffer.size() * sizeof(mtpPrime)));
TCP_LOG(("TCP Error: bad packet %1").arg(mb(&buffer[0], buffer.size() * sizeof(mtpPrime)).str())); TCP_LOG(("TCP Error: bad packet %1").arg(mb(&buffer[0], buffer.size() * sizeof(mtpPrime)).str()));
@ -1072,6 +1081,9 @@ void MTPhttpConnection::sendData(mtpBuffer &buffer) {
} }
void MTPhttpConnection::disconnectFromServer() { void MTPhttpConnection::disconnectFromServer() {
if (status == FinishedWork) return;
status = FinishedWork;
Requests copy = requests; Requests copy = requests;
requests.clear(); requests.clear();
for (Requests::const_iterator i = copy.cbegin(), e = copy.cend(); i != e; ++i) { for (Requests::const_iterator i = copy.cbegin(), e = copy.cend(); i != e; ++i) {
@ -1204,7 +1216,9 @@ void MTProtoConnectionPrivate::destroyConn(MTPabstractConnection **conn) {
QWriteLocker lock(&stateConnMutex); QWriteLocker lock(&stateConnMutex);
if (*conn) { if (*conn) {
toDisconnect = *conn; toDisconnect = *conn;
disconnect(*conn, SIGNAL(connected()), 0, 0);
disconnect(*conn, SIGNAL(disconnected()), 0, 0); disconnect(*conn, SIGNAL(disconnected()), 0, 0);
disconnect(*conn, SIGNAL(error(bool)), 0, 0);
disconnect(*conn, SIGNAL(receivedData()), 0, 0); disconnect(*conn, SIGNAL(receivedData()), 0, 0);
disconnect(*conn, SIGNAL(receivedSome()), 0, 0); disconnect(*conn, SIGNAL(receivedSome()), 0, 0);
*conn = 0; *conn = 0;
@ -3026,7 +3040,7 @@ void MTProtoConnectionPrivate::onConnected6() {
QReadLocker lockFinished(&sessionDataMutex); QReadLocker lockFinished(&sessionDataMutex);
if (!sessionData) return; if (!sessionData) return;
disconnect(_conn6, SIGNAL(connected()), this, SLOT(onConnected())); disconnect(_conn6, SIGNAL(connected()), this, SLOT(onConnected6()));
if (!_conn6->isConnected()) { if (!_conn6->isConnected()) {
LOG(("Connection Error: not connected in onConnected(), state: %1").arg(_conn6->debugState())); LOG(("Connection Error: not connected in onConnected(), state: %1").arg(_conn6->debugState()));
return restart(); return restart();