Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F97643441
D43091.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D43091.diff
View Options
diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@@ -236,7 +236,6 @@
static int tcp_bind_threads = 2;
#endif
static int tcp_use_irq_cpu = 0;
-static uint32_t *cts_last_ran;
static int hpts_does_tp_logging = 0;
static int32_t tcp_hptsi(struct tcp_hpts_entry *hpts, int from_callout);
@@ -1098,7 +1097,7 @@
hpts->p_lasttick = hpts->p_curtick;
hpts->p_curtick = tcp_gethptstick(&tv);
- cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv);
+ tcp_pace.cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv);
orig_exit_slot = hpts->p_cur_slot = tick_to_wheel(hpts->p_curtick);
if ((hpts->p_on_queue_cnt == 0) ||
(hpts->p_lasttick == hpts->p_curtick)) {
@@ -1441,7 +1440,7 @@
goto again;
}
no_run:
- cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv);
+ tcp_pace.cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv);
/*
* Set flag to tell that we are done for
* any slot input that happens during
@@ -1523,8 +1522,8 @@
}
oldest_idx = -1;
for (i = start; i < end; i++) {
- if (TSTMP_GT(cts, cts_last_ran[i]))
- calc = cts - cts_last_ran[i];
+ if (TSTMP_GT(cts, tcp_pace.cts_last_ran[i]))
+ calc = cts - tcp_pace.cts_last_ran[i];
else
calc = 0;
if (calc > time_since_ran) {
@@ -1830,7 +1829,7 @@
sz = (tcp_pace.rp_num_hptss * sizeof(struct tcp_hpts_entry *));
tcp_pace.rp_ent = malloc(sz, M_TCPHPTS, M_WAITOK | M_ZERO);
sz = (sizeof(uint32_t) * tcp_pace.rp_num_hptss);
- cts_last_ran = malloc(sz, M_TCPHPTS, M_WAITOK);
+ tcp_pace.cts_last_ran = malloc(sz, M_TCPHPTS, M_WAITOK);
tcp_pace.grp_cnt = 0;
if (cpu_top == NULL) {
tcp_pace.grp_cnt = 1;
@@ -1916,7 +1915,7 @@
SYSCTL_ADD_UINT(&hpts->hpts_ctx,
SYSCTL_CHILDREN(hpts->hpts_root),
OID_AUTO, "lastran", CTLFLAG_RD,
- &cts_last_ran[i], 0,
+ &tcp_pace.cts_last_ran[i], 0,
"The last usec tick that this hpts ran");
SYSCTL_ADD_LONG(&hpts->hpts_ctx,
SYSCTL_CHILDREN(hpts->hpts_root),
@@ -1937,7 +1936,7 @@
hpts->p_hpts_sleep_time = hpts_sleep_max;
hpts->p_num = i;
hpts->p_curtick = tcp_gethptstick(&tv);
- cts_last_ran[i] = tcp_tv_to_usectick(&tv);
+ tcp_pace.cts_last_ran[i] = tcp_tv_to_usectick(&tv);
hpts->p_prev_slot = hpts->p_cur_slot = tick_to_wheel(hpts->p_curtick);
hpts->p_cpu = 0xffff;
hpts->p_nxt_slot = hpts_slot(hpts->p_cur_slot, 1);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Oct 1, 1:32 PM (22 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13253381
Default Alt Text
D43091.diff (2 KB)
Attached To
Mode
D43091: tcp_hpts: use tcp_pace.cts_last_ran for last ran table
Attached
Detach File
Event Timeline
Log In to Comment