diff options
Diffstat (limited to 'src/vnet/tcp')
| -rwxr-xr-x | src/vnet/tcp/tcp_debug.h | 19 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_input.c | 5 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/vnet/tcp/tcp_debug.h b/src/vnet/tcp/tcp_debug.h index d35691173c1..2e67c84cc33 100755 --- a/src/vnet/tcp/tcp_debug.h +++ b/src/vnet/tcp/tcp_debug.h @@ -21,7 +21,7 @@ #define TCP_DEBUG (1) #define TCP_DEBUG_SM (0) #define TCP_DEBUG_CC (0) -#define TCP_DEBUG_CC_STAT (1) +#define TCP_DEBUG_CC_STAT (0) #define TCP_DEBUG_BUFFER_ALLOCATION (0) #define foreach_tcp_dbg_evt \ @@ -767,6 +767,9 @@ if (_tc->c_cc_stat_tstamp + STATS_INTERVAL < tcp_time_now()) \ _tc->c_cc_stat_tstamp = tcp_time_now(); \ } \ } +#else +#define TCP_EVT_CC_STAT_HANDLER(_tc, ...) +#endif /* * Buffer allocation @@ -776,22 +779,22 @@ if (_tc->c_cc_stat_tstamp + STATS_INTERVAL < tcp_time_now()) \ #define TCP_DBG_BUFFER_ALLOC_MAYBE_FAIL(thread_index) \ { \ static u32 *buffer_fail_counters; \ - if (PREDICT_FALSE (buffer_fail_counters == 0)) \ + if (PREDICT_FALSE (buffer_fail_counters == 0)) \ { \ u32 num_threads; \ - vlib_thread_main_t *vtm = vlib_get_thread_main (); \ + vlib_thread_main_t *vtm = vlib_get_thread_main (); \ num_threads = 1 /* main thread */ + vtm->n_threads; \ vec_validate (buffer_fail_counters, num_threads - 1); \ } \ if (PREDICT_FALSE (tcp_main.buffer_fail_fraction != 0.0)) \ { \ - if (PREDICT_TRUE (buffer_fail_counters[thread_index] > 0)) \ + if (PREDICT_TRUE (buffer_fail_counters[thread_index] > 0)) \ { \ - if ((1.0 / (f32) (buffer_fail_counters[thread_index])) \ + if ((1.0 / (f32) (buffer_fail_counters[thread_index])) \ < tcp_main.buffer_fail_fraction) \ { \ buffer_fail_counters[thread_index] = 0.0000001; \ - return -1; \ + return -1; \ } \ } \ buffer_fail_counters[thread_index] ++; \ @@ -801,10 +804,6 @@ if (_tc->c_cc_stat_tstamp + STATS_INTERVAL < tcp_time_now()) \ #define TCP_DBG_BUFFER_ALLOC_MAYBE_FAIL(thread_index) #endif -#else -#define TCP_EVT_CC_STAT_HANDLER(_tc, ...) -#endif - #endif /* SRC_VNET_TCP_TCP_DEBUG_H_ */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index a1cdc76c626..497b709bec0 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -2780,9 +2780,8 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* 3. check for a SYN (did that already) */ /* Make sure connection wasn't just created */ - child0 = - tcp_lookup_connection (lc0->c_fib_index, b0, my_thread_index, - is_ip4); + child0 = tcp_lookup_connection (lc0->c_fib_index, b0, + my_thread_index, is_ip4); if (PREDICT_FALSE (child0->state != TCP_STATE_LISTEN)) { error0 = TCP_ERROR_CREATE_EXISTS; |