3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-29 00:46:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

const correctness

Browse source
This commit is contained in:
badaix 2015-07-26 18:12:41 +02:00
parent c0057d2575
commit d216064baa
4 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/clientConnection.cpp
View file

@ -46,14 +46,10 @@ void ClientConnection::socketRead(void* _to, size_t _bytes)
size_t len = 0; size_t len = 0;
do do
{ {
// cout << "/";
// cout.flush();
// boost::system::error_code error; // boost::system::error_code error;
len += socket_->read_some(boost::asio::buffer((char*)_to + len, toRead)); len += socket_->read_some(boost::asio::buffer((char*)_to + len, toRead));
//cout << "len: " << len << ", error: " << error << endl; //cout << "len: " << len << ", error: " << error << endl;
toRead = _bytes - len; toRead = _bytes - len;
// cout << "\\";
// cout.flush();
} }
while (toRead > 0); while (toRead > 0);
} }
@ -110,7 +106,7 @@ void ClientConnection::stop()
} }
bool ClientConnection::send(msg::BaseMessage* message) bool ClientConnection::send(const msg::BaseMessage* message) const
{ {
// std::unique_lock<std::mutex> mlock(mutex_); // std::unique_lock<std::mutex> mlock(mutex_);
//logD << "send: " << message->type << ", size: " << message->getSize() << "\n"; //logD << "send: " << message->type << ", size: " << message->getSize() << "\n";
@ -127,13 +123,13 @@ bool ClientConnection::send(msg::BaseMessage* message)
} }
shared_ptr<msg::SerializedMessage> ClientConnection::sendRequest(msg::BaseMessage* message, const chronos::msec& timeout) shared_ptr<msg::SerializedMessage> ClientConnection::sendRequest(const msg::BaseMessage* message, const chronos::msec& timeout)
{ {
shared_ptr<msg::SerializedMessage> response(NULL); shared_ptr<msg::SerializedMessage> response(NULL);
if (++reqId_ >= 10000) if (++reqId_ >= 10000)
reqId_ = 1; reqId_ = 1;
message->id = reqId_; message->id = reqId_;
// logD << "Req: " << reqId_ << "\n"; // logO << "Req: " << message->id << "\n";
shared_ptr<PendingRequest> pendingRequest(new PendingRequest(reqId_)); shared_ptr<PendingRequest> pendingRequest(new PendingRequest(reqId_));
{ {
@ -146,7 +142,7 @@ shared_ptr<msg::SerializedMessage> ClientConnection::sendRequest(msg::BaseMessag
{ {
response = pendingRequest->response; response = pendingRequest->response;
sumTimeout_ = chronos::msec(0); sumTimeout_ = chronos::msec(0);
// logD << "Resp: " << pendingRequest->id << "\n"; // logO << "Resp: " << pendingRequest->id << "\n";
} }
else else
{ {
@ -215,7 +211,7 @@ void ClientConnection::reader()
catch (const std::exception& e) catch (const std::exception& e)
{ {
if (messageReceiver_ != NULL) if (messageReceiver_ != NULL)
messageReceiver_->onException(this, e); messageReceiver_->onException(this, e);
} }
catch (...) catch (...)
{ {

10
client/clientConnection.h
View file

@ -62,11 +62,11 @@ public:
virtual ~ClientConnection(); virtual ~ClientConnection();
virtual void start(); virtual void start();
virtual void stop(); virtual void stop();
virtual bool send(msg::BaseMessage* message); virtual bool send(const msg::BaseMessage* message) const;
virtual std::shared_ptr<msg::SerializedMessage> sendRequest(msg::BaseMessage* message, const chronos::msec& timeout = chronos::msec(1000)); virtual std::shared_ptr<msg::SerializedMessage> sendRequest(const msg::BaseMessage* message, const chronos::msec& timeout = chronos::msec(1000));
template <typename T> template <typename T>
std::shared_ptr<T> sendReq(msg::BaseMessage* message, const chronos::msec& timeout = chronos::msec(1000)) std::shared_ptr<T> sendReq(const msg::BaseMessage* message, const chronos::msec& timeout = chronos::msec(1000))
{ {
std::shared_ptr<msg::SerializedMessage> reply = sendRequest(message, timeout); std::shared_ptr<msg::SerializedMessage> reply = sendRequest(message, timeout);
if (!reply) if (!reply)
@ -76,12 +76,12 @@ public:
return msg; return msg;
} }
virtual bool active() virtual bool active() const
{ {
return active_; return active_;
} }
virtual bool connected() virtual bool connected() const
{ {
return (socket_ != 0); return (socket_ != 0);
// return (connected_ && socket); // return (connected_ && socket);

11
server/serverSession.cpp
View file

@ -96,7 +96,7 @@ void ServerSession::socketRead(void* _to, size_t _bytes)
} }
void ServerSession::add(shared_ptr<msg::BaseMessage> message) void ServerSession::add(const shared_ptr<const msg::BaseMessage>& message)
{ {
if (!message || !streamActive_) if (!message || !streamActive_)
return; return;
@ -107,9 +107,9 @@ void ServerSession::add(shared_ptr<msg::BaseMessage> message)
} }
bool ServerSession::send(msg::BaseMessage* message) bool ServerSession::send(const msg::BaseMessage* message) const
{ {
// logD << "send: " << message->type << ", size: " << message->size << ", id: " << message->id << ", refers: " << message->refersTo << "\n"; // logO << "send: " << message->type << ", size: " << message->size << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
std::unique_lock<std::mutex> mlock(mutex_); std::unique_lock<std::mutex> mlock(mutex_);
if (!socket_) if (!socket_)
return false; return false;
@ -119,6 +119,7 @@ bool ServerSession::send(msg::BaseMessage* message)
message->sent = t; message->sent = t;
message->serialize(stream); message->serialize(stream);
boost::asio::write(*socket_.get(), streambuf); boost::asio::write(*socket_.get(), streambuf);
// logO << "done: " << message->type << ", size: " << message->size << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
return true; return true;
} }
@ -130,7 +131,7 @@ void ServerSession::getNextMessage()
vector<char> buffer(baseMsgSize); vector<char> buffer(baseMsgSize);
socketRead(&buffer[0], baseMsgSize); socketRead(&buffer[0], baseMsgSize);
baseMessage.deserialize(&buffer[0]); baseMessage.deserialize(&buffer[0]);
// logD << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n"; // logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
if (baseMessage.size > buffer.size()) if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size); buffer.resize(baseMessage.size);
socketRead(&buffer[0], baseMessage.size); socketRead(&buffer[0], baseMessage.size);
@ -169,7 +170,7 @@ void ServerSession::writer()
{ {
boost::asio::streambuf streambuf; boost::asio::streambuf streambuf;
std::ostream stream(&streambuf); std::ostream stream(&streambuf);
shared_ptr<msg::BaseMessage> message; shared_ptr<const msg::BaseMessage> message;
while (active_) while (active_)
{ {
if (messages_.try_pop(message, std::chrono::milliseconds(500))) if (messages_.try_pop(message, std::chrono::milliseconds(500)))

8
server/serverSession.h
View file

@ -50,10 +50,10 @@ public:
~ServerSession(); ~ServerSession();
void start(); void start();
void stop(); void stop();
bool send(msg::BaseMessage* message); bool send(const msg::BaseMessage* message) const;
void add(std::shared_ptr<msg::BaseMessage> message); void add(const std::shared_ptr<const msg::BaseMessage>& message);
virtual bool active() virtual bool active() const
{ {
return active_; return active_;
} }
@ -77,7 +77,7 @@ protected:
std::thread* writerThread_; std::thread* writerThread_;
std::shared_ptr<tcp::socket> socket_; std::shared_ptr<tcp::socket> socket_;
MessageReceiver* messageReceiver_; MessageReceiver* messageReceiver_;
Queue<std::shared_ptr<msg::BaseMessage>> messages_; Queue<std::shared_ptr<const msg::BaseMessage>> messages_;
}; };