Skip to content

P
PPSi
Commit 4da70724 authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

WR protocol extension improvements 

- Give priority to the time-out and not the number of msg repetitions
- Call also wr_handshake_fail() function when a time-out is detected.
parent ecd72709
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 23 deletions
proto-ext-whiterabbit/common-fun.c
View file @ 4da70724
...@@ -44,6 +44,5 @@ int wr_handshake_retry(struct pp_instance *ppi) ...@@ -44,6 +44,5 @@ int wr_handshake_retry(struct pp_instance *ppi)
pp_diag(ppi, ext, 1, "Retry on timeout\n"); pp_diag(ppi, ext, 1, "Retry on timeout\n");
return 1; /* yes, retry */ return 1; /* yes, retry */
} }
wr_handshake_fail(ppi);
return 0; /* don't retry, we are over already */ return 0; /* don't retry, we are over already */
} }
proto-ext-whiterabbit/state-wr-calibrated.c
View file @ 4da70724
...@@ -48,13 +48,14 @@ int wr_calibrated(struct pp_instance *ppi, void *buf, int len, int new_state) ...@@ -48,13 +48,14 @@ int wr_calibrated(struct pp_instance *ppi, void *buf, int len, int new_state)
{ {
/* Check if tmo expired */ /* Check if tmo expired */
int rms=pp_next_delay_1(ppi, wrTmoIdx); int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms==0 || rms<(wrp->wrStateRetry*WR_TMO_MS)) { if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if (wr_handshake_retry(ppi)) if ( !rms ) {
sendmsg = 1; wr_handshake_fail(ppi);
else {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n"); pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
return 0; /* non-wr already */ return 0; /* non-wr already */
} }
if (wr_handshake_retry(ppi))
sendmsg = 1;
} }
} }
} }
......
proto-ext-whiterabbit/state-wr-locked.c
View file @ 4da70724
...@@ -40,13 +40,14 @@ int wr_locked(struct pp_instance *ppi, void *buf, int len, int new_state) ...@@ -40,13 +40,14 @@ int wr_locked(struct pp_instance *ppi, void *buf, int len, int new_state)
{ /* Check remaining time */ { /* Check remaining time */
int rms=pp_next_delay_1(ppi, wrTmoIdx); int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms==0 || rms<(wrp->wrStateRetry*WR_TMO_MS)) { if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if (wr_handshake_retry(ppi)) if ( !rms ) {
sendmsg = 1; wr_handshake_fail(ppi);
else {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n"); pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
return 0; /* non-wr already */ return 0; /* non-wr already */
} }
if (wr_handshake_retry(ppi))
sendmsg = 1;
} }
} }
} }
......
proto-ext-whiterabbit/state-wr-m-lock.c
View file @ 4da70724
...@@ -40,13 +40,14 @@ int wr_m_lock(struct pp_instance *ppi, void *buf, int len, int new_state) ...@@ -40,13 +40,14 @@ int wr_m_lock(struct pp_instance *ppi, void *buf, int len, int new_state)
{ /* Check remaining time */ { /* Check remaining time */
int rms=pp_next_delay_1(ppi, wrTmoIdx); int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms==0 || rms<(wrp->wrStateRetry*WR_TMO_MS)) { if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if (wr_handshake_retry(ppi)) if ( !rms ) {
sendmsg = 1; wr_handshake_fail(ppi);
else {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n"); pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
return 0; /* non-wr already */ return 0; /* non-wr already */
} }
if (wr_handshake_retry(ppi))
sendmsg = 1;
} }
} }
} }
......
proto-ext-whiterabbit/state-wr-present.c
View file @ 4da70724
...@@ -42,13 +42,14 @@ int wr_present(struct pp_instance *ppi, void *buf, int len, int new_state) ...@@ -42,13 +42,14 @@ int wr_present(struct pp_instance *ppi, void *buf, int len, int new_state)
{ /* Check remaining time */ { /* Check remaining time */
int rms=pp_next_delay_1(ppi, wrTmoIdx); int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms==0 || rms<(wrp->wrStateRetry*WR_TMO_MS)) { if (rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if (wr_handshake_retry(ppi)) if (!rms) {
sendmsg = 1; wr_handshake_fail(ppi);
else {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n"); pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
return 0; /* non-wr already */ return 0; /* non-wr already */
} }
if (wr_handshake_retry(ppi))
sendmsg = 1;
} }
} }
} }
......
proto-ext-whiterabbit/state-wr-resp-calib-req.c
View file @ 4da70724
...@@ -43,11 +43,13 @@ int wr_resp_calib_req(struct pp_instance *ppi, void *buf, int len, int new_state ...@@ -43,11 +43,13 @@ int wr_resp_calib_req(struct pp_instance *ppi, void *buf, int len, int new_state
{ /* Check remaining time */ { /* Check remaining time */
int rms=pp_next_delay_1(ppi, wrTmoIdx); int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms==0 || rms<(wrp->wrStateRetry*WR_TMO_MS)) { if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if (!wr_handshake_retry(ppi)) { if ( !rms ) {
wr_handshake_fail(ppi);
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n"); pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
return 0; /* non-wr already */ return 0; /* non-wr already */
} }
wr_handshake_retry(ppi);
} }
} }
} }
......
proto-ext-whiterabbit/state-wr-s-lock.c
View file @ 4da70724
...@@ -30,14 +30,15 @@ int wr_s_lock(struct pp_instance *ppi, void *buf, int len, int new_state) ...@@ -30,14 +30,15 @@ int wr_s_lock(struct pp_instance *ppi, void *buf, int len, int new_state)
{ /* Check remaining time */ { /* Check remaining time */
int rms=pp_next_delay_1(ppi, wrTmoIdx); int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms==0 || rms<(wrp->wrStateRetry*WR_TMO_MS)) { if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
WRH_OPER()->locking_disable(ppi); WRH_OPER()->locking_disable(ppi);
if (wr_handshake_retry(ppi)) if ( rms==0 ) {
enable = 1; wr_handshake_fail(ppi);
else {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n"); pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
return 0; /* non-wr already */ return 0; /* non-wr already */
} }
if (wr_handshake_retry(ppi))
enable = 1;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment