Skip to content

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

correctionField: simplify code 

This removes some needless local variables related to correction
field, but relying on a new "cField" entry in pp_instance, near
the t1,t2,t3,t4 status stamps.

The commit also adds a FIXME note: it is not clear to me how the
correction field can be managed in the back message (t3, t4).
Since the correctionField is updated by transparent clocks, I think
we need the one of the delay request (the one stamped in t3, t3),
*not* the delay response that I don't care about.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent a65e4f02
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 20 deletions
include/ppsi/pp-instance.h
View file @ 05e8a274
...@@ -154,6 +154,7 @@ struct pp_instance { ...@@ -154,6 +154,7 @@ struct pp_instance {
/* Times, for the various offset computations */ /* Times, for the various offset computations */
TimeInternal t1, t2, t3, t4; /* *the* stamps */ TimeInternal t1, t2, t3, t4; /* *the* stamps */
TimeInternal cField; /* transp. clocks */
TimeInternal last_rcv_time, last_snt_time; /* two temporaries */ TimeInternal last_rcv_time, last_snt_time; /* two temporaries */
/* Data sets */ /* Data sets */
......
proto-standard/common-fun.c
View file @ 05e8a274
...@@ -135,17 +135,17 @@ int st_com_slave_handle_announce(struct pp_instance *ppi, unsigned char *buf, ...@@ -135,17 +135,17 @@ int st_com_slave_handle_announce(struct pp_instance *ppi, unsigned char *buf,
int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf, int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf,
int len) int len)
{ {
TimeInternal correction_field;
MsgHeader *hdr = &ppi->received_ptp_header; MsgHeader *hdr = &ppi->received_ptp_header;
MsgSync sync; MsgSync sync;
if (len < PP_SYNC_LENGTH) if (len < PP_SYNC_LENGTH)
return -1; return -1;
if (!ppi->is_from_cur_par) if (!ppi->is_from_cur_par)
return 0; return 0;
/* t2 may be overriden by follow-up, cField is always valid */
ppi->t2 = ppi->last_rcv_time; ppi->t2 = ppi->last_rcv_time;
cField_to_TimeInternal(&ppi->cField, hdr->correctionfield);
if ((hdr->flagField[0] & PP_TWO_STEP_FLAG) != 0) { if ((hdr->flagField[0] & PP_TWO_STEP_FLAG) != 0) {
ppi->waiting_for_follow = TRUE; ppi->waiting_for_follow = TRUE;
...@@ -153,16 +153,10 @@ int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf, ...@@ -153,16 +153,10 @@ int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf,
return 0; return 0;
} }
msg_unpack_sync(buf, &sync); msg_unpack_sync(buf, &sync);
cField_to_TimeInternal(&correction_field,
ppi->received_ptp_header.correctionfield);
display_TimeInternal("Correction field",
&correction_field);
ppi->waiting_for_follow = FALSE; ppi->waiting_for_follow = FALSE;
to_TimeInternal(&ppi->t1, to_TimeInternal(&ppi->t1,
&sync.originTimestamp); &sync.originTimestamp);
pp_update_offset(ppi, &correction_field); pp_update_offset(ppi, &ppi->cField);
pp_update_clock(ppi); pp_update_clock(ppi);
return 0; return 0;
} }
...@@ -171,7 +165,6 @@ int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf, ...@@ -171,7 +165,6 @@ int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf,
int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf, int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf,
int len) int len)
{ {
TimeInternal correction_field;
MsgFollowUp follow; MsgFollowUp follow;
int ret = 0; int ret = 0;
...@@ -202,19 +195,15 @@ int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf, ...@@ -202,19 +195,15 @@ int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf,
ppi->waiting_for_follow = FALSE; ppi->waiting_for_follow = FALSE;
to_TimeInternal(&ppi->t1, &follow.preciseOriginTimestamp); to_TimeInternal(&ppi->t1, &follow.preciseOriginTimestamp);
cField_to_TimeInternal(&correction_field,
ppi->received_ptp_header.correctionfield);
/* Call the extension; it may do it all and ask to return */ /* Call the extension; it may do it all and ask to return */
if (pp_hooks.handle_followup) if (pp_hooks.handle_followup)
ret = pp_hooks.handle_followup(ppi, &ppi->t1, ret = pp_hooks.handle_followup(ppi, &ppi->t1, &ppi->cField);
&correction_field);
if (ret == 1) if (ret == 1)
return 0; return 0;
if (ret < 0) if (ret < 0)
return ret; return ret;
pp_update_offset(ppi, &correction_field); pp_update_offset(ppi, &ppi->cField);
pp_update_clock(ppi); pp_update_clock(ppi);
return 0; return 0;
} }
......
proto-standard/state-slave.c
View file @ 05e8a274
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen) int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
{ {
int e = 0; /* error var, to check errors in msg handling */ int e = 0; /* error var, to check errors in msg handling */
TimeInternal correction_field;
MsgHeader *hdr = &ppi->received_ptp_header; MsgHeader *hdr = &ppi->received_ptp_header;
MsgDelayResp resp; MsgDelayResp resp;
int d1, d2; int d1, d2;
...@@ -71,13 +70,16 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -71,13 +70,16 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
to_TimeInternal(&ppi->t4, &resp.receiveTimestamp); to_TimeInternal(&ppi->t4, &resp.receiveTimestamp);
cField_to_TimeInternal(&correction_field, /*
hdr->correctionfield); * FIXME: how is correctionField handled in t3/t4?
* I think the master should consider it when
* generating t4, and report back a modified t4
*/
if (pp_hooks.update_delay) if (pp_hooks.update_delay)
e = pp_hooks.update_delay(ppi); e = pp_hooks.update_delay(ppi);
else else
pp_update_delay(ppi, &correction_field); pp_update_delay(ppi, &ppi->cField);
if (e) if (e)
goto out; goto out;
......
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