Skip to content

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

msg.c: merge issue_delay_req() and issue_pdelay_req() 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 0ad2eb51
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
include/ppsi/ppsi.h
View file @ ac6b3d07
...@@ -429,9 +429,8 @@ extern void msg_pack_pdelay_req(struct pp_instance *ppi, ...@@ -429,9 +429,8 @@ extern void msg_pack_pdelay_req(struct pp_instance *ppi,
extern void *msg_copy_header(MsgHeader *dest, MsgHeader *src); /* REMOVE ME!! */ extern void *msg_copy_header(MsgHeader *dest, MsgHeader *src); /* REMOVE ME!! */
extern int msg_issue_announce(struct pp_instance *ppi); extern int msg_issue_announce(struct pp_instance *ppi);
extern int msg_issue_sync_followup(struct pp_instance *ppi); extern int msg_issue_sync_followup(struct pp_instance *ppi);
extern int msg_issue_delay_req(struct pp_instance *ppi); extern int msg_issue_request(struct pp_instance *ppi);
extern int msg_issue_delay_resp(struct pp_instance *ppi, TimeInternal *time); extern int msg_issue_delay_resp(struct pp_instance *ppi, TimeInternal *time);
extern int msg_issue_pdelay_req(struct pp_instance *ppi);
extern int msg_issue_pdelay_resp_followup(struct pp_instance *ppi, extern int msg_issue_pdelay_resp_followup(struct pp_instance *ppi,
TimeInternal * time); TimeInternal * time);
extern int msg_issue_pdelay_resp(struct pp_instance *ppi, TimeInternal * time); extern int msg_issue_pdelay_resp(struct pp_instance *ppi, TimeInternal * time);
......
proto-standard/msg.c
View file @ ac6b3d07
...@@ -525,7 +525,7 @@ int msg_issue_pdelay_resp_followup(struct pp_instance *ppi, TimeInternal * time) ...@@ -525,7 +525,7 @@ int msg_issue_pdelay_resp_followup(struct pp_instance *ppi, TimeInternal * time)
} }
/* Pack and send on event multicast ip adress a DelayReq message */ /* Pack and send on event multicast ip adress a DelayReq message */
int msg_issue_delay_req(struct pp_instance *ppi) static int msg_issue_delay_req(struct pp_instance *ppi)
{ {
Timestamp orig_tstamp; Timestamp orig_tstamp;
TimeInternal now; TimeInternal now;
...@@ -539,7 +539,7 @@ int msg_issue_delay_req(struct pp_instance *ppi) ...@@ -539,7 +539,7 @@ int msg_issue_delay_req(struct pp_instance *ppi)
} }
/* Pack and send on event multicast ip adress a PDelayReq message */ /* Pack and send on event multicast ip adress a PDelayReq message */
int msg_issue_pdelay_req(struct pp_instance *ppi) static int msg_issue_pdelay_req(struct pp_instance *ppi)
{ {
Timestamp orig_tstamp; Timestamp orig_tstamp;
TimeInternal now; TimeInternal now;
...@@ -552,6 +552,13 @@ int msg_issue_pdelay_req(struct pp_instance *ppi) ...@@ -552,6 +552,13 @@ int msg_issue_pdelay_req(struct pp_instance *ppi)
PP_NP_EVT); PP_NP_EVT);
} }
int msg_issue_request(struct pp_instance *ppi)
{
if (ppi->glbs->delay_mech == PP_E2E_MECH)
return msg_issue_delay_req(ppi);
return msg_issue_pdelay_req(ppi);
}
/* Pack and send on event multicast ip adress a DelayResp message */ /* Pack and send on event multicast ip adress a DelayResp message */
int msg_issue_delay_resp(struct pp_instance *ppi, TimeInternal *time) int msg_issue_delay_resp(struct pp_instance *ppi, TimeInternal *time)
{ {
......
proto-standard/state-pclock.c
View file @ ac6b3d07
...@@ -112,7 +112,7 @@ out: ...@@ -112,7 +112,7 @@ out:
e = st_com_execute_slave(ppi); e = st_com_execute_slave(ppi);
if (pp_timeout_z(ppi, PP_TO_DELAYREQ)) { if (pp_timeout_z(ppi, PP_TO_DELAYREQ)) {
e = msg_issue_pdelay_req(ppi); e = msg_issue_request(ppi);
ppi->t3 = ppi->last_snt_time; ppi->t3 = ppi->last_snt_time;
......
proto-standard/state-slave.c
View file @ ac6b3d07
...@@ -105,7 +105,7 @@ out: ...@@ -105,7 +105,7 @@ out:
e = st_com_execute_slave(ppi); e = st_com_execute_slave(ppi);
if (pp_timeout_z(ppi, PP_TO_DELAYREQ)) { if (pp_timeout_z(ppi, PP_TO_DELAYREQ)) {
e = msg_issue_delay_req(ppi); e = msg_issue_request(ppi);
ppi->t3 = ppi->last_snt_time; ppi->t3 = ppi->last_snt_time;
......
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