Skip to content

P
PPSi
Commit b5df3c7a authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

servo: move more code from got_sync to got_resp (no technical effect) 

This moves the first check for "max_delay" into the calculation
function. As a side effect we got rid of the field "t1_t2_valid" in
the servo structure.

While nothing is changed in the calculations (and I see the same
(mis)behaviour in my network) we now have a sane servo.c, where
pp_servo_got_sync only takes care of the correction factor for the
sync/follow-up message and then everything is done in
pp_servo_got_resp.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 697bf473
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 38 deletions
include/ppsi/pp-instance.h
View file @ b5df3c7a
...@@ -96,7 +96,6 @@ struct pp_servo { ...@@ -96,7 +96,6 @@ struct pp_servo {
Integer32 obs_drift; Integer32 obs_drift;
struct pp_owd_fltr owd_fltr; struct pp_owd_fltr owd_fltr;
struct pp_ofm_fltr ofm_fltr; struct pp_ofm_fltr ofm_fltr;
int t1_t2_valid; /* set at sync/follow-up time */
}; };
/* /*
......
proto-standard/servo.c
View file @ b5df3c7a
...@@ -32,11 +32,8 @@ static void format_TimeInternal(char *s, TimeInternal *t) ...@@ -32,11 +32,8 @@ static void format_TimeInternal(char *s, TimeInternal *t)
} }
/* /* Called by slave and uncalib when we have t1 and t2 */
* Actual body of pp_servo_got_sync. void pp_servo_got_sync(struct pp_instance *ppi)
* Called by slave and uncalib when we have t1 and t2
*/
static int __pp_servo_got_sync(struct pp_instance *ppi)
{ {
TimeInternal *m_to_s_dly = &SRV(ppi)->m_to_s_dly; TimeInternal *m_to_s_dly = &SRV(ppi)->m_to_s_dly;
...@@ -46,34 +43,6 @@ static int __pp_servo_got_sync(struct pp_instance *ppi) ...@@ -46,34 +43,6 @@ static int __pp_servo_got_sync(struct pp_instance *ppi)
*/ */
sub_TimeInternal(m_to_s_dly, &ppi->t2, &ppi->t1); sub_TimeInternal(m_to_s_dly, &ppi->t2, &ppi->t1);
sub_TimeInternal(m_to_s_dly, m_to_s_dly, &ppi->cField); sub_TimeInternal(m_to_s_dly, m_to_s_dly, &ppi->cField);
if (OPTS(ppi)->max_dly) { /* If maxDelay is 0 then it's OFF */
if (m_to_s_dly->seconds) {
pp_diag(ppi, servo, 1, "%s aborted, delay greater "
"than 1 second\n", __func__);
return 0; /* not good */
}
if (m_to_s_dly->nanoseconds > OPTS(ppi)->max_dly) {
pp_diag(ppi, servo, 1, "%s aborted, delay %d greater "
"than administratively set maximum %d\n",
__func__,
(int)m_to_s_dly->nanoseconds,
(int)OPTS(ppi)->max_dly);
return 0; /* not good */
}
}
return 1; /* ok */
}
/* Called by slave and uncalib when we have t1 and t2 */
void pp_servo_got_sync(struct pp_instance *ppi)
{
SRV(ppi)->t1_t2_valid = __pp_servo_got_sync(ppi);
if (!SRV(ppi)->t1_t2_valid) {
/* error: message already reported */
return;
}
} }
/* called by slave states when delay_resp is received (all t1..t4 are valid) */ /* called by slave states when delay_resp is received (all t1..t4 are valid) */
...@@ -88,9 +57,6 @@ void pp_servo_got_resp(struct pp_instance *ppi) ...@@ -88,9 +57,6 @@ void pp_servo_got_resp(struct pp_instance *ppi)
Integer32 adj; Integer32 adj;
int s; int s;
if (!SRV(ppi)->t1_t2_valid)
return;
/* /*
* calc 'slave_to_master_delay', removing the correction field * calc 'slave_to_master_delay', removing the correction field
* added by transparent clocks in the path. * added by transparent clocks in the path.
...@@ -98,7 +64,23 @@ void pp_servo_got_resp(struct pp_instance *ppi) ...@@ -98,7 +64,23 @@ void pp_servo_got_resp(struct pp_instance *ppi)
sub_TimeInternal(s_to_m_dly, &ppi->t4, &ppi->t3); sub_TimeInternal(s_to_m_dly, &ppi->t4, &ppi->t3);
sub_TimeInternal(s_to_m_dly, s_to_m_dly, &ppi->cField); sub_TimeInternal(s_to_m_dly, s_to_m_dly, &ppi->cField);
if (OPTS(ppi)->max_dly) { /* If max_delay is 0 then it's OFF */ /* Check for too-big offsets, and then make the calculation */
if (OPTS(ppi)->max_dly) { /* If maxDelay is 0 then it's OFF */
if (m_to_s_dly->seconds) {
pp_diag(ppi, servo, 1, "%s aborted, delay greater "
"than 1 second\n", __func__);
return;
}
if (m_to_s_dly->nanoseconds > OPTS(ppi)->max_dly) {
pp_diag(ppi, servo, 1, "%s aborted, delay %d greater "
"than administratively set maximum %d\n",
__func__,
(int)m_to_s_dly->nanoseconds,
(int)OPTS(ppi)->max_dly);
return;
}
if (s_to_m_dly->seconds) { if (s_to_m_dly->seconds) {
pp_diag(ppi, servo, 1, "%s aborted, delay " pp_diag(ppi, servo, 1, "%s aborted, delay "
"greater than 1 second\n", __func__); "greater than 1 second\n", __func__);
......
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