# # # patch "netsync.cc" # from [f42c5f943438e73a85eb7f46bf17583459abf073] # to [bae6df9d0412407356a431eb242087afa547bfaa] # ============================================================ --- netsync.cc f42c5f943438e73a85eb7f46bf17583459abf073 +++ netsync.cc bae6df9d0412407356a431eb242087afa547bfaa @@ -1087,21 +1087,18 @@ session::which_events() const Netxx::Probe::ready_type session::which_events() const { - // Only ask to read if we're not armed. - if (outbuf.empty()) + Netxx::Probe::ready_type ret = Netxx::Probe::ready_oobd; + if (!outbuf.empty()) { - if (inbuf.size() < constants::netcmd_maxsz && !armed) - return Netxx::Probe::ready_read | Netxx::Probe::ready_oobd; - else - return Netxx::Probe::ready_oobd; + ret = ret | Netxx::Probe::ready_write; } - else + // Only ask to read if we're not armed, don't go storing + // 128 MB at a time unless we think we need to. + if (inbuf.size() < constants::netcmd_maxsz && !armed) { - if (inbuf.size() < constants::netcmd_maxsz && !armed) - return Netxx::Probe::ready_write | Netxx::Probe::ready_read | Netxx::Probe::ready_oobd; - else - return Netxx::Probe::ready_write | Netxx::Probe::ready_oobd; + ret = ret | Netxx::Probe::ready_read; } + return ret; } bool