Page MenuHomeFreeBSD
Files F109945298

D41059.diff
No OneTemporary
Actions

D41059.diff
View Options

diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -442,15 +442,6 @@
const char *t_output_caller; /* Function that called tcp_output */
struct statsblob *t_stats; /* Per-connection stats */
/* Should these be a pointer to the arrays or an array? */
-#ifdef TCP_ACCOUNTING
- uint64_t tcp_cnt_counters[TCP_NUM_CNT_COUNTERS];
- uint64_t tcp_proc_time[TCP_NUM_CNT_COUNTERS];
-#endif
-#ifdef TCP_REQUEST_TRK
- uint32_t tcp_hybrid_start; /* Num of times we started hybrid pacing */
- uint32_t tcp_hybrid_stop; /* Num of times we stopped hybrid pacing */
- uint32_t tcp_hybrid_error; /* Num of times we failed to start hybrid pacing */
-#endif
uint32_t t_logsn; /* Log "serial number" */
uint32_t gput_ts; /* Time goodput measurement started */
tcp_seq gput_seq; /* Outbound measurement seq */
@@ -478,10 +469,6 @@
uint8_t t_end_info_bytes[TCP_END_BYTE_INFO];
uint64_t t_end_info;
};
-#ifdef TCPPCAP
- struct mbufq t_inpkts; /* List of saved input packets. */
- struct mbufq t_outpkts; /* List of saved output packets. */
-#endif
struct osd t_osd; /* storage for Khelp module data */
uint8_t _t_logpoint; /* Used when a BB log points is enabled */
#ifdef TCP_REQUEST_TRK
@@ -489,8 +476,19 @@
uint8_t t_tcpreq_req; /* Request count */
uint8_t t_tcpreq_open; /* Number of open range requests */
uint8_t t_tcpreq_closed; /* Number of closed range requests */
+ uint32_t tcp_hybrid_start; /* Num of times we started hybrid pacing */
+ uint32_t tcp_hybrid_stop; /* Num of times we stopped hybrid pacing */
+ uint32_t tcp_hybrid_error; /* Num of times we failed to start hybrid pacing */
struct tcp_sendfile_track t_tcpreq_info[MAX_TCP_TRK_REQ];
#endif
+#ifdef TCP_ACCOUNTING
+ uint64_t tcp_cnt_counters[TCP_NUM_CNT_COUNTERS];
+ uint64_t tcp_proc_time[TCP_NUM_CNT_COUNTERS];
+#endif
+#ifdef TCPPCAP
+ struct mbufq t_inpkts; /* List of saved input packets. */
+ struct mbufq t_outpkts; /* List of saved output packets. */
+#endif
};
#endif /* _KERNEL || _WANT_TCPCB */

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 12, 1:36 PM (19 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16611322
Default Alt Text
D41059.diff (2 KB)

Event Timeline