diff --git a/legislator1/decree.txt b/legislator1/decree.txt deleted file mode 100644 index c227083..0000000 --- a/legislator1/decree.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/legislator1/last-tried.txt b/legislator1/last-tried.txt deleted file mode 100644 index d8263ee..0000000 --- a/legislator1/last-tried.txt +++ /dev/null @@ -1 +0,0 @@ -2 \ No newline at end of file diff --git a/legislator1/next-bal.txt b/legislator1/next-bal.txt deleted file mode 100644 index c227083..0000000 --- a/legislator1/next-bal.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/legislator2/decree.txt b/legislator2/decree.txt deleted file mode 100644 index c227083..0000000 --- a/legislator2/decree.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/legislator2/last-tried.txt b/legislator2/last-tried.txt deleted file mode 100644 index c227083..0000000 --- a/legislator2/last-tried.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/legislator2/next-bal.txt b/legislator2/next-bal.txt deleted file mode 100644 index d8263ee..0000000 --- a/legislator2/next-bal.txt +++ /dev/null @@ -1 +0,0 @@ -2 \ No newline at end of file diff --git a/legislator2/prev-vote-decree.txt b/legislator2/prev-vote-decree.txt deleted file mode 100644 index c227083..0000000 --- a/legislator2/prev-vote-decree.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/legislator2/prev-vote-id.txt b/legislator2/prev-vote-id.txt deleted file mode 100644 index d8263ee..0000000 --- a/legislator2/prev-vote-id.txt +++ /dev/null @@ -1 +0,0 @@ -2 \ No newline at end of file diff --git a/legislator3/decree.txt b/legislator3/decree.txt deleted file mode 100644 index c227083..0000000 --- a/legislator3/decree.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/legislator3/next-bal.txt b/legislator3/next-bal.txt deleted file mode 100644 index d8263ee..0000000 --- a/legislator3/next-bal.txt +++ /dev/null @@ -1 +0,0 @@ -2 \ No newline at end of file diff --git a/legislator3/prev-vote-decree.txt b/legislator3/prev-vote-decree.txt deleted file mode 100644 index c227083..0000000 --- a/legislator3/prev-vote-decree.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/legislator3/prev-vote-id.txt b/legislator3/prev-vote-id.txt deleted file mode 100644 index d8263ee..0000000 --- a/legislator3/prev-vote-id.txt +++ /dev/null @@ -1 +0,0 @@ -2 \ No newline at end of file diff --git a/src/events/listener.cc b/src/events/listener.cc index 2ea0bf0..229396b 100644 --- a/src/events/listener.cc +++ b/src/events/listener.cc @@ -27,8 +27,6 @@ namespace paxos client_socket->fcntl_set_O_NONBLOCK(); - std::cout << "Listener: accepting client ... on " << getpid() << "\n"; - /* Register client_socket */ auto e = event_register.register_event(client_socket); } diff --git a/src/events/receive.cc b/src/events/receive.cc index 4278a98..e6cebd1 100644 --- a/src/events/receive.cc +++ b/src/events/receive.cc @@ -34,10 +34,6 @@ namespace paxos auto origin_ip = connection_->get_origin_ip(); auto origin_port = connection_->get_origin_port(); - std::cerr << "Ready to recv data on " << origin_ip << ":" - << origin_port << " fd: " << sock->fd_get()->fd_ << "\n"; - std::cout << "RECV on pid " << getpid() << "\n"; - auto buf_in = connection_->get_buffer_in(); /* Add try catch to handle session */ try diff --git a/src/events/send.cc b/src/events/send.cc index 7c22557..a47a376 100644 --- a/src/events/send.cc +++ b/src/events/send.cc @@ -26,7 +26,6 @@ namespace paxos auto buffer = connection_->get_buffer_out(); std::string response = buffer.to_string(); - log("Sending a message: ", blue); log(response, white); ssize_t write = 0; try @@ -81,6 +80,7 @@ namespace paxos { std::string ip = legislator->config_.ip; std::string port = legislator->config_.port; + std::string name = legislator->config_.name; shared_socket socket; try { @@ -88,7 +88,7 @@ namespace paxos } catch (const ConnectionFailed& e) { - log("Could not connect to " + legislator->config_.name, red); + log("Could not connect to " + name, red); return; } @@ -96,5 +96,6 @@ namespace paxos message.fill_buffer(connection->get_buffer_out()); event_register.register_event(connection); + log("Sending a message to " + name + ": ", blue); } } diff --git a/src/legislator/legislator.cc b/src/legislator/legislator.cc index 0a83f25..256cafa 100644 --- a/src/legislator/legislator.cc +++ b/src/legislator/legislator.cc @@ -20,7 +20,7 @@ namespace paxos quorum_previous_votes.clear(); int new_ballot_number = ledger.last_tried() + 1; ledger.set_last_tried(new_ballot_number); - log(config_.name + " is initiating ballot " + std::to_string(new_ballot_number), cyan); + log(config_.name + " is initiating ballot " + std::to_string(new_ballot_number), green); send_next_ballot(new_ballot_number); } @@ -47,7 +47,7 @@ namespace paxos { log(config_.name + " has received a NextBallot(" + std::to_string(ballot) - + ") from " + sender, cyan); + + ") from " + sender, green); int next_ballot = ledger.next_bal(); if (ballot <= next_ballot) { @@ -86,7 +86,7 @@ namespace paxos std::string sender = *message.get_header("sender"); log(config_.name + " has received a LastVote(" + ballot_str + ", " + vote_ballot_id_str - + ") from " + sender, cyan); + + ") from " + sender, green); int ballot = std::stoi(ballot_str); int vote_ballot_id = std::stoi(vote_ballot_id_str); int vote_decree = std::stoi(*message.get_header("decree")); @@ -205,7 +205,7 @@ namespace paxos log(config_.name + " has received Voted(" + ballot_str - + ") from " + sender, cyan); + + ") from " + sender, green); receive_voted(std::stoi(ballot_str), decree, sender); } diff --git a/src/misc/fd.cc b/src/misc/fd.cc index f2174f8..e28d139 100644 --- a/src/misc/fd.cc +++ b/src/misc/fd.cc @@ -20,7 +20,6 @@ namespace misc if (*this) { sys::close(fd_); - std::cerr << "Closed " << fd_ << "\n"; } }