6b859ce330
Using LastRead() was MT-unsafe when the same socket was used for both writing and reading from different threads. It's not clear if this change is sufficient to make wxSocket fully MT-safe in this scenario, but it does help and there should be no negative effects from doing this. Closes #17787. Closes https://github.com/wxWidgets/wxWidgets/pull/761
88 lines
2.3 KiB
C++
88 lines
2.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/common/sckstrm.cpp
|
|
// Purpose: wxSocket*Stream
|
|
// Author: Guilhem Lavaux
|
|
// Modified by:
|
|
// Created: 17/07/97
|
|
// Copyright: (c)
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_SOCKETS && wxUSE_STREAMS
|
|
|
|
#include "wx/sckstrm.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/stream.h"
|
|
#endif
|
|
|
|
#include "wx/socket.h"
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxSocketOutputStream
|
|
// ---------------------------------------------------------------------------
|
|
|
|
wxSocketOutputStream::wxSocketOutputStream(wxSocketBase& s)
|
|
: m_o_socket(&s)
|
|
{
|
|
}
|
|
|
|
wxSocketOutputStream::~wxSocketOutputStream()
|
|
{
|
|
}
|
|
|
|
size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
|
|
{
|
|
const size_t ret = m_o_socket->Write(buffer, size).LastWriteCount();
|
|
m_lasterror = m_o_socket->Error()
|
|
? m_o_socket->IsClosed() ? wxSTREAM_EOF
|
|
: wxSTREAM_WRITE_ERROR
|
|
: wxSTREAM_NO_ERROR;
|
|
return ret;
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxSocketInputStream
|
|
// ---------------------------------------------------------------------------
|
|
|
|
wxSocketInputStream::wxSocketInputStream(wxSocketBase& s)
|
|
: m_i_socket(&s)
|
|
{
|
|
}
|
|
|
|
wxSocketInputStream::~wxSocketInputStream()
|
|
{
|
|
}
|
|
|
|
size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
|
|
{
|
|
const size_t ret = m_i_socket->Read(buffer, size).LastReadCount();
|
|
m_lasterror = m_i_socket->Error()
|
|
? m_i_socket->IsClosed() ? wxSTREAM_EOF
|
|
: wxSTREAM_READ_ERROR
|
|
: wxSTREAM_NO_ERROR;
|
|
return ret;
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxSocketStream
|
|
// ---------------------------------------------------------------------------
|
|
|
|
wxSocketStream::wxSocketStream(wxSocketBase& s)
|
|
: wxSocketInputStream(s), wxSocketOutputStream(s)
|
|
{
|
|
}
|
|
|
|
wxSocketStream::~wxSocketStream()
|
|
{
|
|
}
|
|
|
|
#endif // wxUSE_STREAMS && wxUSE_SOCKETS
|