Commit 84b78586 authored by Joseph Noir's avatar Joseph Noir

Cleanup, add counter for measurements

parent ef639010
...@@ -90,7 +90,7 @@ struct newb_base : public network::event_handler { ...@@ -90,7 +90,7 @@ struct newb_base : public network::event_handler {
// -- transport policy --------------------------------------------------------- // -- transport policy ---------------------------------------------------------
struct transport_policy { struct transport_policy {
transport_policy() : received_bytes{0}, max_consecutive_reads{50} { transport_policy() : received_bytes{0}, max_consecutive_reads{50}, count{0} {
// nop // nop
} }
...@@ -126,7 +126,7 @@ struct transport_policy { ...@@ -126,7 +126,7 @@ struct transport_policy {
// nop // nop
} }
inline byte_buffer& wr_buf() { virtual byte_buffer& wr_buf() {
return offline_buffer; return offline_buffer;
} }
...@@ -161,6 +161,7 @@ struct transport_policy { ...@@ -161,6 +161,7 @@ struct transport_policy {
byte_buffer offline_buffer; byte_buffer offline_buffer;
byte_buffer receive_buffer; byte_buffer receive_buffer;
byte_buffer send_buffer; byte_buffer send_buffer;
size_t count;
}; };
using transport_policy_ptr = std::unique_ptr<transport_policy>; using transport_policy_ptr = std::unique_ptr<transport_policy>;
......
...@@ -39,10 +39,6 @@ struct tcp_transport : public io::network::transport_policy { ...@@ -39,10 +39,6 @@ struct tcp_transport : public io::network::transport_policy {
void prepare_next_write(io::network::event_handler* parent) override; void prepare_next_write(io::network::event_handler* parent) override;
inline io::network::byte_buffer& wr_buf() {
return offline_buffer;
}
void flush(io::network::event_handler* parent) override; void flush(io::network::event_handler* parent) override;
expected<io::network::native_socket> expected<io::network::native_socket>
......
...@@ -44,7 +44,7 @@ struct udp_transport : public io::network::transport_policy { ...@@ -44,7 +44,7 @@ struct udp_transport : public io::network::transport_policy {
void prepare_next_write(io::network::event_handler* parent) override; void prepare_next_write(io::network::event_handler* parent) override;
io::network::byte_buffer& wr_buf(); io::network::byte_buffer& wr_buf() override;
void flush(io::network::event_handler* parent) override; void flush(io::network::event_handler* parent) override;
......
...@@ -73,9 +73,7 @@ tcp_transport::tcp_transport() ...@@ -73,9 +73,7 @@ tcp_transport::tcp_transport()
error tcp_transport::read_some(io::network::event_handler* parent) { error tcp_transport::read_some(io::network::event_handler* parent) {
CAF_LOG_TRACE(""); CAF_LOG_TRACE("");
std::cerr << "read some called" << std::endl;
size_t len = receive_buffer.size() - collected; size_t len = receive_buffer.size() - collected;
receive_buffer.resize(len);
void* buf = receive_buffer.data() + collected; void* buf = receive_buffer.data() + collected;
auto sres = ::recv(parent->fd(), auto sres = ::recv(parent->fd(),
reinterpret_cast<io::network::socket_recv_ptr>(buf), reinterpret_cast<io::network::socket_recv_ptr>(buf),
...@@ -137,6 +135,7 @@ error tcp_transport::write_some(io::network::event_handler* parent) { ...@@ -137,6 +135,7 @@ error tcp_transport::write_some(io::network::event_handler* parent) {
return sec::runtime_error; return sec::runtime_error;
size_t result = (sres > 0) ? static_cast<size_t>(sres) : 0; size_t result = (sres > 0) ? static_cast<size_t>(sres) : 0;
written += result; written += result;
count += 1;
auto remaining = send_buffer.size() - written; auto remaining = send_buffer.size() - written;
if (remaining == 0) if (remaining == 0)
prepare_next_write(parent); prepare_next_write(parent);
...@@ -176,7 +175,7 @@ tcp_transport::connect(const std::string& host, uint16_t port, ...@@ -176,7 +175,7 @@ tcp_transport::connect(const std::string& host, uint16_t port,
} }
expected<io::network::native_socket> expected<io::network::native_socket>
accept_tcp::create_socket(uint16_t port,const char* host,bool reuse) { accept_tcp::create_socket(uint16_t port, const char* host, bool reuse) {
return io::network::new_tcp_acceptor_impl(port, host, reuse); return io::network::new_tcp_acceptor_impl(port, host, reuse);
} }
...@@ -194,7 +193,6 @@ accept_tcp::accept(io::network::event_handler* parent) { ...@@ -194,7 +193,6 @@ accept_tcp::accept(io::network::event_handler* parent) {
return {invalid_native_socket, nullptr}; return {invalid_native_socket, nullptr};
} }
} }
std::cerr << "accepted connection" << std::endl;
transport_policy_ptr ptr{new tcp_transport}; transport_policy_ptr ptr{new tcp_transport};
return {result, std::move(ptr)}; return {result, std::move(ptr)};
} }
......
...@@ -106,7 +106,6 @@ void udp_transport::prepare_next_read(io::network::event_handler*) { ...@@ -106,7 +106,6 @@ void udp_transport::prepare_next_read(io::network::event_handler*) {
} }
error udp_transport::write_some(io::network::event_handler* parent) { error udp_transport::write_some(io::network::event_handler* parent) {
std::cerr << "sending on socket: " << parent->fd() << std::endl;
using namespace caf::io::network; using namespace caf::io::network;
CAF_LOG_TRACE(CAF_ARG(parent->fd()) << CAF_ARG(send_buffer.size())); CAF_LOG_TRACE(CAF_ARG(parent->fd()) << CAF_ARG(send_buffer.size()));
socket_size_type len = static_cast<socket_size_type>(*endpoint.clength()); socket_size_type len = static_cast<socket_size_type>(*endpoint.clength());
...@@ -114,7 +113,6 @@ error udp_transport::write_some(io::network::event_handler* parent) { ...@@ -114,7 +113,6 @@ error udp_transport::write_some(io::network::event_handler* parent) {
auto buf_len = send_sizes.front(); auto buf_len = send_sizes.front();
auto sres = ::sendto(parent->fd(), buf_ptr, buf_len, auto sres = ::sendto(parent->fd(), buf_ptr, buf_len,
0, endpoint.caddress(), len); 0, endpoint.caddress(), len);
std::cerr << "sent " << sres << " bytes to " << to_string(endpoint) << std::endl;
if (is_error(sres, true)) { if (is_error(sres, true)) {
std::cerr << "sento failed: " << last_socket_error_as_string() << std::endl; std::cerr << "sento failed: " << last_socket_error_as_string() << std::endl;
std::abort(); std::abort();
...@@ -124,7 +122,7 @@ error udp_transport::write_some(io::network::event_handler* parent) { ...@@ -124,7 +122,7 @@ error udp_transport::write_some(io::network::event_handler* parent) {
send_sizes.pop_front(); send_sizes.pop_front();
written += (sres > 0) ? static_cast<size_t>(sres) : 0; written += (sres > 0) ? static_cast<size_t>(sres) : 0;
auto remaining = send_buffer.size() - written; auto remaining = send_buffer.size() - written;
std::cerr << "wrote '" << written << "' got '" << remaining << "' bytes left to write" << std::endl; count += 1;
if (remaining == 0) if (remaining == 0)
prepare_next_write(parent); prepare_next_write(parent);
return none; return none;
...@@ -154,7 +152,6 @@ io::network::byte_buffer& udp_transport::wr_buf() { ...@@ -154,7 +152,6 @@ io::network::byte_buffer& udp_transport::wr_buf() {
auto chunk_size = offline_buffer.size() - offline_sum; auto chunk_size = offline_buffer.size() - offline_sum;
offline_sizes.push_back(chunk_size); offline_sizes.push_back(chunk_size);
offline_sum += chunk_size; offline_sum += chunk_size;
std::cerr << "adding chunk '" << chunk_size << "' up to total of '" << offline_sum << std::endl;
} }
return offline_buffer; return offline_buffer;
} }
......
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