Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add logging framework.

Browse Source 
DEBUG messages are completely optimized out if NDEBUG is defined.
This commit is contained in:
Peter Johnson
2015-07-31 22:41:26 -07:00
parent afcfdb13a0
commit 4356e313ec
9 changed files with 143 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/NetworkConnection.cpp
View File

@@ -8,20 +8,13 @@
#include "NetworkConnection.h"
#include "tcpsockets/TCPStream.h"
#include "Log.h"
#include "raw_socket_istream.h"
#include "WireDecoder.h"
#include "WireEncoder.h"
using namespace nt;
inline void DEBUG(const char* str, ...) {
va_list args;
va_start(args, str);
vfprintf(stderr, str, args);
fputc('\n', stderr);
va_end(args);
}
NetworkConnection::NetworkConnection(std::unique_ptr<TCPStream> stream,
HandshakeFunc handshake,
Message::GetEntryTypeFunc get_entry_type,
@@ -81,8 +74,8 @@ void NetworkConnection::ReadThreadMain() {
[&] {
decoder.set_proto_rev(m_proto_rev);
auto msg = Message::Read(decoder, m_get_entry_type);
if (!msg)
DEBUG("error reading in handshake: %s", decoder.error());
if (!msg && decoder.error())
DEBUG("error reading in handshake: " << decoder.error());
return msg;
},
[&](llvm::ArrayRef<std::shared_ptr<Message>> msgs) {
@@ -116,11 +109,11 @@ void NetworkConnection::WriteThreadMain() {
while (m_active) {
auto msgs = m_outgoing.pop();
DEBUG("write thread woke up");
DEBUG4("write thread woke up");
if (msgs.empty()) break;
encoder.set_proto_rev(m_proto_rev);
encoder.Reset();
DEBUG("sending %d messages", msgs.size());
DEBUG4("sending " << msgs.size() << " messages");
for (auto& msg : msgs) {
if (msg) msg->Write(encoder);
}
@@ -128,7 +121,7 @@ void NetworkConnection::WriteThreadMain() {
if (!m_stream) break;
if (encoder.size() == 0) continue;
if (m_stream->send(encoder.data(), encoder.size(), &err) == 0) break;
DEBUG("sent %d bytes", encoder.size());
DEBUG4("sent " << encoder.size() << " bytes");
}
m_state = static_cast<int>(kDead);
m_active = false;