Commit eb471208 authored by neverlord's avatar neverlord

fewer debug output

parent 045941bf
...@@ -377,14 +377,14 @@ class middleman { ...@@ -377,14 +377,14 @@ class middleman {
}; };
bool peer_connection::continue_reading() { bool peer_connection::continue_reading() {
DEBUG("peer_connection::continue_reading"); //DEBUG("peer_connection::continue_reading");
for (;;) { for (;;) {
m_rd_buf.append_from(m_istream.get()); m_rd_buf.append_from(m_istream.get());
if (!m_rd_buf.full()) return true; // try again later if (!m_rd_buf.full()) return true; // try again later
switch (m_rd_state) { switch (m_rd_state) {
case wait_for_process_info: { case wait_for_process_info: {
DEBUG("peer_connection::continue_reading: " //DEBUG("peer_connection::continue_reading: "
"wait_for_process_info"); // "wait_for_process_info");
uint32_t process_id; uint32_t process_id;
process_information::node_id_type node_id; process_information::node_id_type node_id;
memcpy(&process_id, m_rd_buf.data(), sizeof(uint32_t)); memcpy(&process_id, m_rd_buf.data(), sizeof(uint32_t));
...@@ -402,16 +402,16 @@ bool peer_connection::continue_reading() { ...@@ -402,16 +402,16 @@ bool peer_connection::continue_reading() {
break; break;
} }
case wait_for_msg_size: { case wait_for_msg_size: {
DEBUG("peer_connection::continue_reading: wait_for_msg_size"); //DEBUG("peer_connection::continue_reading: wait_for_msg_size");
uint32_t msg_size; uint32_t msg_size;
memcpy(&msg_size, m_rd_buf.data(), sizeof(uint32_t)); memcpy(&msg_size, m_rd_buf.data(), sizeof(uint32_t));
DEBUG("msg_size: " << msg_size); //DEBUG("msg_size: " << msg_size);
m_rd_buf.reset(msg_size); m_rd_buf.reset(msg_size);
m_rd_state = read_message; m_rd_state = read_message;
break; break;
} }
case read_message: { case read_message: {
DEBUG("peer_connection::continue_reading: read_message"); //DEBUG("peer_connection::continue_reading: read_message");
addressed_message msg; addressed_message msg;
binary_deserializer bd(m_rd_buf.data(), m_rd_buf.size()); binary_deserializer bd(m_rd_buf.data(), m_rd_buf.size());
m_meta_msg->deserialize(&msg, &bd); m_meta_msg->deserialize(&msg, &bd);
...@@ -516,7 +516,7 @@ class peer_acceptor : public network_channel { ...@@ -516,7 +516,7 @@ class peer_acceptor : public network_channel {
} }
bool continue_reading() { bool continue_reading() {
DEBUG("peer_acceptor::continue_reading"); //DEBUG("peer_acceptor::continue_reading");
// accept as many connections as possible // accept as many connections as possible
for (;;) { for (;;) {
auto opt = m_acceptor->try_accept_connection(); auto opt = m_acceptor->try_accept_connection();
...@@ -554,7 +554,7 @@ class middleman_overseer : public network_channel { ...@@ -554,7 +554,7 @@ class middleman_overseer : public network_channel {
: super(parent, pipe_fd), m_queue(q) { } : super(parent, pipe_fd), m_queue(q) { }
bool continue_reading() { bool continue_reading() {
DEBUG("middleman_overseer::continue_reading"); //DEBUG("middleman_overseer::continue_reading");
static constexpr size_t num_dummies = 256; static constexpr size_t num_dummies = 256;
uint8_t dummies[num_dummies]; uint8_t dummies[num_dummies];
auto read_result = ::read(read_handle(), dummies, num_dummies); auto read_result = ::read(read_handle(), dummies, num_dummies);
...@@ -595,8 +595,8 @@ class middleman_overseer : public network_channel { ...@@ -595,8 +595,8 @@ class middleman_overseer : public network_channel {
} }
case middleman_message_type::unpublish: { case middleman_message_type::unpublish: {
if (msg->published_actor) { if (msg->published_actor) {
DEBUG("middleman_overseer: unpublish actor id " //DEBUG("middleman_overseer: unpublish actor id "
<< msg->published_actor->id()); // << msg->published_actor->id());
auto channel = parent()->acceptor_of(msg->published_actor); auto channel = parent()->acceptor_of(msg->published_actor);
if (channel) { if (channel) {
parent()->erase(channel); parent()->erase(channel);
...@@ -605,7 +605,7 @@ class middleman_overseer : public network_channel { ...@@ -605,7 +605,7 @@ class middleman_overseer : public network_channel {
break; break;
} }
case middleman_message_type::outgoing_message: { case middleman_message_type::outgoing_message: {
DEBUG("middleman_overseer: outgoing_message"); //DEBUG("middleman_overseer: outgoing_message");
auto& target_peer = msg->out_msg.first; auto& target_peer = msg->out_msg.first;
auto& out_msg = msg->out_msg.second; auto& out_msg = msg->out_msg.second;
CPPA_REQUIRE(target_peer != nullptr); CPPA_REQUIRE(target_peer != nullptr);
...@@ -672,7 +672,7 @@ void middleman::operator()(int pipe_fd, middleman_queue& queue) { ...@@ -672,7 +672,7 @@ void middleman::operator()(int pipe_fd, middleman_queue& queue) {
wrset_ptr = &wrset; wrset_ptr = &wrset;
} }
CPPA_REQUIRE(maxfd > 0); CPPA_REQUIRE(maxfd > 0);
DEBUG("select()"); //DEBUG("select()");
int sresult; int sresult;
do { do {
sresult = select(maxfd + 1, &rdset, wrset_ptr, nullptr, nullptr); sresult = select(maxfd + 1, &rdset, wrset_ptr, nullptr, nullptr);
...@@ -681,7 +681,7 @@ void middleman::operator()(int pipe_fd, middleman_queue& queue) { ...@@ -681,7 +681,7 @@ void middleman::operator()(int pipe_fd, middleman_queue& queue) {
} }
} }
while (sresult == 0); while (sresult == 0);
DEBUG("continue reading ..."); //DEBUG("continue reading ...");
{ // iterate over all channels and remove channels as needed { // iterate over all channels and remove channels as needed
for (auto& channel : m_channels) { for (auto& channel : m_channels) {
if (FD_ISSET(channel->read_handle(), &rdset)) { if (FD_ISSET(channel->read_handle(), &rdset)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment