1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLocalSocket/Win: Use QIODevice's internal write buffer

Browse Source 
Remove the extra write buffer from QLocalSocketPrivate and use
QIODevice's new internal write buffer.

Change-Id: I4297774ee89da2df59782adae8b804296e7f3301
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Joerg Bornemann 2016-04-06 16:38:54 +02:00 committed by Joerg Bornemann
parent 1675d9a1b2
commit 082ee835b0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/socket/qlocalsocket_p.h
View File

@ -61,7 +61,6 @@
#if defined(QT_LOCALSOCKET_TCP) #if defined(QT_LOCALSOCKET_TCP)
# include "qtcpsocket.h" # include "qtcpsocket.h"
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
# include <private/qringbuffer_p.h>
# include "private/qwindowspipereader_p.h" # include "private/qwindowspipereader_p.h"
# include "private/qwindowspipewriter_p.h" # include "private/qwindowspipewriter_p.h"
# include <qwineventnotifier.h> # include <qwineventnotifier.h>
@ -134,7 +133,6 @@ public:
void _q_pipeClosed(); void _q_pipeClosed();
void _q_winError(ulong windowsError, const QString &function); void _q_winError(ulong windowsError, const QString &function);
HANDLE handle; HANDLE handle;
QRingBuffer writeBuffer;
QWindowsPipeWriter *pipeWriter; QWindowsPipeWriter *pipeWriter;
QWindowsPipeReader *pipeReader; QWindowsPipeReader *pipeReader;
QLocalSocket::LocalSocketError error; QLocalSocket::LocalSocketError error;

3
src/network/socket/qlocalsocket_win.cpp
View File

@ -107,6 +107,7 @@ QLocalSocketPrivate::QLocalSocketPrivate() : QIODevicePrivate(),
error(QLocalSocket::UnknownSocketError), error(QLocalSocket::UnknownSocketError),
state(QLocalSocket::UnconnectedState) state(QLocalSocket::UnconnectedState)
{ {
writeBufferChunkSize = QIODEVICE_BUFFERSIZE;
} }
QLocalSocketPrivate::~QLocalSocketPrivate() QLocalSocketPrivate::~QLocalSocketPrivate()
@ -232,7 +233,6 @@ void QLocalSocket::abort()
if (d->pipeWriter) { if (d->pipeWriter) {
delete d->pipeWriter; delete d->pipeWriter;
d->pipeWriter = 0; d->pipeWriter = 0;
d->writeBuffer.clear();
} }
close(); close();
} }
@ -290,6 +290,7 @@ void QLocalSocket::close()
if (openMode() == NotOpen) if (openMode() == NotOpen)
return; return;
d->setWriteChannelCount(0);
QIODevice::close(); QIODevice::close();
d->serverName = QString(); d->serverName = QString();
d->fullServerName = QString(); d->fullServerName = QString();