oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

debugging, squash

Browse source
This commit is contained in:
dan 2023-03-02 07:44:30 -08:00
parent c741bc26de
commit 0304172378
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
delete_me Normal file
View file

24
llarp/quic/connection.cpp
View file

@ -654,7 +654,7 @@ namespace llarp::quic
std::optional<uint64_t> ts = get_timestamp();
send_pkt_info = {};
auto send_packet = [&](auto nwrite) -> bool {
auto send_packet = [&](auto nwrite) -> int {
send_buffer_size = nwrite;
log::trace(logcat, "Sending {}B packet", send_buffer_size);
@ -662,9 +662,10 @@ namespace llarp::quic
if (sent.blocked())
{
log::debug(logcat, "Packet send blocked, scheduling retransmit");
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
schedule_retransmit();
return false;
return 0;
}
send_buffer_size = 0;
@ -672,11 +673,12 @@ namespace llarp::quic
{
log::warning(logcat, "I/O error while trying to send packet: {}", sent.str());
// FIXME: disconnect?
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
return false;
return 0;
}
log::debug(logcat, "packet away!");
return true;
return 1;
};
std::list<Stream*> strs;
@ -765,7 +767,7 @@ namespace llarp::quic
nwrite,
ndatalen);
if (nwrite == 0) // we are congestion limited
if (nwrite == 0) // we are probably done, but maybe congested
{
log::debug(logcat,
"Done stream writing to {} (either stream is congested or we have nothing else to "
@ -776,7 +778,8 @@ namespace llarp::quic
ngtcp2_conn_get_conn_stat(conn.get(), &cstat);
log::debug(logcat, "Current unacked bytes in flight: {}, Congestion window: {}",
cstat.bytes_in_flight, cstat.cwnd);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
//log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
//ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
it = strs.erase(it);
continue;
}
@ -793,7 +796,8 @@ namespace llarp::quic
if (!send_packet(nwrite))
return;
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); // so far always useful
++stream_packets;
std::advance(it, 1);
continue;
@ -844,6 +848,7 @@ namespace llarp::quic
if (++stream_packets == max_stream_packets)
{
log::debug(logcat, "Max stream packets ({}) reached", max_stream_packets);
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
return;
}
@ -896,6 +901,7 @@ namespace llarp::quic
if (nwrite == -240) // NGTCP2_ERR_WRITE_MORE
{
log::debug(logcat, "Writing non-stream data frames, and have space left");
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
continue;
}
@ -917,9 +923,11 @@ namespace llarp::quic
log::debug(logcat, "Sending data packet with non-stream data frames");
if (auto rv = send_packet(nwrite); rv != 0)
return;
//ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
}
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts);
schedule_retransmit();
}

10
llarp/quic/endpoint.cpp
View file

@ -350,13 +350,19 @@ namespace llarp::quic
{
Connection& conn = **conn_ptr;
auto exp = ngtcp2_conn_get_expiry(conn);
auto expiry = std::chrono::nanoseconds{static_cast<std::chrono::nanoseconds::rep>(exp)};
auto ngtcp2_expiry_delta = std::chrono::duration_cast<std::chrono::milliseconds>(
expiry - get_time().time_since_epoch());
log::debug(logcat, "ngtcp2_conn_get_expiry returned {} with now_ts {} and expiry_delta {}",
exp, now_ts, ngtcp2_expiry_delta.count());
// a bit of buffer on the expiration time in case the last call to
// ngtcp2_conn_get_expiry() returned ~0ms from now and the connection
// hasn't had time to handle it yet. 5ms should do.
if (exp >= (now_ts - 500'000'000) || conn.draining)
if (ngtcp2_expiry_delta.count() > -500)
continue;
log::debug(logcat, "ngtcp2_conn_get_expiry returned {} with now_ts {}", exp, now_ts);
log::debug(logcat, "Draining connection {}", it->first);
start_draining(conn);
}