mirror of
https://github.com/debauchee/barrier.git
synced 2026-07-01 09:27:03 +08:00
c79120c049
The commita841b28changed the condition for removing job from processing. New flag MultiplexerJobStatus::continue_servicing become used instead of checking pointer for NULL. However for cases when TCPSocket::newJob() returns nullptr the behaviour changed: earlier the job was removed, but after change it is called again, since MultiplexerJobStatus equal to {true, nullptr} means "run this job again". This leads to problem with eating CPU and RAM on linux https://github.com/debauchee/barrier/issues/470 There is similar windows problem, but not sure it is related. https://github.com/debauchee/barrier/issues/552 Since it looks that the goal ofa841b28was only clarifying object ownership and not changing job deletion behaviour, this commit tries to get original behaviour and fix the bugs above by returning {false, nullptr} instead of {true, nullptr} when TCPSocket::newJob() returns nullptr.
115 lines
3.6 KiB
C++
115 lines
3.6 KiB
C++
/*
|
|
* barrier -- mouse and keyboard sharing utility
|
|
* Copyright (C) 2012-2016 Symless Ltd.
|
|
* Copyright (C) 2002 Chris Schoeneman
|
|
*
|
|
* This package is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* found in the file LICENSE that should have accompanied this file.
|
|
*
|
|
* This package is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "net/IDataSocket.h"
|
|
#include "net/ISocketMultiplexerJob.h"
|
|
#include "io/StreamBuffer.h"
|
|
#include "mt/CondVar.h"
|
|
#include "mt/Mutex.h"
|
|
#include "arch/IArchNetwork.h"
|
|
#include <memory>
|
|
|
|
class Mutex;
|
|
class Thread;
|
|
class IEventQueue;
|
|
class SocketMultiplexer;
|
|
|
|
//! TCP data socket
|
|
/*!
|
|
A data socket using TCP.
|
|
*/
|
|
class TCPSocket : public IDataSocket {
|
|
public:
|
|
TCPSocket(IEventQueue* events, SocketMultiplexer* socketMultiplexer, IArchNetwork::EAddressFamily family);
|
|
TCPSocket(IEventQueue* events, SocketMultiplexer* socketMultiplexer, ArchSocket socket);
|
|
virtual ~TCPSocket();
|
|
|
|
// ISocket overrides
|
|
virtual void bind(const NetworkAddress&);
|
|
virtual void close();
|
|
virtual void* getEventTarget() const;
|
|
|
|
// IStream overrides
|
|
virtual UInt32 read(void* buffer, UInt32 n);
|
|
virtual void write(const void* buffer, UInt32 n);
|
|
virtual void flush();
|
|
virtual void shutdownInput();
|
|
virtual void shutdownOutput();
|
|
virtual bool isReady() const;
|
|
virtual bool isFatal() const;
|
|
virtual UInt32 getSize() const;
|
|
|
|
// IDataSocket overrides
|
|
virtual void connect(const NetworkAddress&);
|
|
|
|
|
|
virtual std::unique_ptr<ISocketMultiplexerJob> newJob();
|
|
|
|
protected:
|
|
enum EJobResult {
|
|
kBreak = -1, //!< Break the Job chain
|
|
kRetry, //!< Retry the same job
|
|
kNew //!< Require a new job
|
|
};
|
|
|
|
ArchSocket getSocket() { return m_socket; }
|
|
IEventQueue* getEvents() { return m_events; }
|
|
virtual EJobResult doRead();
|
|
virtual EJobResult doWrite();
|
|
|
|
void removeJob();
|
|
void setJob(std::unique_ptr<ISocketMultiplexerJob>&& job);
|
|
MultiplexerJobStatus newJobOrStopServicing();
|
|
|
|
bool isReadable() { return m_readable; }
|
|
bool isWritable() { return m_writable; }
|
|
|
|
Mutex& getMutex() { return m_mutex; }
|
|
|
|
void sendEvent(Event::Type);
|
|
void discardWrittenData(int bytesWrote);
|
|
|
|
private:
|
|
void init();
|
|
|
|
void sendConnectionFailedEvent(const char*);
|
|
void onConnected();
|
|
void onInputShutdown();
|
|
void onOutputShutdown();
|
|
void onDisconnected();
|
|
|
|
MultiplexerJobStatus serviceConnecting(ISocketMultiplexerJob*, bool, bool, bool);
|
|
MultiplexerJobStatus serviceConnected(ISocketMultiplexerJob*, bool, bool, bool);
|
|
|
|
protected:
|
|
bool m_readable;
|
|
bool m_writable;
|
|
bool m_connected;
|
|
IEventQueue* m_events;
|
|
StreamBuffer m_inputBuffer;
|
|
StreamBuffer m_outputBuffer;
|
|
|
|
private:
|
|
Mutex m_mutex;
|
|
ArchSocket m_socket;
|
|
CondVar<bool> m_flushed;
|
|
SocketMultiplexer* m_socketMultiplexer;
|
|
};
|