mirror of
https://github.com/logicog/RTLPlayground.git
synced 2026-10-29 17:54:14 +08:00
rtlplayground: keep the STP and TCP timers on the system tick
stp_timers() ran every fourth pass of the main loop and stp_clock counted passes, which only measures time while a pass is one tick long. It never quite was: a pass is as long as the packets it handles, and #482 now takes up to four of them, so under an IPv4 stream a pass is about 16 ms and STP time runs at a third of its rate, with hellos 6 s apart and a root aged out after a minute. Since #483 the loop also stops sleeping while packets wait, so under a flood of cheap frames passes come faster than ticks and STP time runs fast instead, shortening the forward delay in exactly the situation a loop produces. uip_periodic() had the same problem from the other side: it ran once per pass, so the retransmit timer sped up with the loop. Both now go by the tick counter the timer interrupt keeps. The STP block catches up on ticks a long pass missed, at most eight steps at a time, and handle_tx() runs its periodics once per tick at most. One byte of xdata more, 48 bytes of code. A host test drives the gate with one pass every 5 ms, every 16 ms and every 0.6 ms for ten seconds each; the STP clock lands on 500 steps in all three, where counting passes gave 156 and 4166. A pass of 1.3 s loses time rather than firing 65 steps at once, and the arithmetic survives the tick counter wrapping.
This commit is contained in:
1 parent
40177f6318
commit
214cc6b737
4 files changed
+108
-9
No files matched your search
+12
-8
@@ -88,11 +88,13 @@ __xdata struct uip_eth_addr uip_ethaddr;
|
||||
volatile __xdata uint32_t ticks;
|
||||
volatile __xdata uint8_t sec_counter;
|
||||
volatile __xdata uint16_t sleep_ticks;
|
||||
__xdata uint8_t stp_clock;
|
||||
__xdata uint8_t stp_tick_last;
|
||||
__xdata uint8_t tx_tick_last;
|
||||
__xdata uint8_t arp_age_secs;
|
||||
extern __xdata struct dhcp_state dhcp_state;
|
||||
|
||||
#define STP_TICK_DIVIDER 3
|
||||
#define STP_TICK_STEP (SYS_TICK_HZ / STP_HZ)
|
||||
#define STP_CATCH_UP 8
|
||||
|
||||
/* Buffer for serial input, SBUF_SIZE must be power of 2 < 256
|
||||
* Writing to this buffer is under the sole control of the serial ISR
|
||||
@@ -1075,6 +1077,9 @@ void handle_rx(void)
|
||||
|
||||
void handle_tx(void)
|
||||
{
|
||||
if (!TICKS_DUE(tx_tick_last, 1))
|
||||
return;
|
||||
tx_tick_last = (uint8_t)ticks;
|
||||
for(uint8_t i = 0; i < UIP_CONNS; i++) {
|
||||
uip_periodic(i);
|
||||
if(uip_len > 0) {
|
||||
@@ -1265,13 +1270,12 @@ void idle(void)
|
||||
// Check UIP for packets to transmit
|
||||
handle_tx();
|
||||
health_phase(HEALTH_PH_TX);
|
||||
// If STP protocol enabled, decrease STP timers to trigger actions
|
||||
// If STP protocol enabled, run its timers once per STP tick that has passed
|
||||
if (stp_enabled) {
|
||||
if (!stp_clock) {
|
||||
stp_clock = STP_TICK_DIVIDER;
|
||||
uint8_t n = STP_CATCH_UP;
|
||||
while (n-- && TICKS_DUE(stp_tick_last, STP_TICK_STEP)) {
|
||||
stp_tick_last += STP_TICK_STEP;
|
||||
stp_timers();
|
||||
} else {
|
||||
stp_clock--;
|
||||
}
|
||||
}
|
||||
health_phase(HEALTH_PH_STP);
|
||||
@@ -1597,7 +1601,7 @@ void check_and_flash_update_image(void)
|
||||
void main(void)
|
||||
{
|
||||
ticks = 0;
|
||||
stp_clock = STP_TICK_DIVIDER;
|
||||
stp_tick_last = (uint8_t)ticks;
|
||||
dhcp_state.state = DHCP_OFF;
|
||||
sbuf_ptr = 0;
|
||||
|
||||
|
||||
Reference in new issue
Block a user