summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
407f593)
Type: fix
Change-Id: I4fef896a3556df75532ef938ca2e263287dd74e8
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
fformat (stdout, " \"end_evt_missing\": \"%s\",\n",
end_evt_missing ? "True" : "False");
fformat (stdout, " \"rx_data\": %lld,\n", em->stats.rx_total);
fformat (stdout, " \"end_evt_missing\": \"%s\",\n",
end_evt_missing ? "True" : "False");
fformat (stdout, " \"rx_data\": %lld,\n", em->stats.rx_total);
- fformat (stdout, " \"tx_rx\": %lld,\n", em->stats.tx_total);
+ fformat (stdout, " \"tx_data\": %lld,\n", em->stats.tx_total);
fformat (stdout, " \"closing\": {\n");
fformat (stdout, " \"reset\": { \"q\": %d, \"s\": %d },\n",
em->stats.reset_count.q, em->stats.reset_count.s);
fformat (stdout, " \"closing\": {\n");
fformat (stdout, " \"reset\": { \"q\": %d, \"s\": %d },\n",
em->stats.reset_count.q, em->stats.reset_count.s);
s->bytes_received, s->bytes_received + s->bytes_to_receive,
echo_format_session, s, s->bytes_sent,
s->bytes_sent + s->bytes_to_send);
s->bytes_received, s->bytes_received + s->bytes_to_receive,
echo_format_session, s, s->bytes_sent,
s->bytes_sent + s->bytes_to_send);
+
+ ASSERT (em->stats.tx_total + s->bytes_sent <= em->stats.tx_expected);
+ ASSERT (em->stats.rx_total + s->bytes_received <= em->stats.rx_expected);
clib_atomic_fetch_add (&em->stats.tx_total, s->bytes_sent);
clib_atomic_fetch_add (&em->stats.rx_total, s->bytes_received);
clib_atomic_fetch_add (&em->stats.tx_total, s->bytes_sent);
clib_atomic_fetch_add (&em->stats.rx_total, s->bytes_received);
- if (PREDICT_FALSE (em->stats.rx_total == em->stats.rx_expected))
+ if (PREDICT_FALSE
+ ((em->stats.rx_total == em->stats.rx_expected)
+ && (em->stats.tx_total == em->stats.tx_expected)))
echo_notify_event (em, ECHO_EVT_LAST_BYTE);
}
echo_notify_event (em, ECHO_EVT_LAST_BYTE);
}
{
if (n_sent || n_read)
s->idle_cycles = 0;
{
if (n_sent || n_read)
s->idle_cycles = 0;
- else if (s->idle_cycles++ == 1e7)
+ else if (s->idle_cycles++ == LOG_EVERY_N_IDLE_CYCLES)
{
s->idle_cycles = 0;
ECHO_LOG (2, "Idle client TX:%dB RX:%dB", s->bytes_to_send,
{
s->idle_cycles = 0;
ECHO_LOG (2, "Idle client TX:%dB RX:%dB", s->bytes_to_send,
#define TIMEOUT 10.0
#define LOGGING_BATCH (100)
#define TIMEOUT 10.0
#define LOGGING_BATCH (100)
+#define LOG_EVERY_N_IDLE_CYCLES (1e8)
#define foreach_echo_fail_code \
_(ECHO_FAIL_NONE, "ECHO_FAIL_NONE") \
#define foreach_echo_fail_code \
_(ECHO_FAIL_NONE, "ECHO_FAIL_NONE") \